diff options
Diffstat (limited to 'docs/examples')
63 files changed, 1175 insertions, 441 deletions
diff --git a/docs/examples/advanced/cid-fonts.fo b/docs/examples/advanced/cid-fonts.fo index bc42d6e68..b84d17e23 100644 --- a/docs/examples/advanced/cid-fonts.fo +++ b/docs/examples/advanced/cid-fonts.fo @@ -70,7 +70,7 @@ </fox:outline> - <fo:page-sequence master-name="A4"> + <fo:page-sequence master-reference="A4"> <fo:flow flow-name="xsl-region-body"> <fo:wrapper font-family="Times" font-size="12pt" text-align="justify"> diff --git a/docs/examples/advanced/giro.fo b/docs/examples/advanced/giro.fo index 675902435..f27b2a0e6 100644 --- a/docs/examples/advanced/giro.fo +++ b/docs/examples/advanced/giro.fo @@ -10,13 +10,13 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="A4"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" page-position="first"/> - <fo:conditional-page-master-reference master-name="rest" page-position="rest"/> - <fo:conditional-page-master-reference master-name="rest"/> + <fo:conditional-page-master-reference master-reference="first" page-position="first"/> + <fo:conditional-page-master-reference master-reference="rest" page-position="rest"/> + <fo:conditional-page-master-reference master-reference="rest"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> - <fo:page-sequence master-name="A4"> + <fo:page-sequence master-reference="A4"> <fo:static-content flow-name="xsl-region-after"> <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green"> <fo:table-column column-width="8in div 10 - 2in div 12"/> @@ -1241,4 +1241,4 @@ <fo:block>SVG logo and bar code</fo:block> </fo:flow> </fo:page-sequence> -</fo:root>
\ No newline at end of file +</fo:root> diff --git a/docs/examples/advanced/test_ja.fo b/docs/examples/advanced/test_ja.fo new file mode 100644 index 000000000..bc446aded --- /dev/null +++ b/docs/examples/advanced/test_ja.fo @@ -0,0 +1,146 @@ +<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg" language="ja"> +<fo:layout-master-set> +<fo:simple-page-master master-name="one"> +<fo:region-body margin-top="50pt" margin-bottom="50pt" margin-left="100pt" margin-right="100pt"/> +</fo:simple-page-master> +</fo:layout-master-set> +<fo:page-sequence master-reference="one" font-family="Gothic"> +<fo:flow flow-name="xsl-region-body"> +<fo:block>ブロック</fo:block> +<fo:block text-align="end" font-weight="bold">右揃えのブロック</fo:block> +<fo:block text-align="center" font-style="italic">中央揃えのブロック</fo:block> +<fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。配置は、デフォルトです。</fo:block> +<fo:block text-align="end">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。配置は、右揃えです。</fo:block> +<fo:block text-align="center">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。配置は、中央揃えです。</fo:block> +<fo:block text-align="justify">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。三行となり、全行末が揃っているか確認して下さい。どうでしょうか。配置は、両端揃えです。</fo:block> +<fo:block>比較用ブロック</fo:block> +<fo:block space-before.optimum="12pt">space-before に 12pt を指定したブロック</fo:block> +<fo:block>比較用ブロック</fo:block> +<fo:block space-after.optimum="12pt">space-after に 12pt を指定したブロック</fo:block> +<fo:block>比較用ブロック</fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt">space-before と space-after の両方に 12pt を指定したブロック</fo:block> +<fo:block font-weight="bold" font-style="italic">比較用ブロック</fo:block> +<fo:block start-indent="50pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。start-indent に 50pt を指定しています。</fo:block> +<fo:block end-indent="50pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。end-indent に 50pt を指定しています。</fo:block> +<fo:block start-indent="50pt" end-indent="50pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。start-indent と end-indent に 50pt を指定しています。</fo:block> +<fo:block font-size="15pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。font-size に 15pt を指定しています。</fo:block> +<fo:block line-height="20pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。line-height に 20pt を指定しています。</fo:block> +<fo:block font-size="15pt" line-height="20pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。font-size に 15pt、line-height に 20pt を指定しています。</fo:block> +<fo:block font-size="15pt" line-height="15pt">この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。font-size に 15pt、line-height に 15pt を指定しています。</fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt"><fo:block space-before.optimum="12pt" space-after.optimum="12pt">ブロック内のブロック</fo:block></fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt">前のテキスト<fo:block space-before.optimum="12pt" space-after.optimum="12pt">ブロック内のブロック</fo:block>後ろのテキスト</fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">前のテキスト<fo:block space-before.optimum="12pt" space-after.optimum="12pt">start-indent が 50pt のブロック内のブロック</fo:block>後ろのブロック</fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">And again for the page break, text before<fo:block space-before.optimum="12pt" space-after.optimum="12pt">start-intent が 50pt のブロック内のブロック</fo:block>後ろのテキスト</fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">前のテキスト<fo:block space-before.optimum="12pt" space-after.optimum="12pt">start-intent が 50pt のブロック内の start-intent が 50pt のブロック</fo:block>後ろのブロック</fo:block> +<fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">前のテキスト<fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="100pt">start-intent が 50pt のブロック内の start-intent が 100pt のブロック</fo:block>後ろのテキスト</fo:block> +<fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justify"> +<fo:list-item> +<fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> +<fo:list-item-body start-indent="body-start()"><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block></fo:list-item-body> +</fo:list-item> +<fo:list-item> +<fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> +<fo:list-item-body start-indent="body-start()"><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block></fo:list-item-body> +</fo:list-item> +</fo:list-block> +<fo:list-block start-indent="50pt" provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justify"> +<fo:list-item> +<fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> +<fo:list-item-body start-indent="body-start()"><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。start-indent に 50pt、text-align は両端揃えの list-block です。</fo:block></fo:list-item-body> +</fo:list-item> +<fo:list-item> +<fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> +<fo:list-item-body start-indent="body-start()"><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block></fo:list-item-body> +</fo:list-item> +</fo:list-block> +<fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justify"> +<fo:list-item> +<fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> +<fo:list-item-body start-indent="body-start()"><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block><fo:block start-indent="100pt">この行は、一行以上にわたる start-intent が 100pt の複数のラインブロックです。適切な改行がされなければなりません。</fo:block><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block></fo:list-item-body> +</fo:list-item> +<fo:list-item> +<fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> +<fo:list-item-body start-indent="body-start()"><fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。<fo:block>この行は、一行以上にわたる埋め込まれた複数のラインブロックです。適切な改行がされなければ成りません。</fo:block>この行は、一行以上にわたる複数のラインブロックです。適切な改行がされなければなりません。</fo:block></fo:list-item-body> +</fo:list-item> +</fo:list-block> + <fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt"> + <fo:list-item> + <fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block>list-item-body 内のブロック</fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item> + <fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> + <fo:list-block provisional-distance-between-starts="12pt"> + <fo:list-item> + <fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block>これ自体がリストアイテムであるリスト内のリストアイテム</fo:block></fo:list-item-body> + </fo:list-item> + </fo:list-block> + </fo:list-item-body> + </fo:list-item> + </fo:list-block> + <fo:block break-before="page" font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">次のステージ</fo:block> + <fo:block>新たに実装された罫線の試験です。以下は、太さはデフォルトの 1pt、space-before と space-after が 12pt で表示された罫線です。</fo:block> + <fo:block><fo:leader leader-pattern="rule" space-before.optimum="12pt" space-after.optimum="12pt"/></fo:block> + <fo:block>以下は、太さ5pt、start-indentが100pt (前のspace-before/afterと同一) のリーダです。</fo:block> + <fo:block><fo:leader leader-pattern="rule" space-before.optimum="12pt" space-after.optimum="12pt" rule-thickness="5pt" start-indent="100pt"/></fo:block> + <fo:block font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt" + ><fo:inline color="#500">C</fo:inline + ><fo:inline color="#700">o</fo:inline + ><fo:inline color="#900">l</fo:inline + ><fo:inline color="#B00">o</fo:inline + ><fo:inline color="#D00">u</fo:inline + ><fo:inline color="#F00">r</fo:inline + ></fo:block> + <fo:block color="black">黒色</fo:block> + <fo:block color="green">緑色</fo:block> + <fo:block color="silver">銀色</fo:block> + <fo:block color="lime">ライム色</fo:block> + <fo:block color="gray">灰色</fo:block> + <fo:block color="olive">オリーブ色</fo:block> + <fo:block color="white">白色</fo:block> + <fo:block color="yellow">黄色</fo:block> + <fo:block color="maroon">栗色</fo:block> + <fo:block color="navy">ネイビ色</fo:block> + <fo:block color="red">赤色</fo:block> + <fo:block color="blue">青色</fo:block> + <fo:block color="purple">紫色</fo:block> + <fo:block color="teal">茶色</fo:block> + <fo:block color="fuchsia">赤紫色</fo:block> + <fo:block color="aqua">水色</fo:block> + <fo:block break-before="even-page" font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">ラップ</fo:block> + <fo:block space-before.optimum="12pt">この文は、表示領域よりも長い文です。標準のラッピング処理を行っており、wrap-option に no-wrap を設定した下の段落と比較すると、どのような処理が行われているのか分かるかと思います。</fo:block> + <fo:block space-before.optimum="12pt" wrap-option="no-wrap">この文は、表示領域よりも長い文です。wrap-option に no-wrap を指定しており、デフォルトのラッピング処理を行っている上の段落と比較すると、どのような処理が行われているか分かるかと思います。</fo:block> + <fo:block space-before.optimum="12pt" wrap-option="wrap">この文は、表示領域よりも長い文です。標準のラッピング処理を行っていますが、これら三節の最初の段落との違いは、wrap-option に明示的に wrap を指定していることです。</fo:block> + <fo:block font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">空白つぶし</fo:block> +<fo:block>この文 は デフォルトです！</fo:block> +<fo:block white-space-collapse="false">この文 は falseです！</fo:block> +<fo:block white-space-collapse="true">この文 は trueです！</fo:block> +<fo:block font-family="Mincho" white-space-collapse="false"> +<![CDATA[ +<?xml version="1.0"?> +<document> + <heading>見出し</heading> + <list> + <item>一項目目</item> + <item>二項目目</item> + </list> +</document> +]]> +</fo:block>--> + <fo:block break-before="page" font-size="24pt" line-height="28pt" space-before.optimum="12pt" space-after.optimum="12pt">埋め込まれた SVG</fo:block> + <fo:block><fo:instream-foreign-object> + <svg:svg width="400pt" height="200pt"> + <svg:rect style="fill:none;stroke:blue" x="20pt" y="20pt" width="100pt" height="100pt"/> + <svg:line x1="20pt" y1="20pt" x2="120pt" y2="120pt"/> + <svg:line x1="120pt" y1="20pt" x2="20pt" y2="120pt"/> + <svg:text x="20pt" y="150pt">こんにちは SVG!</svg:text> + </svg:svg> + </fo:instream-foreign-object></fo:block> + <fo:block>上図は、SVG グラフィックの例です</fo:block> + </fo:flow> + </fo:page-sequence> +</fo:root> + + diff --git a/docs/examples/embedding/FopPrintServlet.java b/docs/examples/embedding/FopPrintServlet.java new file mode 100644 index 000000000..b67c3aa9b --- /dev/null +++ b/docs/examples/embedding/FopPrintServlet.java @@ -0,0 +1,299 @@ +/* + * $Id$ + * Copyright (C) 2002 The Apache Software Foundation. All rights reserved. + * For details on use and redistribution please refer to the + * LICENSE file included with these sources. + */ + +import java.io.*; +import java.util.Vector ; + +import java.awt.print.PrinterJob ; +import java.awt.print.PrinterException ; + +import javax.servlet.*; +import javax.servlet.http.*; + +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; + +import org.apache.fop.apps.Driver; +import org.apache.fop.layout.Page; +import org.apache.fop.apps.Version; +import org.apache.fop.apps.XSLTInputHandler; +import org.apache.fop.messaging.MessageHandler; + +import org.apache.fop.render.awt.AWTRenderer ; + +import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Logger; + +/** + * Example servlet to generate a fop printout from a servlet. + * Printing goes to the default printer on host where the servlet executes. + * Servlet param is: + * <ul> + * <li>fo: the path to a formatting object file to render + * </ul> + * + * Example URL: http://servername/servlet/FopPrintServlet?fo=readme.fo + * Example URL: http://servername/servlet/FopPrintServlet?xml=data.xml&xsl=format.xsl + * Compiling: you will need + * - servlet_2_2.jar + * - fop.jar + * - sax api + * - avalon-framework-x.jar (where x is the version found the FOP lib dir) + * + * Running: you will need in the WEB-INF/lib/ directory: + * - fop.jar + * - batik.jar + * - avalon-framework-x.jar (where x is the version found the FOP lib dir) + * - xalan-2.0.0.jar + */ + +public class FopPrintServlet extends HttpServlet +{ + public static final String FO_REQUEST_PARAM = "fo"; + public static final String XML_REQUEST_PARAM = "xml"; + public static final String XSL_REQUEST_PARAM = "xsl"; + Logger log = null; + + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws ServletException + { + if (log == null) + { + log = new ConsoleLogger(ConsoleLogger.LEVEL_WARN); + MessageHandler.setScreenLogger(log); + } + + try + { + String foParam = request.getParameter(FO_REQUEST_PARAM); + String xmlParam = request.getParameter(XML_REQUEST_PARAM); + String xslParam = request.getParameter(XSL_REQUEST_PARAM); + + if (foParam != null) + { + FileInputStream file = new FileInputStream(foParam); + renderFO(new InputSource(file), response); + } + else if ((xmlParam != null) && (xslParam != null)) + { + XSLTInputHandler input = new XSLTInputHandler(new File(xmlParam), new File(xslParam)); + renderXML(input, response); + } + else + { + response.setContentType ("text/html"); + + PrintWriter out = response.getWriter(); + out.println("<html><title>Error</title>\n"+ + "<body><h1>FopServlet Error</h1><h3>No 'fo' or 'xml/xsl' "+ + "request param given.</h3></body></html>"); + } + } + catch (ServletException ex) + { + throw ex; + } + catch (Exception ex) + { + throw new ServletException(ex); + } + } + + /** + * renders an FO inputsource into a PDF file which is rendered + * directly to the response object's OutputStream + */ + public void renderFO(InputSource foFile, HttpServletResponse response) + throws ServletException + { + try + { + Driver driver = new Driver(foFile, null); + PrinterJob pj = PrinterJob.getPrinterJob(); + PrintRenderer renderer = new PrintRenderer(pj); + + driver.setLogger (log); + driver.setRenderer(renderer); + driver.run(); + + reportOK (response) ; + } + catch (Exception ex) + { + throw new ServletException(ex); + } + } + + public void renderXML(XSLTInputHandler input, HttpServletResponse response) + throws ServletException + { + try + { + Driver driver = new Driver(); + PrinterJob pj = PrinterJob.getPrinterJob(); + PrintRenderer renderer = new PrintRenderer(pj); + + pj.setCopies(1); + + driver.setLogger (log); + driver.setRenderer (renderer); + driver.render (input.getParser(), input.getInputSource()); + + reportOK (response) ; + } + catch (Exception ex) + { + throw new ServletException(ex); + } + } + + // private helper, tell (browser) user that file printed + + private void reportOK (HttpServletResponse response) + throws ServletException + { + String sMsg = "<html><title>Success</title>\n" + + "<body><h1>FopPrintServlet: </h1>" + + "<h3>The requested data was printed</h3></body></html>" ; + + response.setContentType ("text/html"); + response.setContentLength (sMsg.length()); + + try + { + PrintWriter out = response.getWriter(); + out.println (sMsg) ; + out.flush() ; + } + catch (Exception ex) + { + throw new ServletException(ex); + } + } + + + /** + * creates a SAX parser, using the value of org.xml.sax.parser + * defaulting to org.apache.xerces.parsers.SAXParser + * + * @return the created SAX parser + */ + static XMLReader createParser() + throws ServletException + { + String parserClassName = System.getProperty("org.xml.sax.parser"); + if (parserClassName == null) + { + parserClassName = "org.apache.xerces.parsers.SAXParser"; + } + + try + { + return (XMLReader) Class.forName(parserClassName).newInstance(); + } + catch (Exception e) + { + throw new ServletException(e); + } + } + + // This is stolen from PrintStarter + class PrintRenderer extends AWTRenderer + { + + private static final int EVEN_AND_ALL = 0; + private static final int EVEN = 1; + private static final int ODD = 2; + + private int startNumber; + private int endNumber; + private int mode = EVEN_AND_ALL; + private int copies = 1; + private PrinterJob printerJob; + + PrintRenderer(PrinterJob printerJob) + { + super(null); + + this.printerJob = printerJob; + startNumber = 0 ; + endNumber = -1; + + printerJob.setPageable(this); + + mode = EVEN_AND_ALL; + String str = System.getProperty("even"); + if (str != null) + { + try + { + mode = Boolean.valueOf(str).booleanValue() ? EVEN : ODD; + } + catch (Exception e) + {} + + } + + } + + + + public void stopRenderer(OutputStream outputStream) + throws IOException { + super.stopRenderer(outputStream); + + if(endNumber == -1) + endNumber = getPageCount(); + + Vector numbers = getInvalidPageNumbers(); + for (int i = numbers.size() - 1; i > -1; i--) + removePage(Integer.parseInt((String)numbers.elementAt(i))); + + try { + printerJob.print(); + } catch (PrinterException e) { + e.printStackTrace(); + throw new IOException( + "Unable to print: " + e.getClass().getName() + + ": " + e.getMessage()); + } + } + + public void renderPage(Page page) { + pageWidth = (int)((float)page.getWidth() / 1000f); + pageHeight = (int)((float)page.getHeight() / 1000f); + super.renderPage(page); + } + + + private Vector getInvalidPageNumbers() { + + Vector vec = new Vector(); + int max = getPageCount(); + boolean isValid; + for (int i = 0; i < max; i++) { + isValid = true; + if (i < startNumber || i > endNumber) { + isValid = false; + } else if (mode != EVEN_AND_ALL) { + if (mode == EVEN && ((i + 1) % 2 != 0)) + isValid = false; + else if (mode == ODD && ((i + 1) % 2 != 1)) + isValid = false; + } + + if (!isValid) + vec.add(i + ""); + } + + return vec; + } + } // class PrintRenderer + + +} + diff --git a/docs/examples/embedding/FopServlet.java b/docs/examples/embedding/FopServlet.java index 86c8ee3a9..decdf5818 100644 --- a/docs/examples/embedding/FopServlet.java +++ b/docs/examples/embedding/FopServlet.java @@ -16,8 +16,10 @@ import org.xml.sax.XMLReader; import org.apache.fop.apps.Driver; import org.apache.fop.apps.Version; import org.apache.fop.apps.XSLTInputHandler; +import org.apache.fop.messaging.MessageHandler; -import org.apache.log.*; +import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Logger; /** * Example servlet to generate a PDF from a servlet. @@ -32,14 +34,13 @@ import org.apache.log.*; * - servlet_2_2.jar * - fop.jar * - sax api - * - logkit jar + * - avalon-framework-x.jar (where x is the version found the FOP lib dir) * * Running: you will need in the WEB-INF/lib/ directory: * - fop.jar * - batik.jar - * - avalon-framework-4.0.jar - * - logkit-1.0b4.jar * - xalan-2.0.0.jar + * - avalon-framework-x.jar (where x is the version found the FOP lib dir) */ public class FopServlet extends HttpServlet { public static final String FO_REQUEST_PARAM = "fo"; @@ -50,9 +51,8 @@ public class FopServlet extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException { if(log == null) { - Hierarchy hierarchy = Hierarchy.getDefaultHierarchy(); - log = hierarchy.getLoggerFor("fop"); - log.setPriority(Priority.WARN); + log = new ConsoleLogger(ConsoleLogger.LEVEL_WARN); + MessageHandler.setScreenLogger(log); } try { String foParam = request.getParameter(FO_REQUEST_PARAM); diff --git a/docs/examples/fo/bgimage.fo b/docs/examples/fo/bgimage.fo new file mode 100644 index 000000000..a45a77d5a --- /dev/null +++ b/docs/examples/fo/bgimage.fo @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> + +<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format"> + +<fo:layout-master-set> +<fo:simple-page-master master-name="simple" + margin-top="75pt" margin-bottom="25pt" margin-left="100pt" margin-right="50pt"> + <fo:region-body margin-bottom="50pt" + background-image="file:../../graphics/xml_feather_transparent.gif"/> + <fo:region-after extent="25pt"/> +</fo:simple-page-master> + +</fo:layout-master-set> + +<fo:page-sequence master-reference="simple"> + +<fo:static-content flow-name="xsl-region-after"> + <fo:block text-align-last="center" font-size="10pt"> + <fo:page-number/> + </fo:block> +</fo:static-content> + +<fo:flow flow-name="xsl-region-body"> +<fo:block font-size="18pt" font-weight="bold" background-color="#dddddd"> +Simple example for background-image</fo:block> +<fo:block font-size="14pt" space-before="1.6cm" + text-align="end" white-space-collapse="false" + background-repeat="no-repeat" + background-image="file:../../graphics/linux.bmp"> +background-image in a block +1 +2 +3 +4 +5 +</fo:block> +</fo:flow> + +</fo:page-sequence> + +</fo:root> + + + + + diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo index 957e34ac8..1e89e221f 100644 --- a/docs/examples/fo/border.fo +++ b/docs/examples/fo/border.fo @@ -13,16 +13,16 @@ <fo:page-sequence-master master-name="psmA"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> - <fo:page-sequence master-name="psmA"> + <fo:page-sequence master-reference="psmA"> <fo:flow flow-name="xsl-region-body"> <fo:block-container height="4cm" width="12cm" top="0cm" left="0cm" position="absolute"> <fo:block text-align="start" line-height="18pt" font-family="sans-serif" font-weight="bold" font-size="14pt"> diff --git a/docs/examples/fo/bordershorthand.fo b/docs/examples/fo/bordershorthand.fo index f3f115f95..fc5d5b5d2 100644 --- a/docs/examples/fo/bordershorthand.fo +++ b/docs/examples/fo/bordershorthand.fo @@ -48,12 +48,12 @@ Below fo:root there is always <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -61,7 +61,7 @@ Below fo:root there is always <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/fo/character.fo b/docs/examples/fo/character.fo index a7944a15e..b3f9a0e63 100644 --- a/docs/examples/fo/character.fo +++ b/docs/examples/fo/character.fo @@ -39,7 +39,7 @@ the attribute value of master-name refers to the page layout which is to be used to layout the text contained in this page-sequence--> - <fo:page-sequence master-name="simple"> + <fo:page-sequence master-reference="simple"> <!-- start fo:flow each flow is targeted diff --git a/docs/examples/fo/corresprop.fo b/docs/examples/fo/corresprop.fo index bc859f98f..93de9f06d 100644 --- a/docs/examples/fo/corresprop.fo +++ b/docs/examples/fo/corresprop.fo @@ -48,12 +48,12 @@ Below fo:root there is always <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -61,7 +61,7 @@ Below fo:root there is always <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/fo/extensive.fo b/docs/examples/fo/extensive.fo index 8b9eb826a..3b9752257 100644 --- a/docs/examples/fo/extensive.fo +++ b/docs/examples/fo/extensive.fo @@ -4,7 +4,7 @@ <fo:region-body margin-top="50pt" margin-bottom="50pt" margin-left="100pt" margin-right="100pt"/> </fo:simple-page-master> </fo:layout-master-set> -<fo:page-sequence master-name="one"> +<fo:page-sequence master-reference="one"> <fo:flow flow-name="xsl-region-body"> <fo:block>A Block</fo:block> <fo:block text-align="end">An End Aligned Block</fo:block> diff --git a/docs/examples/fo/fonts.fo b/docs/examples/fo/fonts.fo index aa415e521..e2b0a983e 100644 --- a/docs/examples/fo/fonts.fo +++ b/docs/examples/fo/fonts.fo @@ -18,7 +18,7 @@ </fo:layout-master-set> <!-- starts actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:flow flow-name="xsl-region-body"> @@ -27,36 +27,154 @@ Helvetica </fo:block> <fo:block space-after.optimum="10pt" font-family="Helvetica"> -! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~    ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ +! " # $ % & ' ( ) * ++ , - . / 0 1 2 3 4 +5 6 7 8 9 : ; < = > +? @ A B C D E F G H +I J K L M N O P Q R +S T U V W X Y Z [ \ +] ^ _ ` a b c d e f +g h i j k l m n o p +q r s t u v w x y z +{ | } ~ ¡ ¢ £ ¤ ¥ ¦ +§ ¨ © ª « ¬ ® ¯ ° ± +² ³ ´ µ ¶ · ¸ ¹ º » +¼ ½ ¾ ¿ À Á Â Ã Ä Å +Æ Ç È É Ê Ë Ì Í Î Ï +Ð Ñ Ò Ó Ô Õ Ö × Ø Ù +Ú Û Ü Ý Þ ß à á â ã +ä å æ ç è é ê ë ì í +î ï ð ñ ò ó ô õ ö ÷ +ø ù ú û ü ý þ ÿ +Œ œ Š š Ÿ +Ž ž ƒ ˜ – — ‘ +’ ‚ “ ” „ † ‡ +• … ‰ ‹ › ™ </fo:block> <fo:block font-family="Helvetica" font-size="14pt"> Times Roman </fo:block> <fo:block space-after.optimum="10pt" font-family="Times Roman"> -! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~    ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ +! " # $ % & ' ( ) * ++ , - . / 0 1 2 3 4 +5 6 7 8 9 : ; < = > +? @ A B C D E F G H +I J K L M N O P Q R +S T U V W X Y Z [ \ +] ^ _ ` a b c d e f +g h i j k l m n o p +q r s t u v w x y z +{ | } ~ ¡ ¢ £ ¤ ¥ ¦ +§ ¨ © ª « ¬ ® ¯ ° ± +² ³ ´ µ ¶ · ¸ ¹ º » +¼ ½ ¾ ¿ À Á Â Ã Ä Å +Æ Ç È É Ê Ë Ì Í Î Ï +Ð Ñ Ò Ó Ô Õ Ö × Ø Ù +Ú Û Ü Ý Þ ß à á â ã +ä å æ ç è é ê ë ì í +î ï ð ñ ò ó ô õ ö ÷ +ø ù ú û ü ý þ ÿ Œ +œ Š š Ÿ Ž ž ƒ +˜ – — ‘ ’ ‚ +“ ” „ † ‡ • … +‰ ‹ › ™ </fo:block> <fo:block font-family="Helvetica" font-size="14pt"> Courier </fo:block> <fo:block space-after.optimum="10pt" font-family="Courier"> -! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~    ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ +! " # $ % & ' ( ) * ++ , - . / 0 1 2 3 4 +5 6 7 8 9 : ; < = > +? @ A B C D E F G H +I J K L M N O P Q R +S T U V W X Y Z [ \ +] ^ _ ` a b c d e f +g h i j k l m n o p +q r s t u v w x y z +{ | } ~ ¡ ¢ £ ¤ ¥ ¦ +§ ¨ © ª « ¬ ® ¯ ° ± +² ³ ´ µ ¶ · ¸ ¹ º » +¼ ½ ¾ ¿ À Á Â Ã Ä Å +Æ Ç È É Ê Ë Ì Í Î Ï +Ð Ñ Ò Ó Ô Õ Ö × Ø Ù +Ú Û Ü Ý Þ ß à á â ã +ä å æ ç è é ê ë ì í +î ï ð ñ ò ó ô õ ö ÷ +ø ù ú û ü ý þ ÿ Œ +œ Š š Ÿ Ž +ž ƒ ˜ – — ‘ +’ ‚ “ ” „ † ‡ +• … ‰ ‹ › ™ </fo:block> <fo:block font-family="Helvetica" font-size="14pt"> ZapfDingbats: </fo:block> <fo:block space-after.optimum="10pt" font-family="ZapfDingbats"> -! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~    ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ +✁ ✂ ✃ ✄ ☎ ✆ ✇ +✈ ✉ ☛ ☞ ✌ ✍ ✎ +✏ ✐ ✑ ✒ ✓ ✔ ✕ +✖ ✗ ✘ ✙ ✚ ✛ ✜ +✝ ✞ ✟ ✠ ✡ ✢ ✣ +✤ ✥ ✦ ✧ ★ ✩ ✪ +✫ ✬ ✭ ✮ ✯ ✰ ✱ +✲ ✳ ✴ ✵ ✶ ✷ ✸ +✹ ✺ ✻ ✼ ✽ ✾ ✿ +❀ ❁ ❂ ❃ ❄ ❅ ❆ +❇ ❈ ❉ ❊ ❋ ● ❍ +■ ❏ ❐ ❑ ❒ ▲ ▼ +◆ ❖ ◗ ❘ ❙ ❚ ❛ +❜ ❝ ❞ ❡ ❢ ❣ ❤ +❥ ❦ ❧ ♣ ♦ ♥ ♠ +① ② ③ ④ ⑤ ⑥ ⑦ +⑧ ⑨ ⑩ ❶ ❷ ❸ ❹ +❺ ❻ ❼ ❽ ❾ ❿ ➀ +➁ ➂ ➃ ➄ ➅ ➆ ➇ +➈ ➉ ➊ ➋ ➌ ➍ ➎ +➏ ➐ ➑ ➒ ➓ ➔ → +↔ ↕ ➘ ➙ ➚ ➛ ➜ +➝ ➞ ➟ ➠ ➡ ➢ ➣ +➤ ➥ ➦ ➧ ➨ ➩ ➪ +➫ ➬ ➭ ➮ ➯ ➱ ➲ +➳ ➴ ➵ ➶ ➷ ➸ ➹ +➺ ➻ ➼ ➽ ➾   +       +     </fo:block> - <fo:block font-family="Helvetica" font-size="14pt"> Symbol: </fo:block> <fo:block space-after.optimum="10pt" font-family="Symbol"> -! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~    ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ +! # % & ( ) + , . / +0 1 2 3 4 5 6 7 8 9 +: ; < = > ? [ ] _ m +{ | } ¬ ° ± µ × ÷ +ƒ Α Β Γ Ε Ζ Η +Θ Ι Κ Λ Μ Ν Ξ +Ο Π Ρ Σ Τ Υ Φ +Χ Ψ α β γ δ ε +ζ η θ ι κ λ ν +ξ ο π ρ ς σ τ +υ φ χ ψ ω ϑ ϒ +ϕ ϖ • … ′ ″ ⁄ +ℑ ℘ ℜ Ω ℵ ← ↑ +→ ↓ ↔ ↵ ⇐ ⇑ ⇒ +⇓ ⇔ ∀ ∂ ∃ ∅ ∆ +∇ ∈ ∉ ∋ ∏ ∑ − +∗ √ ∝ ∞ ∠ ∧ ∨ +∩ ∪ ∫ ∴ ∼ ≅ ≈ +≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ +⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ⌠ +⌡ 〈 〉 ◊ ♠ ♣ ♥ +♦       +       +       +       +  </fo:block> <fo:block font-family="Helvetica" font-size="12pt"> @@ -67,7 +185,36 @@ Euro ( dec 8364, hex 20AC): € </fo:block> + <fo:block font-family="Helvetica" font-size="12pt"> + Different font sizes: + </fo:block> <fo:block space-after.optimum="10pt" font-family="Helvetica"> + <fo:inline font-size="8.0pt">A</fo:inline> + <fo:inline font-size="8.1pt">A</fo:inline> + <fo:inline font-size="8.2pt">A</fo:inline> + <fo:inline font-size="8.3pt">A</fo:inline> + <fo:inline font-size="8.4pt">A</fo:inline> + <fo:inline font-size="8.5pt">A</fo:inline> + <fo:inline font-size="8.6pt">A</fo:inline> + <fo:inline font-size="8.7pt">A</fo:inline> + <fo:inline font-size="8.8pt">A</fo:inline> + <fo:inline font-size="8.9pt">A</fo:inline> + <fo:inline font-size="9.0pt">A</fo:inline> + <fo:inline font-size="9.1pt">A</fo:inline> + <fo:inline font-size="9.2pt">A</fo:inline> + <fo:inline font-size="9.3pt">A</fo:inline> + <fo:inline font-size="9.4pt">A</fo:inline> + <fo:inline font-size="9.5pt">A</fo:inline> + <fo:inline font-size="9.6pt">A</fo:inline> + <fo:inline font-size="9.7pt">A</fo:inline> + <fo:inline font-size="9.8pt">A</fo:inline> + <fo:inline font-size="9.9pt">A</fo:inline> + <fo:inline font-size="10pt">A</fo:inline> + <fo:inline>---</fo:inline> + <fo:inline font-size="10.5pt">A</fo:inline> + <fo:inline font-size="11pt">A</fo:inline> + <fo:inline font-size="11.5pt">A</fo:inline> + <fo:inline font-size="12pt">A</fo:inline> </fo:block> diff --git a/docs/examples/fo/hyphen.fo b/docs/examples/fo/hyphen.fo index 572d320d3..d27f44c36 100644 --- a/docs/examples/fo/hyphen.fo +++ b/docs/examples/fo/hyphen.fo @@ -39,7 +39,7 @@ the attribute value of master-name refers to the page layout which is to be used to layout the text contained in this page-sequence--> - <fo:page-sequence master-name="simple"> + <fo:page-sequence master-reference="simple"> <!-- start fo:flow each flow is targeted @@ -423,6 +423,46 @@ mildnet etter 1837 at det ble åpnet for en grundigere historisk analyse av Grun forhistorie og tilblivelse. </fo:block> </fo:block> + <!-- this defines a title --> + <fo:block font-size="12pt" + font-family="sans-serif" + line-height="12pt" + background-color="blue" + color="white" + text-align="start"> + Czech + </fo:block> + + <!-- this defines normal text --> + <fo:block font-size="12pt" + font-family="sans-serif" + line-height="15pt" + space-after.optimum="3pt" + language="cs" + hyphenate="true"> + + <fo:block font-weight="bold">Úryvek z knihy Alenka v říši divů</fo:block> + <fo:block> +Alenka si ani trochu neublížila a v mžiku byla na nohou: pohlédla nad sebe a kolem sebe, +nad ní bylo temno a před ní nová dlouhá chodba, v níž ještě zahlédla pospíchajícího Bílého Králíka. +Nesměla ztratit ani vteřinu: jako vítr se pustila za ním a doběhla k němu dosti blízko, aby slyšela, +jak si povídá, zahýbaje kolem rohu: "U mých uší a vousů, jak je pozdě!" Byla těsně za ním, když zahnula +kolem rohu. Králík se jí však náhle ztratil z očí. Byla v dlouhé nízké síni, osvětlené řadou lamp, +visících ze stropu. Po obou stranách síně byly řady dveří, všechny však byly zamčeny, a když je Alenka +všechny po jedné i po druhé straně vyzkoušela, ubírala se smutně prostředkem síně přemýšlejíc, jak se kdy +opět dostane domů. + </fo:block> + <fo:block> +Pojednou jí stál v cestě malý třínohý stolek, celý z hladkého průhledného skla; na něm nebylo nic než malinký +zlatý klíček, a Alenku hned napadlo, že by to mohl být klíček od některých těch dveří: ale běda! bud' byly zámky +příliš velké, nebo klíč příliš malý, ať už tak nebo onak, nehodily se k sobě. Když však tak po druhé obcházela, +uviděla před sebou nízkou záclonku, které dříve nezpozorovala, a za ní byly malé dveře, tak asi patnáct palců +vysoké: zkusila zlatý klíček v jejich zámku a k veliké její radosti zapadl. Alenka otevřela dveře a shledala, +že vedou do malé chodbičky, ne prostornější než myší díra. Poklekla a hleděla chodbičkou do nejrozkošnější zahrady, +jakou si jen můžete představit. Ó, jak toužila dostat se z malé síně a procházeti se mezi záhony zářivých +květin a chladnými vodotrysky! Ale dveřmi jí neprošla ani hlava. + </fo:block> + </fo:block> </fo:flow> <!-- closes the flow element--> </fo:page-sequence> <!-- closes the page-sequence --> </fo:root> diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo index a75f04c55..b25cafae7 100644 --- a/docs/examples/fo/images.fo +++ b/docs/examples/fo/images.fo @@ -17,20 +17,20 @@ <fo:page-sequence-master master-name="psmOddEven" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="right" + <fo:conditional-page-master-reference master-reference="right" page-position="first" /> - <fo:conditional-page-master-reference master-name="left" + <fo:conditional-page-master-reference master-reference="left" odd-or-even="even" /> - <fo:conditional-page-master-reference master-name="right" + <fo:conditional-page-master-reference master-reference="right" odd-or-even="odd" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> -<fo:page-sequence id="N2528" master-name="psmOddEven"> +<fo:page-sequence id="N2528" master-reference="psmOddEven"> <fo:static-content flow-name="xsl-region-after"> <fo:block text-align-last="center" font-size="10pt"> @@ -71,7 +71,7 @@ </fo:flow> </fo:page-sequence> -<fo:page-sequence id="N2561" master-name="psmOddEven"> +<fo:page-sequence id="N2561" master-reference="psmOddEven"> <fo:static-content flow-name="xsl-region-after"> <fo:block text-align-last="center" font-size="10pt"> <fo:page-number/></fo:block> diff --git a/docs/examples/fo/inhprop.fo b/docs/examples/fo/inhprop.fo index 16b2fde0a..81e8cf730 100644 --- a/docs/examples/fo/inhprop.fo +++ b/docs/examples/fo/inhprop.fo @@ -48,12 +48,12 @@ Below fo:root there is always <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -61,7 +61,7 @@ Below fo:root there is always <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/fo/instream.fo b/docs/examples/fo/instream.fo index a29c5ceb0..01dde3872 100644 --- a/docs/examples/fo/instream.fo +++ b/docs/examples/fo/instream.fo @@ -4,7 +4,7 @@ <fo:region-body margin-top="25pt" margin-bottom="25pt" margin-left="50pt" margin-right="50pt" /> </fo:simple-page-master> </fo:layout-master-set> -<fo:page-sequence master-name="one"> +<fo:page-sequence master-reference="one"> <fo:flow flow-name="xsl-region-body"> <fo:block>This is used to show how foreign objects are placed in a line area.</fo:block> <fo:block> diff --git a/docs/examples/fo/leader.fo b/docs/examples/fo/leader.fo index f90769dbc..486386ad9 100644 --- a/docs/examples/fo/leader.fo +++ b/docs/examples/fo/leader.fo @@ -23,7 +23,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:flow flow-name="xsl-region-body"> diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo index e47d3ce8e..28ab1b31e 100644 --- a/docs/examples/fo/link.fo +++ b/docs/examples/fo/link.fo @@ -18,7 +18,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <!-- text body --> <fo:flow flow-name="xsl-region-body"> diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo index 8ea1ca394..92f0be94e 100644 --- a/docs/examples/fo/list.fo +++ b/docs/examples/fo/list.fo @@ -41,7 +41,7 @@ the attribute value of master-name refers to the page layout which is to be used to layout the text contained in this page-sequence--> - <fo:page-sequence master-name="simple"> + <fo:page-sequence master-reference="simple"> <!-- start fo:flow each flow is targeted @@ -89,7 +89,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -103,7 +103,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -117,7 +117,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -131,7 +131,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -145,7 +145,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -225,7 +225,7 @@ url: http://www.w3.org/TR/xsl/ --> <fo:block text-align="center" space-before.optimum="0.5cm"> - <fo:external-graphic src="file:../graphics/listgeometry.gif"/> + <fo:external-graphic src="file:../../graphics/listgeometry.gif"/> </fo:block> <fo:block font-size="10pt" font-family="sans-serif" @@ -255,7 +255,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-size="10pt" font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-size="10pt" font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -269,7 +269,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-size="10pt" font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-size="10pt" font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -283,7 +283,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-size="10pt" font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-size="10pt" font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -362,7 +362,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -376,7 +376,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -390,7 +390,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -404,7 +404,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -418,7 +418,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -462,7 +462,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -479,7 +479,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -496,7 +496,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -513,7 +513,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -530,7 +530,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -575,7 +575,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">label 1)</fo:block> + <fo:block>label 1)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -589,7 +589,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">lab. 2)</fo:block> + <fo:block>lab. 2)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -603,7 +603,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">lab. 3)</fo:block> + <fo:block>lab. 3)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -617,7 +617,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">lab. 4)</fo:block> + <fo:block>lab. 4)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -631,7 +631,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">lab. 5)</fo:block> + <fo:block>lab. 5)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -678,7 +678,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -692,7 +692,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -706,7 +706,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -720,7 +720,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -734,7 +734,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -748,7 +748,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -762,7 +762,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -776,7 +776,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -790,7 +790,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -804,7 +804,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -818,7 +818,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -832,7 +832,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -846,7 +846,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -860,7 +860,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -874,7 +874,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -888,7 +888,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -902,7 +902,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -916,7 +916,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -930,7 +930,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -944,7 +944,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -958,7 +958,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -972,7 +972,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -986,7 +986,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1000,7 +1000,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1014,7 +1014,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1028,7 +1028,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1042,7 +1042,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1056,7 +1056,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1070,7 +1070,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1084,7 +1084,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1098,7 +1098,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1112,7 +1112,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1126,7 +1126,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1140,7 +1140,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1154,7 +1154,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1168,7 +1168,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1182,7 +1182,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1196,7 +1196,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1210,7 +1210,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1224,7 +1224,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1238,7 +1238,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1252,7 +1252,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1266,7 +1266,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1280,7 +1280,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1294,7 +1294,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1308,7 +1308,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1322,7 +1322,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1336,7 +1336,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1350,7 +1350,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1364,7 +1364,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1378,7 +1378,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1392,7 +1392,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1405,7 +1405,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1419,7 +1419,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1433,7 +1433,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1447,7 +1447,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1461,7 +1461,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1475,7 +1475,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1489,7 +1489,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1503,7 +1503,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1517,7 +1517,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1531,7 +1531,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1545,7 +1545,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1559,7 +1559,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1573,7 +1573,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1587,7 +1587,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1601,7 +1601,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1615,7 +1615,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1629,7 +1629,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1643,7 +1643,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1657,7 +1657,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1671,7 +1671,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1685,7 +1685,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1699,7 +1699,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1713,7 +1713,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1727,7 +1727,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1741,7 +1741,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1755,7 +1755,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1768,7 +1768,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1782,7 +1782,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1796,7 +1796,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1810,7 +1810,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1824,7 +1824,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1838,7 +1838,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1852,7 +1852,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1866,7 +1866,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1880,7 +1880,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1894,7 +1894,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1908,7 +1908,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1922,7 +1922,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1936,7 +1936,7 @@ <fo:list-item> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1979,7 +1979,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -1994,7 +1994,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2009,7 +2009,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">1.)</fo:block> + <fo:block>1.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2022,7 +2022,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">2.)</fo:block> + <fo:block>2.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2038,7 +2038,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">3.)</fo:block> + <fo:block>3.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2051,7 +2051,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">4.)</fo:block> + <fo:block>4.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2067,7 +2067,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">5.)</fo:block> + <fo:block>5.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2088,7 +2088,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2103,7 +2103,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2117,7 +2117,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2164,7 +2164,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2179,7 +2179,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2194,7 +2194,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">1.)</fo:block> + <fo:block>1.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2250,7 +2250,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2265,7 +2265,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2280,7 +2280,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2295,7 +2295,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2310,7 +2310,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2325,7 +2325,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2340,7 +2340,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2355,7 +2355,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">1.)</fo:block> + <fo:block>1.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2368,7 +2368,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">2.)</fo:block> + <fo:block>2.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2384,7 +2384,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">3.)</fo:block> + <fo:block>3.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2397,7 +2397,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">4.)</fo:block> + <fo:block>4.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2413,7 +2413,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">5.)</fo:block> + <fo:block>5.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2426,7 +2426,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">6.)</fo:block> + <fo:block>6.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2442,7 +2442,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">7.)</fo:block> + <fo:block>7.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2458,7 +2458,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">8.)</fo:block> + <fo:block>8.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2474,7 +2474,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">9.)</fo:block> + <fo:block>9.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2490,7 +2490,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">10.)</fo:block> + <fo:block>10.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2506,7 +2506,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">11.)</fo:block> + <fo:block>11.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2522,7 +2522,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">12.)</fo:block> + <fo:block>12.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2538,7 +2538,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">13.)</fo:block> + <fo:block>13.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2554,7 +2554,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">14.)</fo:block> + <fo:block>14.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2570,7 +2570,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">15.)</fo:block> + <fo:block>15.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2586,7 +2586,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">16.)</fo:block> + <fo:block>16.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2602,7 +2602,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a number --> <fo:list-item-label end-indent="label-end()"> - <fo:block text-align="end">17.)</fo:block> + <fo:block>17.)</fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2625,7 +2625,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2640,7 +2640,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> @@ -2654,7 +2654,7 @@ <fo:list-item start-indent="0.5cm"> <!-- insert a bullet --> <fo:list-item-label end-indent="label-end()"> - <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> + <fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> <fo:list-item-body start-indent="body-start()"> diff --git a/docs/examples/fo/newlinktest.fo b/docs/examples/fo/newlinktest.fo index 55df88218..36484bcd5 100644 --- a/docs/examples/fo/newlinktest.fo +++ b/docs/examples/fo/newlinktest.fo @@ -15,7 +15,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo index e64feafe2..0959b4020 100644 --- a/docs/examples/fo/normal.fo +++ b/docs/examples/fo/normal.fo @@ -48,12 +48,12 @@ Below fo:root there is always <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -61,7 +61,7 @@ Below fo:root there is always <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/fo/normalex.fo b/docs/examples/fo/normalex.fo index 90941de19..00e3e5b7e 100644 --- a/docs/examples/fo/normalex.fo +++ b/docs/examples/fo/normalex.fo @@ -48,12 +48,12 @@ Below fo:root there is always <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -61,7 +61,7 @@ Below fo:root there is always <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/fo/pdfoutline.fo b/docs/examples/fo/pdfoutline.fo index 5f91c1952..7497625c8 100644 --- a/docs/examples/fo/pdfoutline.fo +++ b/docs/examples/fo/pdfoutline.fo @@ -45,12 +45,12 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -123,7 +123,7 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <fo:static-content flow-name="xsl-region-before"> @@ -355,7 +355,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>root </fo:block> @@ -363,7 +363,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>layout-master-set </fo:block> @@ -371,7 +371,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>simple-page-master </fo:block> @@ -379,7 +379,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>region-body </fo:block> @@ -387,7 +387,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>region-before </fo:block> @@ -395,7 +395,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>region-after </fo:block> @@ -403,7 +403,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-sequence </fo:block> @@ -411,7 +411,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specification </fo:block> @@ -419,7 +419,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specifier-single </fo:block> @@ -427,7 +427,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specifier-repeating </fo:block> @@ -435,7 +435,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specifier-alternating </fo:block> @@ -443,7 +443,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>flow </fo:block> @@ -451,7 +451,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>static-content </fo:block> @@ -459,7 +459,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>block </fo:block> @@ -467,7 +467,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-block </fo:block> @@ -475,7 +475,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-item </fo:block> @@ -483,7 +483,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-item-label </fo:block> @@ -491,7 +491,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-item-body </fo:block> @@ -499,7 +499,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-number </fo:block> @@ -507,7 +507,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>display-sequence </fo:block> @@ -515,7 +515,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>inline </fo:block> @@ -523,7 +523,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>display-rule </fo:block> @@ -531,7 +531,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>display-graphic </fo:block> @@ -539,7 +539,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table (minimal support)</fo:block> @@ -547,7 +547,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-column (minimal support)</fo:block> @@ -555,7 +555,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-body (minimal support)</fo:block> @@ -563,7 +563,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-row (minimal support)</fo:block> @@ -571,7 +571,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-cell (minimal support)</fo:block> @@ -585,7 +585,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>end-indent </fo:block> @@ -593,7 +593,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-name </fo:block> @@ -601,7 +601,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-first </fo:block> @@ -609,7 +609,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-repeating </fo:block> @@ -617,7 +617,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-odd </fo:block> @@ -625,7 +625,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-even </fo:block> @@ -633,7 +633,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-top (only on pages and regions)</fo:block> @@ -641,7 +641,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-bottom (only on pages and regions)</fo:block> @@ -649,7 +649,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-left (only on pages and regions)</fo:block> @@ -657,7 +657,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-right (only on pages and regions)</fo:block> @@ -665,7 +665,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>extent </fo:block> @@ -673,7 +673,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-width </fo:block> @@ -681,7 +681,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-height </fo:block> @@ -689,7 +689,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>flow-name </fo:block> @@ -697,7 +697,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-family </fo:block> @@ -705,7 +705,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-style </fo:block> @@ -713,7 +713,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-weight </fo:block> @@ -721,7 +721,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-size </fo:block> @@ -729,7 +729,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>line-height </fo:block> @@ -737,7 +737,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>text-align </fo:block> @@ -745,7 +745,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>text-align-last </fo:block> @@ -753,7 +753,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>space-before.optimum </fo:block> @@ -761,7 +761,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>space-after.optimum </fo:block> @@ -769,7 +769,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>start-indent </fo:block> @@ -777,7 +777,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>end-indent </fo:block> @@ -785,7 +785,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>provisional-distance-between-starts </fo:block> @@ -793,7 +793,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>provisional-label-separation </fo:block> @@ -801,7 +801,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>rule-thickness </fo:block> @@ -809,7 +809,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>color </fo:block> @@ -817,7 +817,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>wrap-option </fo:block> @@ -825,7 +825,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>white-space-treatment </fo:block> @@ -833,7 +833,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>break-before </fo:block> @@ -841,7 +841,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>break-after </fo:block> @@ -849,7 +849,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>text-indent </fo:block> @@ -857,7 +857,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>href</fo:block> @@ -865,7 +865,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>column-width</fo:block> @@ -873,7 +873,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>background-color</fo:block> @@ -881,7 +881,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-top (only in conjunction with background color)</fo:block> @@ -889,7 +889,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-left (only in conjunction with background color)</fo:block> @@ -897,7 +897,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-bottom (only in conjunction with background color)</fo:block> @@ -905,7 +905,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-right (only in conjunction with background color)</fo:block> @@ -1096,7 +1096,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1109,7 +1109,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1122,7 +1122,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1135,7 +1135,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1148,7 +1148,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1161,7 +1161,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1174,7 +1174,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1187,7 +1187,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo index f1f7e5cda..3f9118e14 100644 --- a/docs/examples/fo/readme.fo +++ b/docs/examples/fo/readme.fo @@ -43,12 +43,12 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -56,7 +56,7 @@ This files shows next to the trivial usage of fo:block and fo:inline examples of <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <fo:static-content flow-name="xsl-region-before"> @@ -285,7 +285,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>root </fo:block> @@ -293,7 +293,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>layout-master-set </fo:block> @@ -301,7 +301,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>simple-page-master </fo:block> @@ -309,7 +309,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>region-body </fo:block> @@ -317,7 +317,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>region-before </fo:block> @@ -325,7 +325,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>region-after </fo:block> @@ -333,7 +333,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-sequence </fo:block> @@ -341,7 +341,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specification </fo:block> @@ -349,7 +349,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specifier-single </fo:block> @@ -357,7 +357,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specifier-repeating </fo:block> @@ -365,7 +365,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>sequence-specifier-alternating </fo:block> @@ -373,7 +373,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>flow </fo:block> @@ -381,7 +381,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>static-content </fo:block> @@ -389,7 +389,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>block </fo:block> @@ -397,7 +397,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-block </fo:block> @@ -405,7 +405,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-item </fo:block> @@ -413,7 +413,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-item-label </fo:block> @@ -421,7 +421,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>list-item-body </fo:block> @@ -429,7 +429,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-number </fo:block> @@ -437,7 +437,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>display-sequence </fo:block> @@ -445,7 +445,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>inline </fo:block> @@ -453,7 +453,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>display-rule </fo:block> @@ -461,7 +461,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>display-graphic </fo:block> @@ -469,7 +469,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table (minimal support)</fo:block> @@ -477,7 +477,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-column (minimal support)</fo:block> @@ -485,7 +485,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-body (minimal support)</fo:block> @@ -493,7 +493,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-row (minimal support)</fo:block> @@ -501,7 +501,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>table-cell (minimal support)</fo:block> @@ -515,7 +515,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>end-indent </fo:block> @@ -523,7 +523,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-name </fo:block> @@ -531,7 +531,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-first </fo:block> @@ -539,7 +539,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-repeating </fo:block> @@ -547,7 +547,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-odd </fo:block> @@ -555,7 +555,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-master-even </fo:block> @@ -563,7 +563,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-top (only on pages and regions)</fo:block> @@ -571,7 +571,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-bottom (only on pages and regions)</fo:block> @@ -579,7 +579,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-left (only on pages and regions)</fo:block> @@ -587,7 +587,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>margin-right (only on pages and regions)</fo:block> @@ -595,7 +595,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>extent </fo:block> @@ -603,7 +603,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-width </fo:block> @@ -611,7 +611,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>page-height </fo:block> @@ -619,7 +619,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>flow-name </fo:block> @@ -627,7 +627,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-family </fo:block> @@ -635,7 +635,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-style </fo:block> @@ -643,7 +643,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-weight </fo:block> @@ -651,7 +651,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>font-size </fo:block> @@ -659,7 +659,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>line-height </fo:block> @@ -667,7 +667,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>text-align </fo:block> @@ -675,7 +675,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>text-align-last </fo:block> @@ -683,7 +683,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>space-before.optimum </fo:block> @@ -691,7 +691,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>space-after.optimum </fo:block> @@ -699,7 +699,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>start-indent </fo:block> @@ -707,7 +707,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>end-indent </fo:block> @@ -715,7 +715,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>provisional-distance-between-starts </fo:block> @@ -723,7 +723,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>provisional-label-separation </fo:block> @@ -731,7 +731,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>rule-thickness </fo:block> @@ -739,7 +739,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>color </fo:block> @@ -747,7 +747,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>wrap-option </fo:block> @@ -755,7 +755,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>white-space-treatment </fo:block> @@ -763,7 +763,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>break-before </fo:block> @@ -771,7 +771,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>break-after </fo:block> @@ -779,7 +779,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>text-indent </fo:block> @@ -787,7 +787,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>href</fo:block> @@ -795,7 +795,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>column-width</fo:block> @@ -803,7 +803,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>background-color</fo:block> @@ -811,7 +811,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-top (only in conjunction with background color)</fo:block> @@ -819,7 +819,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-left (only in conjunction with background color)</fo:block> @@ -827,7 +827,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-bottom (only in conjunction with background color)</fo:block> @@ -835,7 +835,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block>padding-right (only in conjunction with background color)</fo:block> @@ -1026,7 +1026,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1039,7 +1039,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1052,7 +1052,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1065,7 +1065,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1078,7 +1078,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1091,7 +1091,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1104,7 +1104,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> @@ -1117,7 +1117,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p </fo:list-item> <fo:list-item> <fo:list-item-label end-indent="label-end()"> -<fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> +<fo:block><fo:inline font-family="Symbol">•</fo:inline></fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> <fo:block> diff --git a/docs/examples/fo/simple.fo b/docs/examples/fo/simple.fo index e8a49f1c4..27c4fd962 100644 --- a/docs/examples/fo/simple.fo +++ b/docs/examples/fo/simple.fo @@ -39,7 +39,7 @@ the attribute value of master-name refers to the page layout which is to be used to layout the text contained in this page-sequence--> - <fo:page-sequence master-name="simple"> + <fo:page-sequence master-reference="simple"> <!-- start fo:flow each flow is targeted diff --git a/docs/examples/fo/table.fo b/docs/examples/fo/table.fo index 92f6dd932..3d7e268b1 100644 --- a/docs/examples/fo/table.fo +++ b/docs/examples/fo/table.fo @@ -19,7 +19,7 @@ </fo:layout-master-set> <!-- starts actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:flow flow-name="xsl-region-body"> diff --git a/docs/examples/fo/tableunits.fo b/docs/examples/fo/tableunits.fo index 6ede25aa7..502e676fc 100644 --- a/docs/examples/fo/tableunits.fo +++ b/docs/examples/fo/tableunits.fo @@ -19,7 +19,7 @@ </fo:layout-master-set> <!-- starts actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:flow flow-name="xsl-region-body"> diff --git a/docs/examples/fo/textdeko.fo b/docs/examples/fo/textdeko.fo index 08d01484f..1ee982ec2 100644 --- a/docs/examples/fo/textdeko.fo +++ b/docs/examples/fo/textdeko.fo @@ -34,12 +34,12 @@ <fo:page-sequence-master master-name="basicPSM" > <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first" + <fo:conditional-page-master-reference master-reference="first" page-position="first" /> - <fo:conditional-page-master-reference master-name="rest" + <fo:conditional-page-master-reference master-reference="rest" page-position="rest" /> <!-- recommended fallback procedure --> - <fo:conditional-page-master-reference master-name="rest" /> + <fo:conditional-page-master-reference master-reference="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -47,7 +47,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="basicPSM"> + <fo:page-sequence master-reference="basicPSM"> <fo:flow flow-name="xsl-region-body"> @@ -59,7 +59,7 @@ <fo:block font-size="12pt" font-family="sans-serif" line-height="15pt" text-align="justify" space-after.optimum="10pt"> The "text-decoration"-property describes decorations that are added to the text of an element. If the property is specified for a block-level element, it should affect all inline-level descendants - of the element (does not work yet!). + of the element. If it is specified for (or affects) an inline-level element, it affects all boxes generated by the element. </fo:block> @@ -77,7 +77,7 @@ line-height="15pt" space-after.optimum="10pt" text-align="start"> - This is simple test of the text-decoration<fo:inline text-decoration="underline">underline</fo:inline>. + This is simple test of the text-decoration <fo:inline text-decoration="underline">'underline'</fo:inline>. </fo:block> <fo:block font-size="22pt" font-family="sans-serif" @@ -96,7 +96,7 @@ </fo:block> <fo:block font-size="12pt" font-family="sans-serif" line-height="15pt" text-align="justify" space-after.optimum="3pt"> - The following text decorations are defined in the CR: + The following text decorations are defined in the REC: </fo:block> <fo:list-block space-after.optimum="13pt"> @@ -246,6 +246,43 @@ What about underlining of whitespace only<fo:inline text-decoration="underline"> </fo:inline>? </fo:block> + <fo:block space-after.optimum="13pt" font-size="14pt" text-decoration="underline"> + A whole block should work now. + And again some more text to get at least two lines. + </fo:block> + + <fo:block space-after.optimum="13pt" font-size="14pt" > + + <fo:inline text-decoration="underline"> + <fo:block> + Let's see if all inline-areas are <fo:inline>affected</fo:inline> ... + </fo:block> + </fo:inline> + + </fo:block> + + <fo:block space-after.optimum="13pt" font-size="14pt" > + <fo:inline text-decoration="underline"> + This is a workaround for + <fo:inline text-decoration="overline"> + the combination of + <fo:inline text-decoration="line-through">different text-decoration values... + </fo:inline> + </fo:inline> + </fo:inline> + </fo:block> + + <fo:block space-after.optimum="13pt" font-size="14pt" > + Enter your name here: + <fo:inline text-decoration="underline">_        +               +              </fo:inline> + </fo:block> + + <fo:block>The following blocks demonstrate the letter-spacing attribute:</fo:block> + <fo:block>This block does not use any letter-spacing.</fo:block> + <fo:block letter-spacing="1mm">This block uses a letter-spacing of 1mm.</fo:block> + <fo:block>This block uses an fo:inline element to demonstrate <fo:inline letter-spacing="1mm">letter-spacing</fo:inline>.</fo:block> </fo:flow> </fo:page-sequence> diff --git a/docs/examples/footnotes/columns.fo b/docs/examples/footnotes/columns.fo index 5591e5d2f..feed886b5 100644 --- a/docs/examples/footnotes/columns.fo +++ b/docs/examples/footnotes/columns.fo @@ -37,7 +37,7 @@ </fo:layout-master-set> <!-- actual layout --> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block font-size="16pt" font-family="sans-serif" @@ -142,7 +142,7 @@ How shall I complete the wall? </fo:flow> </fo:page-sequence> - <fo:page-sequence master-name="next"> + <fo:page-sequence master-reference="next"> <fo:static-content flow-name="xsl-region-before"> <fo:block font-size="16pt" font-family="sans-serif" diff --git a/docs/examples/footnotes/simple.fo b/docs/examples/footnotes/simple.fo index 1af55f2ce..0245a2cbe 100644 --- a/docs/examples/footnotes/simple.fo +++ b/docs/examples/footnotes/simple.fo @@ -7,7 +7,7 @@ <fo:region-after extent="0.5cm"/> </fo:simple-page-master> </fo:layout-master-set> -<fo:page-sequence master-name="one"> +<fo:page-sequence master-reference="one"> <fo:flow flow-name="xsl-region-body"> <fo:block space-after.optimum="10pt" font-weight="bold" font-size="16pt" text-align="center"> diff --git a/docs/examples/keeps_and_breaks/columnlevel1.fo b/docs/examples/keeps_and_breaks/columnlevel1.fo index a76163002..bda51efe2 100644 --- a/docs/examples/keeps_and_breaks/columnlevel1.fo +++ b/docs/examples/keeps_and_breaks/columnlevel1.fo @@ -22,7 +22,7 @@ This file addresses breaks in column context. </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="all"> + <fo:page-sequence master-reference="all"> <fo:static-content flow-name="xsl-region-after"> <fo:block font-size="10pt" text-align="start" border-style="solid" border-color="blue" border-width="0.5pt" diff --git a/docs/examples/keeps_and_breaks/pagelevel1.fo b/docs/examples/keeps_and_breaks/pagelevel1.fo index 78ea1c2a2..c5ebfa177 100644 --- a/docs/examples/keeps_and_breaks/pagelevel1.fo +++ b/docs/examples/keeps_and_breaks/pagelevel1.fo @@ -21,7 +21,7 @@ This file addresses breaks in page context. </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="all"> + <fo:page-sequence master-reference="all"> <fo:static-content flow-name="xsl-region-after"> <fo:block font-size="10pt" text-align="start" border-style="solid" border-color="blue" border-width="0.5pt"> diff --git a/docs/examples/keeps_and_breaks/pagelevel2.fo b/docs/examples/keeps_and_breaks/pagelevel2.fo index fc3369a18..a5069b6c2 100644 --- a/docs/examples/keeps_and_breaks/pagelevel2.fo +++ b/docs/examples/keeps_and_breaks/pagelevel2.fo @@ -21,7 +21,7 @@ This file addresses break-after's in page context. </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="all"> + <fo:page-sequence master-reference="all"> <fo:static-content flow-name="xsl-region-after"> <fo:block font-size="10pt" text-align="start" border-style="solid" border-color="blue" border-width="0.5pt" diff --git a/docs/examples/keeps_and_breaks/pagelevel3.fo b/docs/examples/keeps_and_breaks/pagelevel3.fo index 29ca25306..2cc73bab5 100644 --- a/docs/examples/keeps_and_breaks/pagelevel3.fo +++ b/docs/examples/keeps_and_breaks/pagelevel3.fo @@ -21,7 +21,7 @@ This file addresses break-before's in page context. </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="all"> + <fo:page-sequence master-reference="all"> <fo:static-content flow-name="xsl-region-after"> <fo:block font-size="10pt" text-align="start" border-style="solid" border-color="blue" border-width="0.5pt" diff --git a/docs/examples/keeps_and_breaks/pagelevel4.fo b/docs/examples/keeps_and_breaks/pagelevel4.fo index d7be73267..22fd1c0eb 100644 --- a/docs/examples/keeps_and_breaks/pagelevel4.fo +++ b/docs/examples/keeps_and_breaks/pagelevel4.fo @@ -23,7 +23,7 @@ This file addresses breaks in page context, with a </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="all"> + <fo:page-sequence master-reference="all"> <fo:static-content flow-name="xsl-region-after"> <fo:block font-size="10pt" text-align="start" border-style="solid" border-color="blue" border-width="0.5pt" diff --git a/docs/examples/markers/glossary.xsl b/docs/examples/markers/glossary.xsl index a509f67bf..49deef1eb 100644 --- a/docs/examples/markers/glossary.xsl +++ b/docs/examples/markers/glossary.xsl @@ -20,7 +20,7 @@ </fo:layout-master-set> - <fo:page-sequence master-name="all" format="i"> + <fo:page-sequence master-reference="all" format="i"> <!-- header with running glossary entries --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/markers/hide.fo b/docs/examples/markers/hide.fo index 694cb9c99..49e62fce1 100644 --- a/docs/examples/markers/hide.fo +++ b/docs/examples/markers/hide.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block-container height="1cm" width="15cm" top="0cm" left="0cm" position="absolute"> <fo:block> @@ -74,7 +74,7 @@ This page sequence only has one page so you will not see the message. </fo:flow> </fo:page-sequence> - <fo:page-sequence master-name="first" initial-page-number="1"> + <fo:page-sequence master-reference="first" initial-page-number="1"> <fo:static-content flow-name="xsl-region-before"> <fo:block-container height="1cm" width="15cm" top="0cm" left="0cm" position="absolute"> <fo:block> <fo:retrieve-marker retrieve-class-name="message" diff --git a/docs/examples/pagination/allregions.fo b/docs/examples/pagination/allregions.fo index 6a29c75e8..e7bb5cd40 100644 --- a/docs/examples/pagination/allregions.fo +++ b/docs/examples/pagination/allregions.fo @@ -26,7 +26,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="only" initial-page-number="1"> + <fo:page-sequence master-reference="only" initial-page-number="1"> <!-- usage of page layout --> <!-- header --> diff --git a/docs/examples/pagination/basic1.fo b/docs/examples/pagination/basic1.fo index 74a673137..64739cbee 100644 --- a/docs/examples/pagination/basic1.fo +++ b/docs/examples/pagination/basic1.fo @@ -22,7 +22,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="only" initial-page-number="1"> + <fo:page-sequence master-reference="only" initial-page-number="1"> <!-- usage of page layout --> <!-- header --> diff --git a/docs/examples/pagination/basic2.fo b/docs/examples/pagination/basic2.fo index 747fb5f52..96f11a440 100644 --- a/docs/examples/pagination/basic2.fo +++ b/docs/examples/pagination/basic2.fo @@ -19,13 +19,13 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="single"> - <fo:single-page-master-reference master-name="only"/> + <fo:single-page-master-reference master-reference="only"/> </fo:page-sequence-master> </fo:layout-master-set> <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="single" initial-page-number="1"> + <fo:page-sequence master-reference="single" initial-page-number="1"> <!-- usage of page layout --> <!-- header --> diff --git a/docs/examples/pagination/franklin_2pageseqs.fo b/docs/examples/pagination/franklin_2pageseqs.fo index 6aa18e6c7..71184797e 100644 --- a/docs/examples/pagination/franklin_2pageseqs.fo +++ b/docs/examples/pagination/franklin_2pageseqs.fo @@ -53,20 +53,20 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="run1"> - <fo:repeatable-page-master-reference master-name="noheaders_center" + <fo:repeatable-page-master-reference master-reference="noheaders_center" maximum-repeats="6"/> </fo:page-sequence-master> <fo:page-sequence-master master-name="run2"> <fo:repeatable-page-master-alternatives> <fo:conditional-page-master-reference - master-name="headers_center" + master-reference="headers_center" page-position="first" /> <fo:conditional-page-master-reference - master-name="headers_right" + master-reference="headers_right" odd-or-even="odd" /> <fo:conditional-page-master-reference - master-name="headers_left" + master-reference="headers_left" odd-or-even="even" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -74,7 +74,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="run1" initial-page-number="1"> + <fo:page-sequence master-reference="run1" initial-page-number="1"> <fo:flow flow-name="xsl-region-body"> @@ -451,7 +451,7 @@ made to-day was not more than six miles. </fo:flow> </fo:page-sequence> - <fo:page-sequence master-name="run2" initial-page-number="7"> + <fo:page-sequence master-reference="run2" initial-page-number="7"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/pagination/franklin_alt.fo b/docs/examples/pagination/franklin_alt.fo index 127c85070..dd3267964 100644 --- a/docs/examples/pagination/franklin_alt.fo +++ b/docs/examples/pagination/franklin_alt.fo @@ -44,11 +44,11 @@ <fo:page-sequence-master master-name="alternating"> <fo:repeatable-page-master-alternatives maximum-repeats="no-limit"> - <fo:conditional-page-master-reference master-name="right" + <fo:conditional-page-master-reference master-reference="right" odd-or-even="odd" /> - <fo:conditional-page-master-reference master-name="left" + <fo:conditional-page-master-reference master-reference="left" odd-or-even="even" /> - <fo:conditional-page-master-reference master-name="center"/> + <fo:conditional-page-master-reference master-reference="center"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -56,7 +56,7 @@ <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="alternating" initial-page-number="1"> + <fo:page-sequence master-reference="alternating" initial-page-number="1"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/pagination/franklin_rep.fo b/docs/examples/pagination/franklin_rep.fo index ab71e9c54..48f9b1194 100644 --- a/docs/examples/pagination/franklin_rep.fo +++ b/docs/examples/pagination/franklin_rep.fo @@ -19,13 +19,13 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="repeating_pm"> - <fo:repeatable-page-master-reference master-name="repeating"/> + <fo:repeatable-page-master-reference master-reference="repeating"/> </fo:page-sequence-master> </fo:layout-master-set> <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> + <fo:page-sequence master-reference="repeating_pm" initial-page-number="1"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/pagination/franklin_rep_max_repeats.fo b/docs/examples/pagination/franklin_rep_max_repeats.fo index 0baf0956a..321cf56f9 100644 --- a/docs/examples/pagination/franklin_rep_max_repeats.fo +++ b/docs/examples/pagination/franklin_rep_max_repeats.fo @@ -19,15 +19,15 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="repeating_pm"> - <fo:repeatable-page-master-reference master-name="repeating" + <fo:repeatable-page-master-reference master-reference="repeating" maximum-repeats="15"/> - <fo:single-page-master-reference master-name="repeating"/> + <fo:single-page-master-reference master-reference="repeating"/> </fo:page-sequence-master> </fo:layout-master-set> <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> + <fo:page-sequence master-reference="repeating_pm" initial-page-number="1"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/pagination/franklin_rep_max_repeats_expl.fo b/docs/examples/pagination/franklin_rep_max_repeats_expl.fo index 0baf0956a..321cf56f9 100644 --- a/docs/examples/pagination/franklin_rep_max_repeats_expl.fo +++ b/docs/examples/pagination/franklin_rep_max_repeats_expl.fo @@ -19,15 +19,15 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="repeating_pm"> - <fo:repeatable-page-master-reference master-name="repeating" + <fo:repeatable-page-master-reference master-reference="repeating" maximum-repeats="15"/> - <fo:single-page-master-reference master-name="repeating"/> + <fo:single-page-master-reference master-reference="repeating"/> </fo:page-sequence-master> </fo:layout-master-set> <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> + <fo:page-sequence master-reference="repeating_pm" initial-page-number="1"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/pagination/franklin_rep_max_repeats_nl.fo b/docs/examples/pagination/franklin_rep_max_repeats_nl.fo index 09e75969b..05e6c2aef 100644 --- a/docs/examples/pagination/franklin_rep_max_repeats_nl.fo +++ b/docs/examples/pagination/franklin_rep_max_repeats_nl.fo @@ -19,15 +19,15 @@ </fo:simple-page-master> <fo:page-sequence-master master-name="repeating_pm"> - <fo:repeatable-page-master-reference master-name="repeating" + <fo:repeatable-page-master-reference master-reference="repeating" maximum-repeats="no-limit"/> - <fo:single-page-master-reference master-name="repeating"/> + <fo:single-page-master-reference master-reference="repeating"/> </fo:page-sequence-master> </fo:layout-master-set> <!-- end: defines page layout --> <!-- actual layout --> - <fo:page-sequence master-name="repeating_pm" initial-page-number="1"> + <fo:page-sequence master-reference="repeating_pm" initial-page-number="1"> <!-- header --> <fo:static-content flow-name="xsl-region-before"> diff --git a/docs/examples/region_body/simplecol.fo b/docs/examples/region_body/simplecol.fo index 9536b430e..413702f8b 100644 --- a/docs/examples/region_body/simplecol.fo +++ b/docs/examples/region_body/simplecol.fo @@ -23,7 +23,7 @@ </fo:layout-master-set> <!-- actual layout --> - <fo:page-sequence master-name="only"> + <fo:page-sequence master-reference="only"> <fo:static-content flow-name="xsl-region-before"> <fo:block font-size="16pt" font-family="sans-serif" diff --git a/docs/examples/region_body/simplecol2.fo b/docs/examples/region_body/simplecol2.fo index 159320e2a..eb7f41a01 100644 --- a/docs/examples/region_body/simplecol2.fo +++ b/docs/examples/region_body/simplecol2.fo @@ -23,7 +23,7 @@ </fo:layout-master-set> <!-- actual layout --> - <fo:page-sequence master-name="only" > + <fo:page-sequence master-reference="only" > <fo:static-content flow-name="xsl-region-before" > <fo:block font-size="16pt" font-family="sans-serif" diff --git a/docs/examples/region_body/simplecol3.fo b/docs/examples/region_body/simplecol3.fo index 002f860c5..52d8467be 100644 --- a/docs/examples/region_body/simplecol3.fo +++ b/docs/examples/region_body/simplecol3.fo @@ -23,7 +23,7 @@ </fo:layout-master-set> <!-- actual layout --> - <fo:page-sequence master-name="only"> + <fo:page-sequence master-reference="only"> <fo:static-content flow-name="xsl-region-before"> <fo:block font-size="16pt" font-family="sans-serif" diff --git a/docs/examples/region_body/simplecol4.fo b/docs/examples/region_body/simplecol4.fo index d57e332dd..53b270f57 100644 --- a/docs/examples/region_body/simplecol4.fo +++ b/docs/examples/region_body/simplecol4.fo @@ -23,7 +23,7 @@ </fo:layout-master-set> <!-- actual layout --> - <fo:page-sequence master-name="only"> + <fo:page-sequence master-reference="only"> <fo:static-content flow-name="xsl-region-before"> <fo:block font-size="16pt" font-family="sans-serif" diff --git a/docs/examples/runtests.bat b/docs/examples/runtests.bat index c08fbd7c4..04ef2cb94 100755 --- a/docs/examples/runtests.bat +++ b/docs/examples/runtests.bat @@ -7,7 +7,7 @@ if "%JAVA_HOME%" == "" goto error set LIBDIR=..\..\lib -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant-1.4.1.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xercesImpl-2.0.1.jar;%LIBDIR%\xml-apis.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\bsf.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar set ANT_HOME=%LIBDIR% echo Starting Tests ... diff --git a/docs/examples/runtests.sh b/docs/examples/runtests.sh index 93dc067b9..f60c98827 100755 --- a/docs/examples/runtests.sh +++ b/docs/examples/runtests.sh @@ -12,10 +12,29 @@ if [ "$JAVA_HOME" = "" ] ; then echo "location of the Java Virtual Machine you want to use." exit 1 fi +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + + LIBDIR=../../lib -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-4.0.jar:$LIBDIR/logkit-1.0b4.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant-1.4.1.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xml-apis.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/bsf.jar:$LIBDIR/avalon-framework-cvs-20020315.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar ANT_HOME=$LIBDIR +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"` +fi + echo Building with classpath $CLASSPATH:$LOCALCLASSPATH echo diff --git a/docs/examples/svg/embedding.fo b/docs/examples/svg/embedding.fo index a01e204a0..4606e0527 100644 --- a/docs/examples/svg/embedding.fo +++ b/docs/examples/svg/embedding.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">Embedding SVG examples</fo:block> diff --git a/docs/examples/svg/external.fo b/docs/examples/svg/external.fo index 9d908ea96..e96ef4760 100644 --- a/docs/examples/svg/external.fo +++ b/docs/examples/svg/external.fo @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> +<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink"> <fo:layout-master-set> <fo:simple-page-master margin-right="1.5cm" @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">External SVG examples</fo:block> @@ -79,7 +79,7 @@ This inline svg document ( <image xlink:href="file:boxes.svg" x="10" y="10" width="20" height="20"/> </g> <g> - <use xlink:href="file:ref.svg#FOP" transform="scale(1.5)" x="18" y="40"/> + <use xlink:href="file:ref.svg#FOP" transform="scale(1.5)" x="12" y="25"/> </g> </svg> </fo:instream-foreign-object> diff --git a/docs/examples/svg/multi.svg b/docs/examples/svg/multi.svg index 9e68d9a30..bf492806d 100644 --- a/docs/examples/svg/multi.svg +++ b/docs/examples/svg/multi.svg @@ -2,13 +2,13 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000802//EN" "http://www.w3.org/TR/2000/CR-SVG-20000802/DTD/svg-20000802.dtd"> -<svg width="60" height="40" xml:space="preserve"> +<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="40" xml:space="preserve"> <g style="fill:none;stroke:yellow"> <rect x="0" y="0" width="25" height="25"/> <image xlink:href="file:boxes.svg" x="10" y="10" width="20" height="20"/> </g> <g> - <use xlink:href="file:ref.svg#FOP" transform="scale(1.5)" x="18" y="40"/> + <use xlink:href="file:ref.svg#FOP" transform="scale(1.5)" x="12" y="25"/> </g> </svg> diff --git a/docs/examples/tables/background.fo b/docs/examples/tables/background.fo index 8ebfd6084..2b154430a 100644 --- a/docs/examples/tables/background.fo +++ b/docs/examples/tables/background.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/borders.fo b/docs/examples/tables/borders.fo index 60bbb6c25..054e95f16 100644 --- a/docs/examples/tables/borders.fo +++ b/docs/examples/tables/borders.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/break.fo b/docs/examples/tables/break.fo index 50ed0c89c..96831b942 100644 --- a/docs/examples/tables/break.fo +++ b/docs/examples/tables/break.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/headfoot.fo b/docs/examples/tables/headfoot.fo index 3813b573a..ccd740f2f 100644 --- a/docs/examples/tables/headfoot.fo +++ b/docs/examples/tables/headfoot.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/keep.fo b/docs/examples/tables/keep.fo index 79bd6fbf1..cbbbe6a2c 100644 --- a/docs/examples/tables/keep.fo +++ b/docs/examples/tables/keep.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/omit.fo b/docs/examples/tables/omit.fo index 01a946daa..ff8c48335 100644 --- a/docs/examples/tables/omit.fo +++ b/docs/examples/tables/omit.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/space.fo b/docs/examples/tables/space.fo index c9b7259a1..0474f11c9 100644 --- a/docs/examples/tables/space.fo +++ b/docs/examples/tables/space.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> diff --git a/docs/examples/tables/widowsorphans.fo b/docs/examples/tables/widowsorphans.fo index 2c4bba17b..0264b0b8b 100644 --- a/docs/examples/tables/widowsorphans.fo +++ b/docs/examples/tables/widowsorphans.fo @@ -15,7 +15,7 @@ </fo:simple-page-master> </fo:layout-master-set> - <fo:page-sequence master-name="first"> + <fo:page-sequence master-reference="first"> <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="14pt" font-size="10pt" text-align="end">table examples</fo:block> |
