diff options
| author | Keiron Liddle <keiron@apache.org> | 2002-06-28 07:52:54 +0000 |
|---|---|---|
| committer | Keiron Liddle <keiron@apache.org> | 2002-06-28 07:52:54 +0000 |
| commit | 490de46b9eeca6cadf789acc45531f283e79fcbe (patch) | |
| tree | 45877b06add37290cd33c8e831752caf6049505f | |
| parent | 9091d3250a9551da1b6af7d3be363c491a6a2e0d (diff) | |
| download | xmlgraphics-fop-490de46b9eeca6cadf789acc45531f283e79fcbe.tar.gz xmlgraphics-fop-490de46b9eeca6cadf789acc45531f283e79fcbe.zip | |
proper use of font encodings for native fonts
updated xalan
Submitted by: Rainer Garus <rainer.garus@arcor.de>
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194932 13f79535-47bb-0310-9956-ffa450edef68
35 files changed, 3614 insertions, 517 deletions
@@ -6,7 +6,7 @@ echo ---------------- 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.4.3.jar;%LIBDIR%\xalan-2.2D11.jar +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\xml-apis.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar set ANT_HOME=%LIBDIR% @@ -13,7 +13,7 @@ if [ "$JAVA_HOME" = "" ] ; then exit 1 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.4.3.jar:$LIBDIR/xalan-2.2D11.jar +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar ANT_HOME=$LIBDIR @@ -186,6 +186,8 @@ Sometimes ant gives out this warnings, but the build is finished without any pro <property name="optimize" value="off"/> <property name="deprecation" value="off"/> + <property name="textfontencoding" value="WinAnsiEncoding"/> + <property name="src.dir" value="./src"/> <property name="src.codegen" value="./src/codegen"/> <property name="docs.dir" value="./docs"/> @@ -240,23 +242,11 @@ Sometimes ant gives out this warnings, but the build is finished without any pro <property name="propinc.xsl" value="${build.codegen}/propinc.xsl"/> <property name="genconst.xsl" value="${build.codegen}/genconst.xsl"/> <property name="src.charlist.xsl" value="${src.codegen}/code-point-mapping.xsl"/> - <property name="charlist.xml" value="${build.codegen}/charlist.xml"/> + <property name="encodings.xml" value="${build.codegen}/encodings.xml"/> <property name="charlist.xsl" value="${build.codegen}/code-point-mapping.xsl"/> <property name="fontfile.xsl" value="${build.codegen}/font-file.xsl"/> <property name="t1fontfile.xsl" value="${build.codegen}/t1font-file.xsl"/> <property name="ttffontfile.xsl" value="${build.codegen}/ttffontfile.xsl"/> - <property name="Courier.xml" value="${build.codegen}/Courier.xml"/> - <property name="Courier-Oblique.xml" value="${build.codegen}/Courier-Oblique.xml"/> - <property name="Courier-Bold.xml" value="${build.codegen}/Courier-Bold.xml"/> - <property name="Courier-BoldOblique.xml" value="${build.codegen}/Courier-BoldOblique.xml"/> - <property name="Helvetica.xml" value="${build.codegen}/Helvetica.xml"/> - <property name="Helvetica-Oblique.xml" value="${build.codegen}/Helvetica-Oblique.xml"/> - <property name="Helvetica-Bold.xml" value="${build.codegen}/Helvetica-Bold.xml"/> - <property name="Helvetica-BoldOblique.xml" value="${build.codegen}/Helvetica-BoldOblique.xml"/> - <property name="Times-Roman.xml" value="${build.codegen}/Times-Roman.xml"/> - <property name="Times-Italic.xml" value="${build.codegen}/Times-Italic.xml"/> - <property name="Times-Bold.xml" value="${build.codegen}/Times-Bold.xml"/> - <property name="Times-BoldItalic.xml" value="${build.codegen}/Times-BoldItalic.xml"/> <property name="ZapfDingbats.xml" value="${build.codegen}/ZapfDingbats.xml"/> <property name="Symbol.xml" value="${build.codegen}/Symbol.xml"/> @@ -423,12 +413,20 @@ Sometimes ant gives out this warnings, but the build is finished without any pro <style in="${foproperties.xml}" style="${enumgen.xsl}" out="${build.src}/${replacestring}/fo/properties/foenums_${ignore_this}"/> - <style in="${charlist.xml}" style="${charlist.xsl}" + <style in="${encodings.xml}" style="${charlist.xsl}" out="${build.src}/${replacestring}/render/pdf/CodePointMapping.java"/> - <style basedir="src/codegen" includes="*.xml" - excludes="allprops.xml,charlist.xml,colorkw.xml,*prop*" style="${fontfile.xsl}" - destdir="${build.src}/${replacestring}/render/pdf/fonts/" extension=".java"/> + <style basedir="src/codegen" includes="Helvetica*.xml,Times*.xml,Courier*.xml" + style="${fontfile.xsl}" + destdir="${build.src}/${replacestring}/render/pdf/fonts" extension=".java"> + <param name="encoding" expression="${textfontencoding}"/> + </style> + <style + in="${Symbol.xml}" style="${fontfile.xsl}" + out="${build.src}/${replacestring}/render/pdf/fonts/Symbol.java"/> + <style + in="${ZapfDingbats.xml}" style="${fontfile.xsl}" + out="${build.src}/${replacestring}/render/pdf/fonts/ZapfDingbats.java"/> <!-- custom fonts (Use t1fontfile.xsl instead of fontfile.xsl for Type 1 fonts!) step 2/2 --> <!-- use this as a template for type 1 fonts: diff --git a/docs/examples/fo/fonts.fo b/docs/examples/fo/fonts.fo index 43ab9f331..d4af207a2 100644 --- a/docs/examples/fo/fonts.fo +++ b/docs/examples/fo/fonts.fo @@ -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"> diff --git a/docs/examples/fo/list.fo b/docs/examples/fo/list.fo index 74d6916d9..cceefe1ba 100644 --- a/docs/examples/fo/list.fo +++ b/docs/examples/fo/list.fo @@ -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()"> @@ -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()"> @@ -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()"> @@ -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()"> @@ -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()"> @@ -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/pdfoutline.fo b/docs/examples/fo/pdfoutline.fo index 7a00b8e00..caebf85ea 100644 --- a/docs/examples/fo/pdfoutline.fo +++ b/docs/examples/fo/pdfoutline.fo @@ -357,7 +357,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> @@ -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>layout-master-set </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>simple-page-master </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>region-body </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>region-before </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>region-after </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>page-sequence </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>sequence-specification </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>sequence-specifier-single </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>sequence-specifier-repeating </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>sequence-specifier-alternating </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>flow </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>static-content </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>block </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>list-block </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>list-item </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>list-item-label </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>list-item-body </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>page-number </fo:block> @@ -509,7 +509,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> @@ -517,7 +517,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> @@ -525,7 +525,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> @@ -533,7 +533,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> @@ -541,7 +541,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> @@ -549,7 +549,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> @@ -557,7 +557,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> @@ -565,7 +565,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> @@ -573,7 +573,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> @@ -587,7 +587,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> @@ -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>page-master-name </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-master-first </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-master-repeating </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>page-master-odd </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>page-master-even </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>margin-top (only on pages and regions)</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>margin-bottom (only on pages and regions)</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>margin-left (only on pages and regions)</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>margin-right (only on pages and regions)</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>extent </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>page-width </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>page-height </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>flow-name </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>font-family </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>font-style </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>font-weight </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>font-size </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>line-height </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>text-align </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>text-align-last </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>space-before.optimum </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>space-after.optimum </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>start-indent </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>end-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>provisional-distance-between-starts </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>provisional-label-separation </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>rule-thickness </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>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>wrap-option </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>white-space-treatment </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>break-before </fo:block> @@ -843,7 +843,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> @@ -851,7 +851,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> @@ -859,7 +859,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> @@ -867,7 +867,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> @@ -875,7 +875,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> @@ -883,7 +883,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> @@ -891,7 +891,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> @@ -899,7 +899,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> @@ -907,7 +907,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> @@ -1098,7 +1098,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> @@ -1111,7 +1111,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> @@ -1124,7 +1124,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> @@ -1137,7 +1137,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> @@ -1150,7 +1150,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> @@ -1163,7 +1163,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> @@ -1176,7 +1176,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> @@ -1189,7 +1189,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 70e089ac0..3f9118e14 100644 --- a/docs/examples/fo/readme.fo +++ b/docs/examples/fo/readme.fo @@ -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/lib/xalan-2.2D11.LICENSE.txt b/lib/xalan-2.2D11.LICENSE.txt deleted file mode 100644 index 85486bf4a..000000000 --- a/lib/xalan-2.2D11.LICENSE.txt +++ /dev/null @@ -1,50 +0,0 @@ -/* - - ============================================================================ - The Apache Software License, Version 1.1 - ============================================================================ - - Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must - include the following acknowledgment: "This product includes software - developed by the Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, if - and wherever such third-party acknowledgments normally appear. - - 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be - used to endorse or promote products derived from this software without - prior written permission. For written permission, please contact - apache@apache.org. - - 5. Products derived from this software may not be called "Apache", nor may - "Apache" appear in their name, without prior written permission of the - Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation and was originally created by - Stefano Mazzocchi <stefano@apache.org>. For more information on the Apache - Software Foundation, please see <http://www.apache.org/>. - -*/ diff --git a/lib/xalan-2.2D11.jar b/lib/xalan-2.2D11.jar Binary files differdeleted file mode 100644 index 7f70619b7..000000000 --- a/lib/xalan-2.2D11.jar +++ /dev/null diff --git a/lib/xalan-2.3.1.LICENSE.txt b/lib/xalan-2.3.1.LICENSE.txt new file mode 100644 index 000000000..21156a62c --- /dev/null +++ b/lib/xalan-2.3.1.LICENSE.txt @@ -0,0 +1,55 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Xalan" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation and was + * originally based on software copyright (c) 1999, Lotus + * Development Corporation., http://www.lotus.com. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + */ diff --git a/lib/xalan-2.3.1.jar b/lib/xalan-2.3.1.jar Binary files differnew file mode 100644 index 000000000..3681818e1 --- /dev/null +++ b/lib/xalan-2.3.1.jar diff --git a/lib/xml-apis.jar b/lib/xml-apis.jar Binary files differnew file mode 100644 index 000000000..8331d27f1 --- /dev/null +++ b/lib/xml-apis.jar diff --git a/src/codegen/Courier.xml b/src/codegen/Courier.xml index 32e8413e9..1382b78e1 100644 --- a/src/codegen/Courier.xml +++ b/src/codegen/Courier.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Courier</font-name> <class-name>Courier</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>562</cap-height> <x-height>426</x-height> <ascender>629</ascender> diff --git a/src/codegen/CourierBold.xml b/src/codegen/CourierBold.xml index 1ae0fbe51..7f748fda3 100644 --- a/src/codegen/CourierBold.xml +++ b/src/codegen/CourierBold.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Courier-Bold</font-name> <class-name>CourierBold</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>562</cap-height> <x-height>439</x-height> <ascender>626</ascender> diff --git a/src/codegen/CourierBoldOblique.xml b/src/codegen/CourierBoldOblique.xml index bb84b7aa0..bc996d4db 100644 --- a/src/codegen/CourierBoldOblique.xml +++ b/src/codegen/CourierBoldOblique.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Courier-BoldOblique</font-name> <class-name>CourierBoldOblique</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>562</cap-height> <x-height>439</x-height> <ascender>626</ascender> diff --git a/src/codegen/CourierOblique.xml b/src/codegen/CourierOblique.xml index afea38dde..5bb2d1f9a 100644 --- a/src/codegen/CourierOblique.xml +++ b/src/codegen/CourierOblique.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Courier-Oblique</font-name> <class-name>CourierOblique</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>562</cap-height> <x-height>426</x-height> <ascender>629</ascender> diff --git a/src/codegen/Helvetica.xml b/src/codegen/Helvetica.xml index 28a35f066..fbbff254f 100644 --- a/src/codegen/Helvetica.xml +++ b/src/codegen/Helvetica.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Helvetica</font-name> <class-name>Helvetica</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>718</cap-height> <x-height>523</x-height> <ascender>718</ascender> diff --git a/src/codegen/HelveticaBold.xml b/src/codegen/HelveticaBold.xml index 4ef3a432a..6322a8964 100644 --- a/src/codegen/HelveticaBold.xml +++ b/src/codegen/HelveticaBold.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Helvetica-Bold</font-name> <class-name>HelveticaBold</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>718</cap-height> <x-height>532</x-height> <ascender>718</ascender> diff --git a/src/codegen/HelveticaBoldOblique.xml b/src/codegen/HelveticaBoldOblique.xml index 6686b84fd..ab8c4ce2f 100644 --- a/src/codegen/HelveticaBoldOblique.xml +++ b/src/codegen/HelveticaBoldOblique.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Helvetica-BoldOblique</font-name> <class-name>HelveticaBoldOblique</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>718</cap-height> <x-height>532</x-height> <ascender>718</ascender> diff --git a/src/codegen/HelveticaOblique.xml b/src/codegen/HelveticaOblique.xml index bea4e4010..2d3c5ed4e 100644 --- a/src/codegen/HelveticaOblique.xml +++ b/src/codegen/HelveticaOblique.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Helvetica-Oblique</font-name> <class-name>HelveticaOblique</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>718</cap-height> <x-height>523</x-height> <ascender>718</ascender> diff --git a/src/codegen/Symbol.xml b/src/codegen/Symbol.xml index 8dcb507ef..0776bee01 100644 --- a/src/codegen/Symbol.xml +++ b/src/codegen/Symbol.xml @@ -1,7 +1,7 @@ <font-metrics> <font-name>Symbol</font-name> <class-name>Symbol</class-name> - <encoding>StandardEncoding</encoding> + <encoding>SymbolEncoding</encoding> <cap-height>1010</cap-height> <x-height>520</x-height> <ascender>1010</ascender> diff --git a/src/codegen/TimesBold.xml b/src/codegen/TimesBold.xml index ec6c68548..519e074e8 100644 --- a/src/codegen/TimesBold.xml +++ b/src/codegen/TimesBold.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Times-Bold</font-name> <class-name>TimesBold</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>676</cap-height> <x-height>461</x-height> <ascender>676</ascender> diff --git a/src/codegen/TimesBoldItalic.xml b/src/codegen/TimesBoldItalic.xml index 2ed674618..073c6838c 100644 --- a/src/codegen/TimesBoldItalic.xml +++ b/src/codegen/TimesBoldItalic.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Times-BoldItalic</font-name> <class-name>TimesBoldItalic</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>669</cap-height> <x-height>462</x-height> <ascender>699</ascender> diff --git a/src/codegen/TimesItalic.xml b/src/codegen/TimesItalic.xml index 0251f4012..53bdda82c 100644 --- a/src/codegen/TimesItalic.xml +++ b/src/codegen/TimesItalic.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Times-Italic</font-name> <class-name>TimesItalic</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>653</cap-height> <x-height>441</x-height> <ascender>683</ascender> diff --git a/src/codegen/TimesRoman.xml b/src/codegen/TimesRoman.xml index 2e895d48e..af5b6a59d 100644 --- a/src/codegen/TimesRoman.xml +++ b/src/codegen/TimesRoman.xml @@ -2,7 +2,7 @@ <font-metrics> <font-name>Times-Roman</font-name> <class-name>TimesRoman</class-name> - <encoding>WinAnsiEncoding</encoding> + <encoding>StandardEncoding</encoding> <cap-height>662</cap-height> <x-height>450</x-height> <ascender>683</ascender> diff --git a/src/codegen/ZapfDingbats.xml b/src/codegen/ZapfDingbats.xml index 4e0511937..25b61871c 100644 --- a/src/codegen/ZapfDingbats.xml +++ b/src/codegen/ZapfDingbats.xml @@ -1,7 +1,7 @@ <font-metrics> <font-name>ZapfDingbats</font-name> <class-name>ZapfDingbats</class-name> - <encoding>StandardEncoding</encoding> + <encoding>ZapfDingbatsEncoding</encoding> <cap-height>820</cap-height> <x-height>426</x-height> <ascender>820</ascender> diff --git a/src/codegen/code-point-mapping.xsl b/src/codegen/code-point-mapping.xsl index a3e235cbc..ab4f26da9 100644 --- a/src/codegen/code-point-mapping.xsl +++ b/src/codegen/code-point-mapping.xsl @@ -1,24 +1,101 @@ <xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect" - extension-element-prefixes="redirect"> -<xsl:output method="text" /> + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="text"/> + <xsl:variable name='glyphlists' + select="document('glyphlist.xml')/glyphlist-set"/> -<xsl:template match="font-mappings"> -<!-- <redirect:write file="org/apache/fop/render/pdf/CodePointMapping.java"> --> + <xsl:template match="encoding-set"> package org.apache.fop.render.pdf; +import java.util.Hashtable; public class CodePointMapping { - public static char[] map; + private char[] latin1Map; + private char[] characters; + private char[] codepoints; + private CodePointMapping(int [] table) { + int nonLatin1 = 0; + latin1Map = new char[256]; + for(int i = 0; i < table.length; i += 2) { + if(table[i+1] < 256) + latin1Map[table[i+1]] = (char) table[i]; + else + ++nonLatin1; + } + characters = new char[nonLatin1]; + codepoints = new char[nonLatin1]; + int top = 0; + for(int i = 0; i < table.length; i += 2) { + char c = (char) table[i+1]; + if(c >= 256) { + ++top; + for(int j = top - 1; j >= 0; --j) { + if(j > 0 && characters[j-1] >= c) { + characters[j] = characters[j-1]; + codepoints[j] = codepoints[j-1]; + } else { + characters[j] = c; + codepoints[j] = (char) table[i]; + break; + } + } + } + } + } + public final char mapChar(char c) { + if(c < 256) { + return latin1Map[c]; + } else { + int bot = 0, top = characters.length - 1; + while(top >= bot) { + int mid = (bot + top) / 2; + char mc = characters[mid]; + + if(c == mc) + return codepoints[mid]; + else if(c < mc) + top = mid - 1; + else + bot = mid + 1; + } + return 0; + } + } - static { - map = new char[65536]; -<xsl:for-each select="map[@unicode!='-1' and @win-ansi!='-1']"> map[<xsl:value-of select="@unicode"/>] = <xsl:value-of select="@win-ansi"/>; -</xsl:for-each> + private static Hashtable mappings; + static { + mappings = new Hashtable(); + } + public static CodePointMapping getMapping(String encoding) { + CodePointMapping mapping = (CodePointMapping) mappings.get(encoding); + if(mapping != null) { + return mapping; + } <xsl:apply-templates mode="get"/> + else { + return null; } + } +<xsl:apply-templates mode="table"/> } -<!-- </redirect:write>--> -</xsl:template> -</xsl:stylesheet> + </xsl:template> + + <xsl:template match="encoding" mode="get"> + else if(encoding.equals("<xsl:value-of select="@id"/>")) { + mapping = new CodePointMapping(enc<xsl:value-of select="@id"/>); + mappings.put("<xsl:value-of select="@id"/>", mapping); + return mapping; + } + </xsl:template> + <xsl:template match="encoding" mode="table"> + <xsl:variable name="glyphlist-name" select="@glyphlist"/> + <xsl:variable name="glyphlist" + select="$glyphlists/glyphlist[@id=$glyphlist-name]"/> + private static final int[] enc<xsl:value-of select="@id"/> + = {<xsl:for-each select="glyph"> + <xsl:variable name="codepoint" select="@codepoint"/> + <xsl:variable name="name" select="@name"/><xsl:for-each select="$glyphlist/glyph[@name=$name]"> + 0x<xsl:value-of select="$codepoint"/>, 0x<xsl:value-of select="@codepoint"/>, // <xsl:value-of select="$name"/> +</xsl:for-each></xsl:for-each> + }; + </xsl:template> +</xsl:stylesheet> diff --git a/src/codegen/encodings.xml b/src/codegen/encodings.xml new file mode 100644 index 000000000..2566d2e74 --- /dev/null +++ b/src/codegen/encodings.xml @@ -0,0 +1,1633 @@ +<?xml version='1.0'?> +<!DOCTYPE encoding-set [ + <!ELEMENT encoding-set (encoding+)> + <!ELEMENT encoding (glyph+)> + <!ATTLIST encoding id ID #REQUIRED glyphlist CDATA "AGL"> + <!ELEMENT glyph EMPTY> + <!ATTLIST glyph codepoint CDATA #REQUIRED name CDATA #REQUIRED> +]> +<encoding-set> + <encoding id='StandardEncoding' glyphlist='AGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='quotedbl'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='dollar'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='quoteright'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asterisk'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='hyphen'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='at'/> + <glyph codepoint='41' name='A'/> + <glyph codepoint='42' name='B'/> + <glyph codepoint='43' name='C'/> + <glyph codepoint='44' name='D'/> + <glyph codepoint='45' name='E'/> + <glyph codepoint='46' name='F'/> + <glyph codepoint='47' name='G'/> + <glyph codepoint='48' name='H'/> + <glyph codepoint='49' name='I'/> + <glyph codepoint='4a' name='J'/> + <glyph codepoint='4b' name='K'/> + <glyph codepoint='4c' name='L'/> + <glyph codepoint='4d' name='M'/> + <glyph codepoint='4e' name='N'/> + <glyph codepoint='4f' name='O'/> + <glyph codepoint='50' name='P'/> + <glyph codepoint='51' name='Q'/> + <glyph codepoint='52' name='R'/> + <glyph codepoint='53' name='S'/> + <glyph codepoint='54' name='T'/> + <glyph codepoint='55' name='U'/> + <glyph codepoint='56' name='V'/> + <glyph codepoint='57' name='W'/> + <glyph codepoint='58' name='X'/> + <glyph codepoint='59' name='Y'/> + <glyph codepoint='5a' name='Z'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='backslash'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='asciicircum'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='quoteleft'/> + <glyph codepoint='61' name='a'/> + <glyph codepoint='62' name='b'/> + <glyph codepoint='63' name='c'/> + <glyph codepoint='64' name='d'/> + <glyph codepoint='65' name='e'/> + <glyph codepoint='66' name='f'/> + <glyph codepoint='67' name='g'/> + <glyph codepoint='68' name='h'/> + <glyph codepoint='69' name='i'/> + <glyph codepoint='6a' name='j'/> + <glyph codepoint='6b' name='k'/> + <glyph codepoint='6c' name='l'/> + <glyph codepoint='6d' name='m'/> + <glyph codepoint='6e' name='n'/> + <glyph codepoint='6f' name='o'/> + <glyph codepoint='70' name='p'/> + <glyph codepoint='71' name='q'/> + <glyph codepoint='72' name='r'/> + <glyph codepoint='73' name='s'/> + <glyph codepoint='74' name='t'/> + <glyph codepoint='75' name='u'/> + <glyph codepoint='76' name='v'/> + <glyph codepoint='77' name='w'/> + <glyph codepoint='78' name='x'/> + <glyph codepoint='79' name='y'/> + <glyph codepoint='7a' name='z'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='asciitilde'/> + <glyph codepoint='a1' name='exclamdown'/> + <glyph codepoint='a2' name='cent'/> + <glyph codepoint='a3' name='sterling'/> + <glyph codepoint='a4' name='fraction'/> + <glyph codepoint='a5' name='yen'/> + <glyph codepoint='a6' name='florin'/> + <glyph codepoint='a7' name='section'/> + <glyph codepoint='a8' name='currency'/> + <glyph codepoint='a9' name='quotesingle'/> + <glyph codepoint='aa' name='quotedblleft'/> + <glyph codepoint='ab' name='guillemotleft'/> + <glyph codepoint='ac' name='guilsinglleft'/> + <glyph codepoint='ad' name='guilsinglright'/> + <glyph codepoint='ae' name='fi'/> + <glyph codepoint='af' name='fl'/> + <glyph codepoint='b1' name='endash'/> + <glyph codepoint='b2' name='dagger'/> + <glyph codepoint='b3' name='daggerdbl'/> + <glyph codepoint='b4' name='periodcentered'/> + <glyph codepoint='b6' name='paragraph'/> + <glyph codepoint='b7' name='bullet'/> + <glyph codepoint='b8' name='quotesinglbase'/> + <glyph codepoint='b9' name='quotedblbase'/> + <glyph codepoint='ba' name='quotedblright'/> + <glyph codepoint='bb' name='guillemotright'/> + <glyph codepoint='bc' name='ellipsis'/> + <glyph codepoint='bd' name='perthousand'/> + <glyph codepoint='bf' name='questiondown'/> + <glyph codepoint='c1' name='grave'/> + <glyph codepoint='c2' name='acute'/> + <glyph codepoint='c3' name='circumflex'/> + <glyph codepoint='c4' name='tilde'/> + <glyph codepoint='c5' name='macron'/> + <glyph codepoint='c6' name='breve'/> + <glyph codepoint='c7' name='dotaccent'/> + <glyph codepoint='c8' name='dieresis'/> + <glyph codepoint='ca' name='ring'/> + <glyph codepoint='cb' name='cedilla'/> + <glyph codepoint='cd' name='hungarumlaut'/> + <glyph codepoint='ce' name='ogonek'/> + <glyph codepoint='cf' name='caron'/> + <glyph codepoint='d0' name='emdash'/> + <glyph codepoint='e1' name='AE'/> + <glyph codepoint='e3' name='ordfeminine'/> + <glyph codepoint='e8' name='Lslash'/> + <glyph codepoint='e9' name='Oslash'/> + <glyph codepoint='ea' name='OE'/> + <glyph codepoint='eb' name='ordmasculine'/> + <glyph codepoint='f1' name='ae'/> + <glyph codepoint='f5' name='dotlessi'/> + <glyph codepoint='f8' name='lslash'/> + <glyph codepoint='f9' name='oslash'/> + <glyph codepoint='fa' name='oe'/> + <glyph codepoint='fb' name='germandbls'/> + </encoding> + <encoding id='ISOLatin1Encoding' glyphlist='AGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='quotedbl'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='dollar'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='quoteright'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asterisk'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='minus'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='at'/> + <glyph codepoint='41' name='A'/> + <glyph codepoint='42' name='B'/> + <glyph codepoint='43' name='C'/> + <glyph codepoint='44' name='D'/> + <glyph codepoint='45' name='E'/> + <glyph codepoint='46' name='F'/> + <glyph codepoint='47' name='G'/> + <glyph codepoint='48' name='H'/> + <glyph codepoint='49' name='I'/> + <glyph codepoint='4a' name='J'/> + <glyph codepoint='4b' name='K'/> + <glyph codepoint='4c' name='L'/> + <glyph codepoint='4d' name='M'/> + <glyph codepoint='4e' name='N'/> + <glyph codepoint='4f' name='O'/> + <glyph codepoint='50' name='P'/> + <glyph codepoint='51' name='Q'/> + <glyph codepoint='52' name='R'/> + <glyph codepoint='53' name='S'/> + <glyph codepoint='54' name='T'/> + <glyph codepoint='55' name='U'/> + <glyph codepoint='56' name='V'/> + <glyph codepoint='57' name='W'/> + <glyph codepoint='58' name='X'/> + <glyph codepoint='59' name='Y'/> + <glyph codepoint='5a' name='Z'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='backslash'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='asciicircum'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='quoteleft'/> + <glyph codepoint='61' name='a'/> + <glyph codepoint='62' name='b'/> + <glyph codepoint='63' name='c'/> + <glyph codepoint='64' name='d'/> + <glyph codepoint='65' name='e'/> + <glyph codepoint='66' name='f'/> + <glyph codepoint='67' name='g'/> + <glyph codepoint='68' name='h'/> + <glyph codepoint='69' name='i'/> + <glyph codepoint='6a' name='j'/> + <glyph codepoint='6b' name='k'/> + <glyph codepoint='6c' name='l'/> + <glyph codepoint='6d' name='m'/> + <glyph codepoint='6e' name='n'/> + <glyph codepoint='6f' name='o'/> + <glyph codepoint='70' name='p'/> + <glyph codepoint='71' name='q'/> + <glyph codepoint='72' name='r'/> + <glyph codepoint='73' name='s'/> + <glyph codepoint='74' name='t'/> + <glyph codepoint='75' name='u'/> + <glyph codepoint='76' name='v'/> + <glyph codepoint='77' name='w'/> + <glyph codepoint='78' name='x'/> + <glyph codepoint='79' name='y'/> + <glyph codepoint='7a' name='z'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='asciitilde'/> + <glyph codepoint='90' name='dotlessi'/> + <glyph codepoint='91' name='grave'/> + <glyph codepoint='93' name='circumflex'/> + <glyph codepoint='94' name='tilde'/> + <glyph codepoint='96' name='breve'/> + <glyph codepoint='97' name='dotaccent'/> + <glyph codepoint='9a' name='ring'/> + <glyph codepoint='9d' name='hungarumlaut'/> + <glyph codepoint='9e' name='ogonek'/> + <glyph codepoint='9f' name='caron'/> + <glyph codepoint='a1' name='exclamdown'/> + <glyph codepoint='a2' name='cent'/> + <glyph codepoint='a3' name='sterling'/> + <glyph codepoint='a4' name='currency'/> + <glyph codepoint='a5' name='yen'/> + <glyph codepoint='a6' name='brokenbar'/> + <glyph codepoint='a7' name='section'/> + <glyph codepoint='a8' name='dieresis'/> + <glyph codepoint='a9' name='copyright'/> + <glyph codepoint='aa' name='ordfeminine'/> + <glyph codepoint='ab' name='guillemotleft'/> + <glyph codepoint='ac' name='logicalnot'/> + <glyph codepoint='ad' name='hyphen'/> + <glyph codepoint='ae' name='registered'/> + <glyph codepoint='af' name='macron'/> + <glyph codepoint='b0' name='degree'/> + <glyph codepoint='b1' name='plusminus'/> + <glyph codepoint='b2' name='twosuperior'/> + <glyph codepoint='b3' name='threesuperior'/> + <glyph codepoint='b4' name='acute'/> + <glyph codepoint='b5' name='mu'/> + <glyph codepoint='b6' name='paragraph'/> + <glyph codepoint='b7' name='periodcentered'/> + <glyph codepoint='b8' name='cedilla'/> + <glyph codepoint='b9' name='onesuperior'/> + <glyph codepoint='ba' name='ordmasculine'/> + <glyph codepoint='bb' name='guillemotright'/> + <glyph codepoint='bc' name='onequarter'/> + <glyph codepoint='bd' name='onehalf'/> + <glyph codepoint='be' name='threequarters'/> + <glyph codepoint='bf' name='questiondown'/> + <glyph codepoint='c0' name='Agrave'/> + <glyph codepoint='c1' name='Aacute'/> + <glyph codepoint='c2' name='Acircumflex'/> + <glyph codepoint='c3' name='Atilde'/> + <glyph codepoint='c4' name='Adieresis'/> + <glyph codepoint='c5' name='Aring'/> + <glyph codepoint='c6' name='AE'/> + <glyph codepoint='c7' name='Ccedilla'/> + <glyph codepoint='c8' name='Egrave'/> + <glyph codepoint='c9' name='Eacute'/> + <glyph codepoint='ca' name='Ecircumflex'/> + <glyph codepoint='cb' name='Edieresis'/> + <glyph codepoint='cc' name='Igrave'/> + <glyph codepoint='cd' name='Iacute'/> + <glyph codepoint='ce' name='Icircumflex'/> + <glyph codepoint='cf' name='Idieresis'/> + <glyph codepoint='d0' name='Eth'/> + <glyph codepoint='d1' name='Ntilde'/> + <glyph codepoint='d2' name='Ograve'/> + <glyph codepoint='d3' name='Oacute'/> + <glyph codepoint='d4' name='Ocircumflex'/> + <glyph codepoint='d5' name='Otilde'/> + <glyph codepoint='d6' name='Odieresis'/> + <glyph codepoint='d7' name='multiply'/> + <glyph codepoint='d8' name='Oslash'/> + <glyph codepoint='d9' name='Ugrave'/> + <glyph codepoint='da' name='Uacute'/> + <glyph codepoint='db' name='Ucircumflex'/> + <glyph codepoint='dc' name='Udieresis'/> + <glyph codepoint='dd' name='Yacute'/> + <glyph codepoint='de' name='Thorn'/> + <glyph codepoint='df' name='germandbls'/> + <glyph codepoint='e0' name='agrave'/> + <glyph codepoint='e1' name='aacute'/> + <glyph codepoint='e2' name='acircumflex'/> + <glyph codepoint='e3' name='atilde'/> + <glyph codepoint='e4' name='adieresis'/> + <glyph codepoint='e5' name='aring'/> + <glyph codepoint='e6' name='ae'/> + <glyph codepoint='e7' name='ccedilla'/> + <glyph codepoint='e8' name='egrave'/> + <glyph codepoint='e9' name='eacute'/> + <glyph codepoint='ea' name='ecircumflex'/> + <glyph codepoint='eb' name='edieresis'/> + <glyph codepoint='ec' name='igrave'/> + <glyph codepoint='ed' name='iacute'/> + <glyph codepoint='ee' name='icircumflex'/> + <glyph codepoint='ef' name='idieresis'/> + <glyph codepoint='f0' name='eth'/> + <glyph codepoint='f1' name='ntilde'/> + <glyph codepoint='f2' name='ograve'/> + <glyph codepoint='f3' name='oacute'/> + <glyph codepoint='f4' name='ocircumflex'/> + <glyph codepoint='f5' name='otilde'/> + <glyph codepoint='f6' name='odieresis'/> + <glyph codepoint='f7' name='divide'/> + <glyph codepoint='f8' name='oslash'/> + <glyph codepoint='f9' name='ugrave'/> + <glyph codepoint='fa' name='uacute'/> + <glyph codepoint='fb' name='ucircumflex'/> + <glyph codepoint='fc' name='udieresis'/> + <glyph codepoint='fd' name='yacute'/> + <glyph codepoint='fe' name='thorn'/> + <glyph codepoint='ff' name='ydieresis'/> + </encoding> + <encoding id='CEEncoding' glyphlist='AGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='quotedbl'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='dollar'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='quotesingle'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asterisk'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='hyphen'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='at'/> + <glyph codepoint='41' name='A'/> + <glyph codepoint='42' name='B'/> + <glyph codepoint='43' name='C'/> + <glyph codepoint='44' name='D'/> + <glyph codepoint='45' name='E'/> + <glyph codepoint='46' name='F'/> + <glyph codepoint='47' name='G'/> + <glyph codepoint='48' name='H'/> + <glyph codepoint='49' name='I'/> + <glyph codepoint='4a' name='J'/> + <glyph codepoint='4b' name='K'/> + <glyph codepoint='4c' name='L'/> + <glyph codepoint='4d' name='M'/> + <glyph codepoint='4e' name='N'/> + <glyph codepoint='4f' name='O'/> + <glyph codepoint='50' name='P'/> + <glyph codepoint='51' name='Q'/> + <glyph codepoint='52' name='R'/> + <glyph codepoint='53' name='S'/> + <glyph codepoint='54' name='T'/> + <glyph codepoint='55' name='U'/> + <glyph codepoint='56' name='V'/> + <glyph codepoint='57' name='W'/> + <glyph codepoint='58' name='X'/> + <glyph codepoint='59' name='Y'/> + <glyph codepoint='5a' name='Z'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='backslash'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='asciicircum'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='grave'/> + <glyph codepoint='61' name='a'/> + <glyph codepoint='62' name='b'/> + <glyph codepoint='63' name='c'/> + <glyph codepoint='64' name='d'/> + <glyph codepoint='65' name='e'/> + <glyph codepoint='66' name='f'/> + <glyph codepoint='67' name='g'/> + <glyph codepoint='68' name='h'/> + <glyph codepoint='69' name='i'/> + <glyph codepoint='6a' name='j'/> + <glyph codepoint='6b' name='k'/> + <glyph codepoint='6c' name='l'/> + <glyph codepoint='6d' name='m'/> + <glyph codepoint='6e' name='n'/> + <glyph codepoint='6f' name='o'/> + <glyph codepoint='70' name='p'/> + <glyph codepoint='71' name='q'/> + <glyph codepoint='72' name='r'/> + <glyph codepoint='73' name='s'/> + <glyph codepoint='74' name='t'/> + <glyph codepoint='75' name='u'/> + <glyph codepoint='76' name='v'/> + <glyph codepoint='77' name='w'/> + <glyph codepoint='78' name='x'/> + <glyph codepoint='79' name='y'/> + <glyph codepoint='7a' name='z'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='asciitilde'/> + <glyph codepoint='82' name='quotesinglbase'/> + <glyph codepoint='84' name='quotedblbase'/> + <glyph codepoint='85' name='ellipsis'/> + <glyph codepoint='86' name='dagger'/> + <glyph codepoint='87' name='daggerdbl'/> + <glyph codepoint='89' name='perthousand'/> + <glyph codepoint='8a' name='Scaron'/> + <glyph codepoint='8b' name='guilsinglleft'/> + <glyph codepoint='8c' name='Sacute'/> + <glyph codepoint='8d' name='Tcaron'/> + <glyph codepoint='8e' name='Zcaron'/> + <glyph codepoint='8f' name='Zacute'/> + <glyph codepoint='91' name='quoteleft'/> + <glyph codepoint='92' name='quoteright'/> + <glyph codepoint='93' name='quotedblleft'/> + <glyph codepoint='94' name='quotedblright'/> + <glyph codepoint='95' name='bullet'/> + <glyph codepoint='96' name='endash'/> + <glyph codepoint='97' name='emdash'/> + <glyph codepoint='99' name='trademark'/> + <glyph codepoint='9a' name='scaron'/> + <glyph codepoint='9b' name='guilsinglright'/> + <glyph codepoint='9c' name='sacute'/> + <glyph codepoint='9d' name='tcaron'/> + <glyph codepoint='9e' name='zcaron'/> + <glyph codepoint='9f' name='zacute'/> + <glyph codepoint='a1' name='caron'/> + <glyph codepoint='a2' name='breve'/> + <glyph codepoint='a3' name='Lslash'/> + <glyph codepoint='a4' name='currency'/> + <glyph codepoint='a5' name='Aogonek'/> + <glyph codepoint='a6' name='brokenbar'/> + <glyph codepoint='a7' name='section'/> + <glyph codepoint='a8' name='dieresis'/> + <glyph codepoint='a9' name='copyright'/> + <glyph codepoint='aa' name='Scommaaccent'/> + <glyph codepoint='ab' name='guillemotleft'/> + <glyph codepoint='ac' name='logicalnot'/> + <glyph codepoint='ae' name='registered'/> + <glyph codepoint='af' name='Zdotaccent'/> + <glyph codepoint='b0' name='degree'/> + <glyph codepoint='b1' name='plusminus'/> + <glyph codepoint='b2' name='ogonek'/> + <glyph codepoint='b3' name='lslash'/> + <glyph codepoint='b4' name='acute'/> + <glyph codepoint='b5' name='mu'/> + <glyph codepoint='b6' name='paragraph'/> + <glyph codepoint='b7' name='periodcentered'/> + <glyph codepoint='b8' name='cedilla'/> + <glyph codepoint='b9' name='aogonek'/> + <glyph codepoint='ba' name='scommaaccent'/> + <glyph codepoint='bb' name='guillemotright'/> + <glyph codepoint='bc' name='Lcaron'/> + <glyph codepoint='bd' name='hungarumlaut'/> + <glyph codepoint='be' name='lcaron'/> + <glyph codepoint='bf' name='zdotaccent'/> + <glyph codepoint='c0' name='Racute'/> + <glyph codepoint='c1' name='Aacute'/> + <glyph codepoint='c2' name='Acircumflex'/> + <glyph codepoint='c3' name='Abreve'/> + <glyph codepoint='c4' name='Adieresis'/> + <glyph codepoint='c5' name='Lacute'/> + <glyph codepoint='c6' name='Cacute'/> + <glyph codepoint='c7' name='Ccedilla'/> + <glyph codepoint='c8' name='Ccaron'/> + <glyph codepoint='c9' name='Eacute'/> + <glyph codepoint='ca' name='Eogonek'/> + <glyph codepoint='cb' name='Edieresis'/> + <glyph codepoint='cc' name='Ecaron'/> + <glyph codepoint='cd' name='Iacute'/> + <glyph codepoint='ce' name='Icircumflex'/> + <glyph codepoint='cf' name='Dcaron'/> + <glyph codepoint='d0' name='Dcroat'/> + <glyph codepoint='d1' name='Nacute'/> + <glyph codepoint='d2' name='Ncaron'/> + <glyph codepoint='d3' name='Oacute'/> + <glyph codepoint='d4' name='Ocircumflex'/> + <glyph codepoint='d5' name='Ohungarumlaut'/> + <glyph codepoint='d6' name='Odieresis'/> + <glyph codepoint='d7' name='multiply'/> + <glyph codepoint='d8' name='Rcaron'/> + <glyph codepoint='d9' name='Uring'/> + <glyph codepoint='da' name='Uacute'/> + <glyph codepoint='db' name='Uhungarumlaut'/> + <glyph codepoint='dc' name='Udieresis'/> + <glyph codepoint='dd' name='Yacute'/> + <glyph codepoint='de' name='Tcommaaccent'/> + <glyph codepoint='df' name='germandbls'/> + <glyph codepoint='e0' name='racute'/> + <glyph codepoint='e1' name='aacute'/> + <glyph codepoint='e2' name='acircumflex'/> + <glyph codepoint='e3' name='abreve'/> + <glyph codepoint='e4' name='adieresis'/> + <glyph codepoint='e5' name='lacute'/> + <glyph codepoint='e6' name='cacute'/> + <glyph codepoint='e7' name='ccedilla'/> + <glyph codepoint='e8' name='ccaron'/> + <glyph codepoint='e9' name='eacute'/> + <glyph codepoint='ea' name='eogonek'/> + <glyph codepoint='eb' name='edieresis'/> + <glyph codepoint='ec' name='ecaron'/> + <glyph codepoint='ed' name='iacute'/> + <glyph codepoint='ee' name='icircumflex'/> + <glyph codepoint='ef' name='dcaron'/> + <glyph codepoint='f0' name='dcroat'/> + <glyph codepoint='f1' name='nacute'/> + <glyph codepoint='f2' name='ncaron'/> + <glyph codepoint='f3' name='oacute'/> + <glyph codepoint='f4' name='ocircumflex'/> + <glyph codepoint='f5' name='ohungarumlaut'/> + <glyph codepoint='f6' name='odieresis'/> + <glyph codepoint='f7' name='divide'/> + <glyph codepoint='f8' name='rcaron'/> + <glyph codepoint='f9' name='uring'/> + <glyph codepoint='fa' name='uacute'/> + <glyph codepoint='fb' name='uhungarumlaut'/> + <glyph codepoint='fc' name='udieresis'/> + <glyph codepoint='fd' name='yacute'/> + <glyph codepoint='fe' name='tcommaaccent'/> + <glyph codepoint='ff' name='dotaccent'/> + </encoding> + <encoding id='MacRomanEncoding' glyphlist='AGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='quotedbl'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='dollar'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='quotesingle'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asterisk'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='hyphen'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='at'/> + <glyph codepoint='41' name='A'/> + <glyph codepoint='42' name='B'/> + <glyph codepoint='43' name='C'/> + <glyph codepoint='44' name='D'/> + <glyph codepoint='45' name='E'/> + <glyph codepoint='46' name='F'/> + <glyph codepoint='47' name='G'/> + <glyph codepoint='48' name='H'/> + <glyph codepoint='49' name='I'/> + <glyph codepoint='4a' name='J'/> + <glyph codepoint='4b' name='K'/> + <glyph codepoint='4c' name='L'/> + <glyph codepoint='4d' name='M'/> + <glyph codepoint='4e' name='N'/> + <glyph codepoint='4f' name='O'/> + <glyph codepoint='50' name='P'/> + <glyph codepoint='51' name='Q'/> + <glyph codepoint='52' name='R'/> + <glyph codepoint='53' name='S'/> + <glyph codepoint='54' name='T'/> + <glyph codepoint='55' name='U'/> + <glyph codepoint='56' name='V'/> + <glyph codepoint='57' name='W'/> + <glyph codepoint='58' name='X'/> + <glyph codepoint='59' name='Y'/> + <glyph codepoint='5a' name='Z'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='backslash'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='asciicircum'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='grave'/> + <glyph codepoint='61' name='a'/> + <glyph codepoint='62' name='b'/> + <glyph codepoint='63' name='c'/> + <glyph codepoint='64' name='d'/> + <glyph codepoint='65' name='e'/> + <glyph codepoint='66' name='f'/> + <glyph codepoint='67' name='g'/> + <glyph codepoint='68' name='h'/> + <glyph codepoint='69' name='i'/> + <glyph codepoint='6a' name='j'/> + <glyph codepoint='6b' name='k'/> + <glyph codepoint='6c' name='l'/> + <glyph codepoint='6d' name='m'/> + <glyph codepoint='6e' name='n'/> + <glyph codepoint='6f' name='o'/> + <glyph codepoint='70' name='p'/> + <glyph codepoint='71' name='q'/> + <glyph codepoint='72' name='r'/> + <glyph codepoint='73' name='s'/> + <glyph codepoint='74' name='t'/> + <glyph codepoint='75' name='u'/> + <glyph codepoint='76' name='v'/> + <glyph codepoint='77' name='w'/> + <glyph codepoint='78' name='x'/> + <glyph codepoint='79' name='y'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='asciitilde'/> + <glyph codepoint='80' name='Adieresis'/> + <glyph codepoint='81' name='Aring'/> + <glyph codepoint='82' name='Ccedilla'/> + <glyph codepoint='83' name='Eacute'/> + <glyph codepoint='84' name='Ntilde'/> + <glyph codepoint='85' name='Odieresis'/> + <glyph codepoint='86' name='Udieresis'/> + <glyph codepoint='87' name='aacute'/> + <glyph codepoint='88' name='agrave'/> + <glyph codepoint='89' name='acircumflex'/> + <glyph codepoint='8a' name='adieresis'/> + <glyph codepoint='8b' name='atilde'/> + <glyph codepoint='8c' name='aring'/> + <glyph codepoint='8d' name='ccedilla'/> + <glyph codepoint='8e' name='eacute'/> + <glyph codepoint='8f' name='egrave'/> + <glyph codepoint='90' name='ecircumflex'/> + <glyph codepoint='91' name='edieresis'/> + <glyph codepoint='92' name='iacute'/> + <glyph codepoint='93' name='igrave'/> + <glyph codepoint='94' name='icircumflex'/> + <glyph codepoint='95' name='idieresis'/> + <glyph codepoint='96' name='ntilde'/> + <glyph codepoint='97' name='oacute'/> + <glyph codepoint='98' name='ograve'/> + <glyph codepoint='99' name='ocircumflex'/> + <glyph codepoint='9a' name='odieresis'/> + <glyph codepoint='9b' name='otilde'/> + <glyph codepoint='9c' name='uacute'/> + <glyph codepoint='9d' name='ugrave'/> + <glyph codepoint='9e' name='ucircumflex'/> + <glyph codepoint='9f' name='udieresis'/> + <glyph codepoint='a0' name='dagger'/> + <glyph codepoint='a1' name='degree'/> + <glyph codepoint='a2' name='cent'/> + <glyph codepoint='a3' name='sterling'/> + <glyph codepoint='a4' name='section'/> + <glyph codepoint='a5' name='bullet'/> + <glyph codepoint='a6' name='paragraph'/> + <glyph codepoint='a7' name='germandbls'/> + <glyph codepoint='a8' name='registered'/> + <glyph codepoint='a9' name='copyright'/> + <glyph codepoint='aa' name='trademark'/> + <glyph codepoint='ab' name='acute'/> + <glyph codepoint='ac' name='dieresis'/> + <glyph codepoint='ae' name='AE'/> + <glyph codepoint='af' name='Oslash'/> + <glyph codepoint='b1' name='plusminus'/> + <glyph codepoint='b5' name='mu'/> + <glyph codepoint='bb' name='ordfeminine'/> + <glyph codepoint='bc' name='ordmasculine'/> + <glyph codepoint='be' name='ae'/> + <glyph codepoint='bf' name='oslash'/> + <glyph codepoint='c0' name='questiondown'/> + <glyph codepoint='c1' name='exclamdown'/> + <glyph codepoint='c2' name='logicalnot'/> + <glyph codepoint='c4' name='florin'/> + <glyph codepoint='c7' name='guillemotleft'/> + <glyph codepoint='c8' name='guillemotright'/> + <glyph codepoint='c9' name='ellipsis'/> + <glyph codepoint='cb' name='Agrave'/> + <glyph codepoint='cc' name='Atilde'/> + <glyph codepoint='cd' name='Otilde'/> + <glyph codepoint='ce' name='OE'/> + <glyph codepoint='cf' name='oe'/> + <glyph codepoint='d0' name='endash'/> + <glyph codepoint='d1' name='emdash'/> + <glyph codepoint='d2' name='quotedblleft'/> + <glyph codepoint='d3' name='quotedblright'/> + <glyph codepoint='d4' name='quoteleft'/> + <glyph codepoint='d5' name='quoteright'/> + <glyph codepoint='d6' name='divide'/> + <glyph codepoint='d9' name='Ydieresis'/> + <glyph codepoint='da' name='fraction'/> + <glyph codepoint='db' name='currency'/> + <glyph codepoint='dc' name='guilsinglleft'/> + <glyph codepoint='dd' name='guilsinglright'/> + <glyph codepoint='de' name='fi'/> + <glyph codepoint='df' name='fl'/> + <glyph codepoint='e0' name='daggerdbl'/> + <glyph codepoint='e1' name='periodcentered'/> + <glyph codepoint='e2' name='quotesinglbase'/> + <glyph codepoint='e3' name='quotedblbase'/> + <glyph codepoint='e4' name='perthousand'/> + <glyph codepoint='e5' name='Acircumflex'/> + <glyph codepoint='e6' name='Ecircumflex'/> + <glyph codepoint='e7' name='Aacute'/> + <glyph codepoint='e8' name='Edieresis'/> + <glyph codepoint='e9' name='Egrave'/> + <glyph codepoint='ea' name='Iacute'/> + <glyph codepoint='eb' name='Icircumflex'/> + <glyph codepoint='ec' name='Idieresis'/> + <glyph codepoint='ed' name='Igrave'/> + <glyph codepoint='ee' name='Oacute'/> + <glyph codepoint='ef' name='Ocircumflex'/> + <glyph codepoint='f1' name='Ograve'/> + <glyph codepoint='f2' name='Uacute'/> + <glyph codepoint='f3' name='Ucircumflex'/> + <glyph codepoint='f4' name='Ugrave'/> + <glyph codepoint='f5' name='dotlessi'/> + <glyph codepoint='f6' name='circumflex'/> + <glyph codepoint='f7' name='tilde'/> + <glyph codepoint='f8' name='macron'/> + <glyph codepoint='f9' name='breve'/> + <glyph codepoint='fa' name='dotaccent'/> + <glyph codepoint='fb' name='ring'/> + <glyph codepoint='fc' name='cedilla'/> + <glyph codepoint='fd' name='hungarumlaut'/> + <glyph codepoint='fe' name='ogonek'/> + <glyph codepoint='ff' name='caron'/> + <glyph codepoint='d8' name='ydieresis'/> + <glyph codepoint='b4' name='yen'/> + <glyph codepoint='7a' name='z'/> + </encoding> + <encoding id='WinAnsiEncoding' glyphlist='AGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='quotedbl'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='dollar'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='quotesingle'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asterisk'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='hyphen'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='at'/> + <glyph codepoint='41' name='A'/> + <glyph codepoint='42' name='B'/> + <glyph codepoint='43' name='C'/> + <glyph codepoint='44' name='D'/> + <glyph codepoint='45' name='E'/> + <glyph codepoint='46' name='F'/> + <glyph codepoint='47' name='G'/> + <glyph codepoint='48' name='H'/> + <glyph codepoint='49' name='I'/> + <glyph codepoint='4a' name='J'/> + <glyph codepoint='4b' name='K'/> + <glyph codepoint='4c' name='L'/> + <glyph codepoint='4d' name='M'/> + <glyph codepoint='4e' name='N'/> + <glyph codepoint='4f' name='O'/> + <glyph codepoint='50' name='P'/> + <glyph codepoint='51' name='Q'/> + <glyph codepoint='52' name='R'/> + <glyph codepoint='53' name='S'/> + <glyph codepoint='54' name='T'/> + <glyph codepoint='55' name='U'/> + <glyph codepoint='56' name='V'/> + <glyph codepoint='57' name='W'/> + <glyph codepoint='58' name='X'/> + <glyph codepoint='59' name='Y'/> + <glyph codepoint='5a' name='Z'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='backslash'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='asciicircum'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='grave'/> + <glyph codepoint='61' name='a'/> + <glyph codepoint='62' name='b'/> + <glyph codepoint='63' name='c'/> + <glyph codepoint='64' name='d'/> + <glyph codepoint='65' name='e'/> + <glyph codepoint='66' name='f'/> + <glyph codepoint='67' name='g'/> + <glyph codepoint='68' name='h'/> + <glyph codepoint='69' name='i'/> + <glyph codepoint='6a' name='j'/> + <glyph codepoint='6b' name='k'/> + <glyph codepoint='6c' name='l'/> + <glyph codepoint='6d' name='m'/> + <glyph codepoint='6e' name='n'/> + <glyph codepoint='6f' name='o'/> + <glyph codepoint='70' name='p'/> + <glyph codepoint='71' name='q'/> + <glyph codepoint='72' name='r'/> + <glyph codepoint='73' name='s'/> + <glyph codepoint='74' name='t'/> + <glyph codepoint='75' name='u'/> + <glyph codepoint='76' name='v'/> + <glyph codepoint='77' name='w'/> + <glyph codepoint='78' name='x'/> + <glyph codepoint='79' name='y'/> + <glyph codepoint='7a' name='z'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='asciitilde'/> + <glyph codepoint='80' name='Euro'/> + <glyph codepoint='82' name='quotesinglbase'/> + <glyph codepoint='83' name='florin'/> + <glyph codepoint='84' name='quotedblbase'/> + <glyph codepoint='85' name='ellipsis'/> + <glyph codepoint='86' name='dagger'/> + <glyph codepoint='87' name='daggerdbl'/> + <glyph codepoint='88' name='circumflex'/> + <glyph codepoint='89' name='perthousand'/> + <glyph codepoint='8a' name='Scaron'/> + <glyph codepoint='8b' name='guilsinglleft'/> + <glyph codepoint='8c' name='OE'/> + <glyph codepoint='8e' name='Zcaron'/> + <glyph codepoint='91' name='quoteleft'/> + <glyph codepoint='92' name='quoteright'/> + <glyph codepoint='93' name='quotedblleft'/> + <glyph codepoint='94' name='quotedblright'/> + <glyph codepoint='95' name='bullet'/> + <glyph codepoint='96' name='endash'/> + <glyph codepoint='97' name='emdash'/> + <glyph codepoint='98' name='tilde'/> + <glyph codepoint='99' name='trademark'/> + <glyph codepoint='9a' name='scaron'/> + <glyph codepoint='9b' name='guilsinglright'/> + <glyph codepoint='9c' name='oe'/> + <glyph codepoint='9e' name='zcaron'/> + <glyph codepoint='9f' name='Ydieresis'/> + <glyph codepoint='a1' name='exclamdown'/> + <glyph codepoint='a2' name='cent'/> + <glyph codepoint='a3' name='sterling'/> + <glyph codepoint='a4' name='currency'/> + <glyph codepoint='a5' name='yen'/> + <glyph codepoint='a6' name='brokenbar'/> + <glyph codepoint='a7' name='section'/> + <glyph codepoint='a8' name='dieresis'/> + <glyph codepoint='a9' name='copyright'/> + <glyph codepoint='aa' name='ordfeminine'/> + <glyph codepoint='ab' name='guillemotleft'/> + <glyph codepoint='ac' name='logicalnot'/> + <glyph codepoint='ae' name='registered'/> + <glyph codepoint='af' name='macron'/> + <glyph codepoint='b0' name='degree'/> + <glyph codepoint='b1' name='plusminus'/> + <glyph codepoint='b2' name='twosuperior'/> + <glyph codepoint='b3' name='threesuperior'/> + <glyph codepoint='b4' name='acute'/> + <glyph codepoint='b5' name='mu'/> + <glyph codepoint='b6' name='paragraph'/> + <glyph codepoint='b7' name='periodcentered'/> + <glyph codepoint='b8' name='cedilla'/> + <glyph codepoint='b9' name='onesuperior'/> + <glyph codepoint='ba' name='ordmasculine'/> + <glyph codepoint='bb' name='guillemotright'/> + <glyph codepoint='bc' name='onequarter'/> + <glyph codepoint='bd' name='onehalf'/> + <glyph codepoint='be' name='threequarters'/> + <glyph codepoint='bf' name='questiondown'/> + <glyph codepoint='c0' name='Agrave'/> + <glyph codepoint='c1' name='Aacute'/> + <glyph codepoint='c2' name='Acircumflex'/> + <glyph codepoint='c3' name='Atilde'/> + <glyph codepoint='c4' name='Adieresis'/> + <glyph codepoint='c5' name='Aring'/> + <glyph codepoint='c6' name='AE'/> + <glyph codepoint='c7' name='Ccedilla'/> + <glyph codepoint='c8' name='Egrave'/> + <glyph codepoint='c9' name='Eacute'/> + <glyph codepoint='ca' name='Ecircumflex'/> + <glyph codepoint='cb' name='Edieresis'/> + <glyph codepoint='cc' name='Igrave'/> + <glyph codepoint='cd' name='Iacute'/> + <glyph codepoint='ce' name='Icircumflex'/> + <glyph codepoint='cf' name='Idieresis'/> + <glyph codepoint='d0' name='Eth'/> + <glyph codepoint='d1' name='Ntilde'/> + <glyph codepoint='d2' name='Ograve'/> + <glyph codepoint='d3' name='Oacute'/> + <glyph codepoint='d4' name='Ocircumflex'/> + <glyph codepoint='d5' name='Otilde'/> + <glyph codepoint='d6' name='Odieresis'/> + <glyph codepoint='d7' name='multiply'/> + <glyph codepoint='d8' name='Oslash'/> + <glyph codepoint='d9' name='Ugrave'/> + <glyph codepoint='da' name='Uacute'/> + <glyph codepoint='db' name='Ucircumflex'/> + <glyph codepoint='dc' name='Udieresis'/> + <glyph codepoint='dd' name='Yacute'/> + <glyph codepoint='de' name='Thorn'/> + <glyph codepoint='df' name='germandbls'/> + <glyph codepoint='e0' name='agrave'/> + <glyph codepoint='e1' name='aacute'/> + <glyph codepoint='e2' name='acircumflex'/> + <glyph codepoint='e3' name='atilde'/> + <glyph codepoint='e4' name='adieresis'/> + <glyph codepoint='e5' name='aring'/> + <glyph codepoint='e6' name='ae'/> + <glyph codepoint='e7' name='ccedilla'/> + <glyph codepoint='e8' name='egrave'/> + <glyph codepoint='e9' name='eacute'/> + <glyph codepoint='ea' name='ecircumflex'/> + <glyph codepoint='eb' name='edieresis'/> + <glyph codepoint='ec' name='igrave'/> + <glyph codepoint='ed' name='iacute'/> + <glyph codepoint='ee' name='icircumflex'/> + <glyph codepoint='ef' name='idieresis'/> + <glyph codepoint='f0' name='eth'/> + <glyph codepoint='f1' name='ntilde'/> + <glyph codepoint='f2' name='ograve'/> + <glyph codepoint='f3' name='oacute'/> + <glyph codepoint='f4' name='ocircumflex'/> + <glyph codepoint='f5' name='otilde'/> + <glyph codepoint='f6' name='odieresis'/> + <glyph codepoint='f7' name='divide'/> + <glyph codepoint='f8' name='oslash'/> + <glyph codepoint='f9' name='ugrave'/> + <glyph codepoint='fa' name='uacute'/> + <glyph codepoint='fb' name='ucircumflex'/> + <glyph codepoint='fc' name='udieresis'/> + <glyph codepoint='fd' name='yacute'/> + <glyph codepoint='fe' name='thorn'/> + <glyph codepoint='ff' name='ydieresis'/> + </encoding> + <encoding id='PDFDocEncoding' glyphlist='AGL'> + <glyph codepoint='18' name='breve'/> + <glyph codepoint='19' name='caron'/> + <glyph codepoint='1a' name='circumflex'/> + <glyph codepoint='1b' name='dotaccent'/> + <glyph codepoint='1c' name='hungarumlaut'/> + <glyph codepoint='1d' name='ogonek'/> + <glyph codepoint='1e' name='ring'/> + <glyph codepoint='1f' name='tilde'/> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='quotedbl'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='dollar'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='quotesingle'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asterisk'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='hyphen'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='at'/> + <glyph codepoint='41' name='A'/> + <glyph codepoint='42' name='B'/> + <glyph codepoint='43' name='C'/> + <glyph codepoint='44' name='D'/> + <glyph codepoint='45' name='E'/> + <glyph codepoint='46' name='F'/> + <glyph codepoint='47' name='G'/> + <glyph codepoint='48' name='H'/> + <glyph codepoint='49' name='I'/> + <glyph codepoint='4a' name='J'/> + <glyph codepoint='4b' name='K'/> + <glyph codepoint='4c' name='L'/> + <glyph codepoint='4d' name='M'/> + <glyph codepoint='4e' name='N'/> + <glyph codepoint='4f' name='O'/> + <glyph codepoint='50' name='P'/> + <glyph codepoint='51' name='Q'/> + <glyph codepoint='52' name='R'/> + <glyph codepoint='53' name='S'/> + <glyph codepoint='54' name='T'/> + <glyph codepoint='55' name='U'/> + <glyph codepoint='56' name='V'/> + <glyph codepoint='57' name='W'/> + <glyph codepoint='58' name='X'/> + <glyph codepoint='59' name='Y'/> + <glyph codepoint='5a' name='Z'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='backslash'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='asciicircum'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='grave'/> + <glyph codepoint='61' name='a'/> + <glyph codepoint='62' name='b'/> + <glyph codepoint='63' name='c'/> + <glyph codepoint='64' name='d'/> + <glyph codepoint='65' name='e'/> + <glyph codepoint='66' name='f'/> + <glyph codepoint='67' name='g'/> + <glyph codepoint='68' name='h'/> + <glyph codepoint='69' name='i'/> + <glyph codepoint='6a' name='j'/> + <glyph codepoint='6b' name='k'/> + <glyph codepoint='6c' name='l'/> + <glyph codepoint='6d' name='m'/> + <glyph codepoint='6e' name='n'/> + <glyph codepoint='6f' name='o'/> + <glyph codepoint='70' name='p'/> + <glyph codepoint='71' name='q'/> + <glyph codepoint='72' name='r'/> + <glyph codepoint='73' name='s'/> + <glyph codepoint='74' name='t'/> + <glyph codepoint='75' name='u'/> + <glyph codepoint='76' name='v'/> + <glyph codepoint='77' name='w'/> + <glyph codepoint='78' name='x'/> + <glyph codepoint='79' name='y'/> + <glyph codepoint='7a' name='z'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='asciitilde'/> + <glyph codepoint='80' name='bullet'/> + <glyph codepoint='81' name='dagger'/> + <glyph codepoint='82' name='daggerdbl'/> + <glyph codepoint='83' name='ellipsis'/> + <glyph codepoint='84' name='emdash'/> + <glyph codepoint='85' name='endash'/> + <glyph codepoint='86' name='florin'/> + <glyph codepoint='87' name='fraction'/> + <glyph codepoint='88' name='guilsinglleft'/> + <glyph codepoint='89' name='guilsinglright'/> + <glyph codepoint='8a' name='minus'/> + <glyph codepoint='8b' name='perthousand'/> + <glyph codepoint='8c' name='quotedblbase'/> + <glyph codepoint='8d' name='quotedblleft'/> + <glyph codepoint='8e' name='quotedblright'/> + <glyph codepoint='8f' name='quoteleft'/> + <glyph codepoint='90' name='quoteright'/> + <glyph codepoint='91' name='quotesinglbase'/> + <glyph codepoint='92' name='trademark'/> + <glyph codepoint='93' name='fi'/> + <glyph codepoint='94' name='fl'/> + <glyph codepoint='95' name='Lslash'/> + <glyph codepoint='96' name='OE'/> + <glyph codepoint='97' name='Scaron'/> + <glyph codepoint='98' name='Ydieresis'/> + <glyph codepoint='99' name='Zcaron'/> + <glyph codepoint='9a' name='dotlessi'/> + <glyph codepoint='9b' name='lslash'/> + <glyph codepoint='9c' name='oe'/> + <glyph codepoint='9d' name='scaron'/> + <glyph codepoint='9e' name='zcaron'/> + <glyph codepoint='a0' name='Euro'/> + <glyph codepoint='a1' name='exclamdown'/> + <glyph codepoint='a2' name='cent'/> + <glyph codepoint='a3' name='sterling'/> + <glyph codepoint='a4' name='currency'/> + <glyph codepoint='a5' name='yen'/> + <glyph codepoint='a6' name='brokenbar'/> + <glyph codepoint='a7' name='section'/> + <glyph codepoint='a8' name='dieresis'/> + <glyph codepoint='a9' name='copyright'/> + <glyph codepoint='aa' name='ordfeminine'/> + <glyph codepoint='ab' name='guillemotleft'/> + <glyph codepoint='ac' name='logicalnot'/> + <glyph codepoint='ae' name='registered'/> + <glyph codepoint='af' name='macron'/> + <glyph codepoint='b0' name='degree'/> + <glyph codepoint='b1' name='plusminus'/> + <glyph codepoint='b2' name='twosuperior'/> + <glyph codepoint='b3' name='threesuperior'/> + <glyph codepoint='b4' name='acute'/> + <glyph codepoint='b5' name='mu'/> + <glyph codepoint='b6' name='paragraph'/> + <glyph codepoint='b7' name='periodcentered'/> + <glyph codepoint='b8' name='cedilla'/> + <glyph codepoint='b9' name='onesuperior'/> + <glyph codepoint='ba' name='ordmasculine'/> + <glyph codepoint='bb' name='guillemotright'/> + <glyph codepoint='bc' name='onequarter'/> + <glyph codepoint='bd' name='onehalf'/> + <glyph codepoint='be' name='threequarters'/> + <glyph codepoint='bf' name='questiondown'/> + <glyph codepoint='c0' name='Agrave'/> + <glyph codepoint='c1' name='Aacute'/> + <glyph codepoint='c2' name='Acircumflex'/> + <glyph codepoint='c3' name='Atilde'/> + <glyph codepoint='c4' name='Adieresis'/> + <glyph codepoint='c5' name='Aring'/> + <glyph codepoint='c6' name='AE'/> + <glyph codepoint='c7' name='Ccedilla'/> + <glyph codepoint='c8' name='Egrave'/> + <glyph codepoint='c9' name='Eacute'/> + <glyph codepoint='ca' name='Ecircumflex'/> + <glyph codepoint='cb' name='Edieresis'/> + <glyph codepoint='cc' name='Igrave'/> + <glyph codepoint='cd' name='Iacute'/> + <glyph codepoint='ce' name='Icircumflex'/> + <glyph codepoint='cf' name='Idieresis'/> + <glyph codepoint='d0' name='Eth'/> + <glyph codepoint='d1' name='Ntilde'/> + <glyph codepoint='d2' name='Ograve'/> + <glyph codepoint='d3' name='Oacute'/> + <glyph codepoint='d4' name='Ocircumflex'/> + <glyph codepoint='d5' name='Otilde'/> + <glyph codepoint='d6' name='Odieresis'/> + <glyph codepoint='d7' name='multiply'/> + <glyph codepoint='d8' name='Oslash'/> + <glyph codepoint='d9' name='Ugrave'/> + <glyph codepoint='da' name='Uacute'/> + <glyph codepoint='db' name='Ucircumflex'/> + <glyph codepoint='dc' name='Udieresis'/> + <glyph codepoint='dd' name='Yacute'/> + <glyph codepoint='de' name='Thorn'/> + <glyph codepoint='df' name='germandbls'/> + <glyph codepoint='e0' name='agrave'/> + <glyph codepoint='e1' name='aacute'/> + <glyph codepoint='e2' name='acircumflex'/> + <glyph codepoint='e3' name='atilde'/> + <glyph codepoint='e4' name='adieresis'/> + <glyph codepoint='e5' name='aring'/> + <glyph codepoint='e6' name='ae'/> + <glyph codepoint='e7' name='ccedilla'/> + <glyph codepoint='e8' name='egrave'/> + <glyph codepoint='e9' name='eacute'/> + <glyph codepoint='ea' name='ecircumflex'/> + <glyph codepoint='eb' name='edieresis'/> + <glyph codepoint='ec' name='igrave'/> + <glyph codepoint='ed' name='iacute'/> + <glyph codepoint='ee' name='icircumflex'/> + <glyph codepoint='ef' name='idieresis'/> + <glyph codepoint='f0' name='eth'/> + <glyph codepoint='f1' name='ntilde'/> + <glyph codepoint='f2' name='ograve'/> + <glyph codepoint='f3' name='oacute'/> + <glyph codepoint='f4' name='ocircumflex'/> + <glyph codepoint='f5' name='otilde'/> + <glyph codepoint='f6' name='odieresis'/> + <glyph codepoint='f7' name='divide'/> + <glyph codepoint='f8' name='oslash'/> + <glyph codepoint='f9' name='ugrave'/> + <glyph codepoint='fa' name='uacute'/> + <glyph codepoint='fb' name='ucircumflex'/> + <glyph codepoint='fc' name='udieresis'/> + <glyph codepoint='fd' name='yacute'/> + <glyph codepoint='fe' name='thorn'/> + <glyph codepoint='ff' name='ydieresis'/> + </encoding> + <encoding id='SymbolEncoding' glyphlist='AGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='exclam'/> + <glyph codepoint='22' name='universal'/> + <glyph codepoint='23' name='numbersign'/> + <glyph codepoint='24' name='existential'/> + <glyph codepoint='25' name='percent'/> + <glyph codepoint='26' name='ampersand'/> + <glyph codepoint='27' name='suchthat'/> + <glyph codepoint='28' name='parenleft'/> + <glyph codepoint='29' name='parenright'/> + <glyph codepoint='2a' name='asteriskmath'/> + <glyph codepoint='2b' name='plus'/> + <glyph codepoint='2c' name='comma'/> + <glyph codepoint='2d' name='minus'/> + <glyph codepoint='2e' name='period'/> + <glyph codepoint='2f' name='slash'/> + <glyph codepoint='30' name='zero'/> + <glyph codepoint='31' name='one'/> + <glyph codepoint='32' name='two'/> + <glyph codepoint='33' name='three'/> + <glyph codepoint='34' name='four'/> + <glyph codepoint='35' name='five'/> + <glyph codepoint='36' name='six'/> + <glyph codepoint='37' name='seven'/> + <glyph codepoint='38' name='eight'/> + <glyph codepoint='39' name='nine'/> + <glyph codepoint='3a' name='colon'/> + <glyph codepoint='3b' name='semicolon'/> + <glyph codepoint='3c' name='less'/> + <glyph codepoint='3d' name='equal'/> + <glyph codepoint='3e' name='greater'/> + <glyph codepoint='3f' name='question'/> + <glyph codepoint='40' name='congruent'/> + <glyph codepoint='41' name='Alpha'/> + <glyph codepoint='42' name='Beta'/> + <glyph codepoint='43' name='Chi'/> + <glyph codepoint='44' name='Delta'/> + <glyph codepoint='45' name='Epsilon'/> + <glyph codepoint='46' name='Phi'/> + <glyph codepoint='47' name='Gamma'/> + <glyph codepoint='48' name='Eta'/> + <glyph codepoint='49' name='Iota'/> + <glyph codepoint='4a' name='theta1'/> + <glyph codepoint='4b' name='Kappa'/> + <glyph codepoint='4c' name='Lambda'/> + <glyph codepoint='4d' name='Mu'/> + <glyph codepoint='4e' name='Nu'/> + <glyph codepoint='4f' name='Omicron'/> + <glyph codepoint='50' name='Pi'/> + <glyph codepoint='51' name='Theta'/> + <glyph codepoint='52' name='Rho'/> + <glyph codepoint='53' name='Sigma'/> + <glyph codepoint='54' name='Tau'/> + <glyph codepoint='55' name='Upsilon'/> + <glyph codepoint='56' name='sigma1'/> + <glyph codepoint='57' name='Omega'/> + <glyph codepoint='58' name='Xi'/> + <glyph codepoint='59' name='Psi'/> + <glyph codepoint='5a' name='Zeta'/> + <glyph codepoint='5b' name='bracketleft'/> + <glyph codepoint='5c' name='therefore'/> + <glyph codepoint='5d' name='bracketright'/> + <glyph codepoint='5e' name='perpendicular'/> + <glyph codepoint='5f' name='underscore'/> + <glyph codepoint='60' name='radicalex'/> + <glyph codepoint='61' name='alpha'/> + <glyph codepoint='62' name='beta'/> + <glyph codepoint='63' name='chi'/> + <glyph codepoint='64' name='delta'/> + <glyph codepoint='65' name='epsilon'/> + <glyph codepoint='66' name='phi'/> + <glyph codepoint='67' name='gamma'/> + <glyph codepoint='68' name='eta'/> + <glyph codepoint='69' name='iota'/> + <glyph codepoint='6a' name='phi1'/> + <glyph codepoint='6b' name='kappa'/> + <glyph codepoint='6c' name='lambda'/> + <glyph codepoint='6d' name='mu'/> + <glyph codepoint='6e' name='nu'/> + <glyph codepoint='6f' name='omicron'/> + <glyph codepoint='70' name='pi'/> + <glyph codepoint='71' name='theta'/> + <glyph codepoint='72' name='rho'/> + <glyph codepoint='73' name='sigma'/> + <glyph codepoint='74' name='tau'/> + <glyph codepoint='75' name='upsilon'/> + <glyph codepoint='76' name='omega1'/> + <glyph codepoint='77' name='omega'/> + <glyph codepoint='78' name='xi'/> + <glyph codepoint='79' name='psi'/> + <glyph codepoint='7a' name='zeta'/> + <glyph codepoint='7b' name='braceleft'/> + <glyph codepoint='7c' name='bar'/> + <glyph codepoint='7d' name='braceright'/> + <glyph codepoint='7e' name='similar'/> + <glyph codepoint='a0' name='Euro'/> + <glyph codepoint='a1' name='Upsilon1'/> + <glyph codepoint='a2' name='minute'/> + <glyph codepoint='a3' name='lessequal'/> + <glyph codepoint='a4' name='fraction'/> + <glyph codepoint='a5' name='infinity'/> + <glyph codepoint='a6' name='florin'/> + <glyph codepoint='a7' name='club'/> + <glyph codepoint='a8' name='diamond'/> + <glyph codepoint='a9' name='heart'/> + <glyph codepoint='aa' name='spade'/> + <glyph codepoint='ab' name='arrowboth'/> + <glyph codepoint='ac' name='arrowleft'/> + <glyph codepoint='ad' name='arrowup'/> + <glyph codepoint='ae' name='arrowright'/> + <glyph codepoint='af' name='arrowdown'/> + <glyph codepoint='b0' name='degree'/> + <glyph codepoint='b1' name='plusminus'/> + <glyph codepoint='b2' name='second'/> + <glyph codepoint='b3' name='greaterequal'/> + <glyph codepoint='b4' name='multiply'/> + <glyph codepoint='b5' name='proportional'/> + <glyph codepoint='b6' name='partialdiff'/> + <glyph codepoint='b7' name='bullet'/> + <glyph codepoint='b8' name='divide'/> + <glyph codepoint='b9' name='notequal'/> + <glyph codepoint='ba' name='equivalence'/> + <glyph codepoint='bb' name='approxequal'/> + <glyph codepoint='bc' name='ellipsis'/> + <glyph codepoint='bd' name='arrowvertex'/> + <glyph codepoint='be' name='arrowhorizex'/> + <glyph codepoint='bf' name='carriagereturn'/> + <glyph codepoint='c0' name='aleph'/> + <glyph codepoint='c1' name='Ifraktur'/> + <glyph codepoint='c2' name='Rfraktur'/> + <glyph codepoint='c3' name='weierstrass'/> + <glyph codepoint='c4' name='circlemultiply'/> + <glyph codepoint='c5' name='circleplus'/> + <glyph codepoint='c6' name='emptyset'/> + <glyph codepoint='c7' name='intersection'/> + <glyph codepoint='c8' name='union'/> + <glyph codepoint='c9' name='propersuperset'/> + <glyph codepoint='ca' name='reflexsuperset'/> + <glyph codepoint='cb' name='notsubset'/> + <glyph codepoint='cc' name='propersubset'/> + <glyph codepoint='cd' name='reflexsubset'/> + <glyph codepoint='ce' name='element'/> + <glyph codepoint='cf' name='notelement'/> + <glyph codepoint='d0' name='angle'/> + <glyph codepoint='d1' name='gradient'/> + <glyph codepoint='d2' name='registerserif'/> + <glyph codepoint='d3' name='copyrightserif'/> + <glyph codepoint='d4' name='trademarkserif'/> + <glyph codepoint='d5' name='product'/> + <glyph codepoint='d6' name='radical'/> + <glyph codepoint='d7' name='dotmath'/> + <glyph codepoint='d8' name='logicalnot'/> + <glyph codepoint='d9' name='logicaland'/> + <glyph codepoint='da' name='logicalor'/> + <glyph codepoint='db' name='arrowdblboth'/> + <glyph codepoint='dc' name='arrowdblleft'/> + <glyph codepoint='dd' name='arrowdblup'/> + <glyph codepoint='de' name='arrowdblright'/> + <glyph codepoint='df' name='arrowdbldown'/> + <glyph codepoint='e0' name='lozenge'/> + <glyph codepoint='e1' name='angleleft'/> + <glyph codepoint='e2' name='registersans'/> + <glyph codepoint='e3' name='copyrightsans'/> + <glyph codepoint='e4' name='trademarksans'/> + <glyph codepoint='e5' name='summation'/> + <glyph codepoint='e6' name='parenlefttp'/> + <glyph codepoint='e7' name='parenleftex'/> + <glyph codepoint='e8' name='parenleftbt'/> + <glyph codepoint='e9' name='bracketlefttp'/> + <glyph codepoint='ea' name='bracketleftex'/> + <glyph codepoint='eb' name='bracketleftbt'/> + <glyph codepoint='ec' name='bracelefttp'/> + <glyph codepoint='ed' name='braceleftmid'/> + <glyph codepoint='ee' name='braceleftbt'/> + <glyph codepoint='ef' name='braceex'/> + <glyph codepoint='f1' name='angleright'/> + <glyph codepoint='f2' name='integral'/> + <glyph codepoint='f3' name='integraltp'/> + <glyph codepoint='f4' name='integralex'/> + <glyph codepoint='f5' name='integralbt'/> + <glyph codepoint='f6' name='parenrighttp'/> + <glyph codepoint='f7' name='parenrightex'/> + <glyph codepoint='f8' name='parenrightbt'/> + <glyph codepoint='f9' name='bracketrighttp'/> + <glyph codepoint='fa' name='bracketrightex'/> + <glyph codepoint='fb' name='bracketrightbt'/> + <glyph codepoint='fc' name='bracerighttp'/> + <glyph codepoint='fd' name='bracerightmid'/> + <glyph codepoint='fe' name='bracerightbt'/> + </encoding> + <encoding id='ZapfDingbatsEncoding' glyphlist='ZGL'> + <glyph codepoint='20' name='space'/> + <glyph codepoint='21' name='a1'/> + <glyph codepoint='22' name='a2'/> + <glyph codepoint='23' name='a202'/> + <glyph codepoint='24' name='a3'/> + <glyph codepoint='25' name='a4'/> + <glyph codepoint='26' name='a5'/> + <glyph codepoint='27' name='a119'/> + <glyph codepoint='28' name='a118'/> + <glyph codepoint='29' name='a117'/> + <glyph codepoint='2A' name='a11'/> + <glyph codepoint='2B' name='a12'/> + <glyph codepoint='2C' name='a13'/> + <glyph codepoint='2D' name='a14'/> + <glyph codepoint='2E' name='a15'/> + <glyph codepoint='2F' name='a16'/> + <glyph codepoint='30' name='a105'/> + <glyph codepoint='31' name='a17'/> + <glyph codepoint='32' name='a18'/> + <glyph codepoint='33' name='a19'/> + <glyph codepoint='34' name='a20'/> + <glyph codepoint='35' name='a21'/> + <glyph codepoint='36' name='a22'/> + <glyph codepoint='37' name='a23'/> + <glyph codepoint='38' name='a24'/> + <glyph codepoint='39' name='a25'/> + <glyph codepoint='3A' name='a26'/> + <glyph codepoint='3B' name='a27'/> + <glyph codepoint='3C' name='a28'/> + <glyph codepoint='3D' name='a6'/> + <glyph codepoint='3E' name='a7'/> + <glyph codepoint='3F' name='a8'/> + <glyph codepoint='40' name='a9'/> + <glyph codepoint='41' name='a10'/> + <glyph codepoint='42' name='a29'/> + <glyph codepoint='43' name='a30'/> + <glyph codepoint='44' name='a31'/> + <glyph codepoint='45' name='a32'/> + <glyph codepoint='46' name='a33'/> + <glyph codepoint='47' name='a34'/> + <glyph codepoint='48' name='a35'/> + <glyph codepoint='49' name='a36'/> + <glyph codepoint='4A' name='a37'/> + <glyph codepoint='4B' name='a38'/> + <glyph codepoint='4C' name='a39'/> + <glyph codepoint='4D' name='a40'/> + <glyph codepoint='4E' name='a41'/> + <glyph codepoint='4F' name='a42'/> + <glyph codepoint='50' name='a43'/> + <glyph codepoint='51' name='a44'/> + <glyph codepoint='52' name='a45'/> + <glyph codepoint='53' name='a46'/> + <glyph codepoint='54' name='a47'/> + <glyph codepoint='55' name='a48'/> + <glyph codepoint='56' name='a49'/> + <glyph codepoint='57' name='a50'/> + <glyph codepoint='58' name='a51'/> + <glyph codepoint='59' name='a52'/> + <glyph codepoint='5A' name='a53'/> + <glyph codepoint='5B' name='a54'/> + <glyph codepoint='5C' name='a55'/> + <glyph codepoint='5D' name='a56'/> + <glyph codepoint='5E' name='a57'/> + <glyph codepoint='5F' name='a58'/> + <glyph codepoint='60' name='a59'/> + <glyph codepoint='61' name='a60'/> + <glyph codepoint='62' name='a61'/> + <glyph codepoint='63' name='a62'/> + <glyph codepoint='64' name='a63'/> + <glyph codepoint='65' name='a64'/> + <glyph codepoint='66' name='a65'/> + <glyph codepoint='67' name='a66'/> + <glyph codepoint='68' name='a67'/> + <glyph codepoint='69' name='a68'/> + <glyph codepoint='6A' name='a69'/> + <glyph codepoint='6B' name='a70'/> + <glyph codepoint='6C' name='a71'/> + <glyph codepoint='6D' name='a72'/> + <glyph codepoint='6E' name='a73'/> + <glyph codepoint='6F' name='a74'/> + <glyph codepoint='70' name='a203'/> + <glyph codepoint='71' name='a75'/> + <glyph codepoint='72' name='a204'/> + <glyph codepoint='73' name='a76'/> + <glyph codepoint='74' name='a77'/> + <glyph codepoint='75' name='a78'/> + <glyph codepoint='76' name='a79'/> + <glyph codepoint='77' name='a81'/> + <glyph codepoint='78' name='a82'/> + <glyph codepoint='79' name='a83'/> + <glyph codepoint='7A' name='a84'/> + <glyph codepoint='7B' name='a97'/> + <glyph codepoint='7C' name='a98'/> + <glyph codepoint='7D' name='a99'/> + <glyph codepoint='7E' name='a100'/> + <glyph codepoint='80' name='a89'/> + <glyph codepoint='81' name='a90'/> + <glyph codepoint='82' name='a93'/> + <glyph codepoint='83' name='a94'/> + <glyph codepoint='84' name='a91'/> + <glyph codepoint='85' name='a92'/> + <glyph codepoint='86' name='a205'/> + <glyph codepoint='87' name='a85'/> + <glyph codepoint='88' name='a206'/> + <glyph codepoint='89' name='a86'/> + <glyph codepoint='8A' name='a87'/> + <glyph codepoint='8B' name='a88'/> + <glyph codepoint='8C' name='a95'/> + <glyph codepoint='8D' name='a96'/> + <glyph codepoint='A1' name='a101'/> + <glyph codepoint='A2' name='a102'/> + <glyph codepoint='A3' name='a103'/> + <glyph codepoint='A4' name='a104'/> + <glyph codepoint='A5' name='a106'/> + <glyph codepoint='A6' name='a107'/> + <glyph codepoint='A7' name='a108'/> + <glyph codepoint='A8' name='a112'/> + <glyph codepoint='A9' name='a111'/> + <glyph codepoint='AA' name='a110'/> + <glyph codepoint='AB' name='a109'/> + <glyph codepoint='AC' name='a120'/> + <glyph codepoint='AD' name='a121'/> + <glyph codepoint='AE' name='a122'/> + <glyph codepoint='AF' name='a123'/> + <glyph codepoint='B0' name='a124'/> + <glyph codepoint='B1' name='a125'/> + <glyph codepoint='B2' name='a126'/> + <glyph codepoint='B3' name='a127'/> + <glyph codepoint='B4' name='a128'/> + <glyph codepoint='B5' name='a129'/> + <glyph codepoint='B6' name='a130'/> + <glyph codepoint='B7' name='a131'/> + <glyph codepoint='B8' name='a132'/> + <glyph codepoint='B9' name='a133'/> + <glyph codepoint='BA' name='a134'/> + <glyph codepoint='BB' name='a135'/> + <glyph codepoint='BC' name='a136'/> + <glyph codepoint='BD' name='a137'/> + <glyph codepoint='BE' name='a138'/> + <glyph codepoint='BF' name='a139'/> + <glyph codepoint='C0' name='a140'/> + <glyph codepoint='C1' name='a141'/> + <glyph codepoint='C2' name='a142'/> + <glyph codepoint='C3' name='a143'/> + <glyph codepoint='C4' name='a144'/> + <glyph codepoint='C5' name='a145'/> + <glyph codepoint='C6' name='a146'/> + <glyph codepoint='C7' name='a147'/> + <glyph codepoint='C8' name='a148'/> + <glyph codepoint='C9' name='a149'/> + <glyph codepoint='CA' name='a150'/> + <glyph codepoint='CB' name='a151'/> + <glyph codepoint='CC' name='a152'/> + <glyph codepoint='CD' name='a153'/> + <glyph codepoint='CE' name='a154'/> + <glyph codepoint='CF' name='a155'/> + <glyph codepoint='D0' name='a156'/> + <glyph codepoint='D1' name='a157'/> + <glyph codepoint='D2' name='a158'/> + <glyph codepoint='D3' name='a159'/> + <glyph codepoint='D4' name='a160'/> + <glyph codepoint='D5' name='a161'/> + <glyph codepoint='D6' name='a163'/> + <glyph codepoint='D7' name='a164'/> + <glyph codepoint='D8' name='a196'/> + <glyph codepoint='D9' name='a165'/> + <glyph codepoint='DA' name='a192'/> + <glyph codepoint='DB' name='a166'/> + <glyph codepoint='DC' name='a167'/> + <glyph codepoint='DD' name='a168'/> + <glyph codepoint='DE' name='a169'/> + <glyph codepoint='DF' name='a170'/> + <glyph codepoint='E0' name='a171'/> + <glyph codepoint='E1' name='a172'/> + <glyph codepoint='E2' name='a173'/> + <glyph codepoint='E3' name='a162'/> + <glyph codepoint='E4' name='a174'/> + <glyph codepoint='E5' name='a175'/> + <glyph codepoint='E6' name='a176'/> + <glyph codepoint='E7' name='a177'/> + <glyph codepoint='E8' name='a178'/> + <glyph codepoint='E9' name='a179'/> + <glyph codepoint='EA' name='a193'/> + <glyph codepoint='EB' name='a180'/> + <glyph codepoint='EC' name='a199'/> + <glyph codepoint='ED' name='a181'/> + <glyph codepoint='EE' name='a200'/> + <glyph codepoint='EF' name='a182'/> + <glyph codepoint='F1' name='a201'/> + <glyph codepoint='F2' name='a183'/> + <glyph codepoint='F3' name='a184'/> + <glyph codepoint='F4' name='a197'/> + <glyph codepoint='F5' name='a185'/> + <glyph codepoint='F6' name='a194'/> + <glyph codepoint='F7' name='a198'/> + <glyph codepoint='F8' name='a186'/> + <glyph codepoint='F9' name='a195'/> + <glyph codepoint='FA' name='a187'/> + <glyph codepoint='FB' name='a188'/> + <glyph codepoint='FC' name='a189'/> + <glyph codepoint='FD' name='a190'/> + <glyph codepoint='FE' name='a191'/> + </encoding> +</encoding-set> diff --git a/src/codegen/font-file.xsl b/src/codegen/font-file.xsl index 96a6f8583..7167c5b54 100644 --- a/src/codegen/font-file.xsl +++ b/src/codegen/font-file.xsl @@ -1,33 +1,30 @@ -<!-- -This files writes the class files for the fonts (Courier.java, Helvetica.java etc.). -It uses the information in the font description files (Courier.xml, Helvetica.xml) to this -In these font description files each character is referenced by its adobe name: - <char name="A" width="667"/> -To resolve this name and to find the code for this character it looks up the adobe name in the -file charlist.xml and extracts the WinAnsi code. ---> - +<!-- This file writes the class files for the fonts (Courier.java, + Helvetica.java etc.). It uses the information in the font + description files (Courier.xml, Helvetica.xml) to do this. In these + font description files each character is referenced by its adobe + glyph name: + <char name="A" width="667"/> + To resolve this name and to find the code for this character it looks + up the adobe name in the file encodings.xml and extracts the appropriate + code. --> <xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect" - extension-element-prefixes="redirect"> -<xsl:output method="text" /> - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> -<!-- Note: this key is used with charlist.xml in a for-each. --> -<xsl:key name="adobe-char-map" match="map" use="@adobe-name"/> + <xsl:output method="text"/> + + <xsl:param name="encoding" select="/font-metrics/encoding"/> + <xsl:variable name="native-encoding" select="/font-metrics/encoding"/> + <xsl:variable name="glyphs" select="document('encodings.xml')/encoding-set/encoding[@id=$encoding]/glyph"/> -<xsl:template match="font-metrics"> -<xsl:variable name="class-name" select="class-name"/> -<!--<redirect:write select="concat('org/apache/fop/render/pdf/fonts/', $class-name, '.java')">--> + <xsl:template match="font-metrics"> package org.apache.fop.render.pdf.fonts; import org.apache.fop.render.pdf.Font; +import org.apache.fop.render.pdf.CodePointMapping; public class <xsl:value-of select="class-name"/> extends Font { private final static String fontName = "<xsl:value-of select="font-name"/>"; - private final static String encoding = "<xsl:value-of select="encoding"/>"; + private final static String encoding = <xsl:choose><xsl:when test="$encoding != $native-encoding">"<xsl:value-of select="$encoding"/>"</xsl:when><xsl:otherwise>null</xsl:otherwise></xsl:choose>; private final static int capHeight = <xsl:value-of select="cap-height"/>; private final static int xHeight = <xsl:value-of select="x-height"/>; private final static int ascender = <xsl:value-of select="ascender"/>; @@ -35,13 +32,12 @@ public class <xsl:value-of select="class-name"/> extends Font { private final static int firstChar = <xsl:value-of select="first-char"/>; private final static int lastChar = <xsl:value-of select="last-char"/>; private final static int[] width; + private final CodePointMapping mapping + = CodePointMapping.getMapping("<xsl:value-of select="$encoding"/>"); static { width = new int[256]; -<xsl:for-each select="widths/char"><xsl:variable name="char-name" select="@name"/><xsl:variable name="char-width" select="@width"/> -<xsl:for-each select="document('charlist.xml')"><xsl:variable name="char-num" select="key('adobe-char-map',$char-name)/@win-ansi"/> -<xsl:if test="$char-num!='-1'"> width[<xsl:value-of select="$char-num"/>] = <xsl:value-of select="$char-width"/>; -</xsl:if></xsl:for-each></xsl:for-each> + <xsl:apply-templates select="widths"/> } public String encoding() { @@ -86,8 +82,18 @@ public class <xsl:value-of select="class-name"/> extends Font { for( int i = 0; i < arr.length; i++) arr[i] *= size; return arr; } + + public char mapChar(char c) { + char d = mapping.mapChar(c); + if(d != 0) + return d; + else + return '#'; + } + } -<!--</redirect:write>--> -</xsl:template> + </xsl:template> + + <xsl:template match="widths/char"><xsl:variable name="char-name" select="@name"/><xsl:variable name="char-num" select="$glyphs[@name = $char-name]/@codepoint"/><xsl:if test="$char-num!=''"> width[0x<xsl:value-of select="$char-num"/>] = <xsl:value-of select="@width"/>;</xsl:if></xsl:template> </xsl:stylesheet> diff --git a/src/codegen/glyphlist.xml b/src/codegen/glyphlist.xml new file mode 100644 index 000000000..b5dc36f19 --- /dev/null +++ b/src/codegen/glyphlist.xml @@ -0,0 +1,1276 @@ +<?xml version='1.0'?> +<!DOCTYPE glyphlist-set [ + <!ELEMENT glyphlist-set (glyphlist+)> + <!ELEMENT glyphlist (glyph+)> + <!ATTLIST glyphlist id ID #REQUIRED> + <!ELEMENT glyph EMPTY> + <!ATTLIST glyph codepoint CDATA #REQUIRED name CDATA #REQUIRED> +]> +<glyphlist-set> + + <!-- This encodes the Adobe Glyph List, version 1.2 (22 Oct 1998), + located at http://partners.adobe.com/asn/developer/type/glyphlist.txt + --> + <glyphlist id='AGL'> + <glyph codepoint='0041' name='A'/> + <glyph codepoint='00C6' name='AE'/> + <glyph codepoint='01FC' name='AEacute'/> + <glyph codepoint='F7E6' name='AEsmall'/> + <glyph codepoint='00C1' name='Aacute'/> + <glyph codepoint='F7E1' name='Aacutesmall'/> + <glyph codepoint='0102' name='Abreve'/> + <glyph codepoint='00C2' name='Acircumflex'/> + <glyph codepoint='F7E2' name='Acircumflexsmall'/> + <glyph codepoint='F6C9' name='Acute'/> + <glyph codepoint='F7B4' name='Acutesmall'/> + <glyph codepoint='00C4' name='Adieresis'/> + <glyph codepoint='F7E4' name='Adieresissmall'/> + <glyph codepoint='00C0' name='Agrave'/> + <glyph codepoint='F7E0' name='Agravesmall'/> + <glyph codepoint='0391' name='Alpha'/> + <glyph codepoint='0386' name='Alphatonos'/> + <glyph codepoint='0100' name='Amacron'/> + <glyph codepoint='0104' name='Aogonek'/> + <glyph codepoint='00C5' name='Aring'/> + <glyph codepoint='01FA' name='Aringacute'/> + <glyph codepoint='F7E5' name='Aringsmall'/> + <glyph codepoint='F761' name='Asmall'/> + <glyph codepoint='00C3' name='Atilde'/> + <glyph codepoint='F7E3' name='Atildesmall'/> + <glyph codepoint='0042' name='B'/> + <glyph codepoint='0392' name='Beta'/> + <glyph codepoint='F6F4' name='Brevesmall'/> + <glyph codepoint='F762' name='Bsmall'/> + <glyph codepoint='0043' name='C'/> + <glyph codepoint='0106' name='Cacute'/> + <glyph codepoint='F6CA' name='Caron'/> + <glyph codepoint='F6F5' name='Caronsmall'/> + <glyph codepoint='010C' name='Ccaron'/> + <glyph codepoint='00C7' name='Ccedilla'/> + <glyph codepoint='F7E7' name='Ccedillasmall'/> + <glyph codepoint='0108' name='Ccircumflex'/> + <glyph codepoint='010A' name='Cdotaccent'/> + <glyph codepoint='F7B8' name='Cedillasmall'/> + <glyph codepoint='03A7' name='Chi'/> + <glyph codepoint='F6F6' name='Circumflexsmall'/> + <glyph codepoint='F763' name='Csmall'/> + <glyph codepoint='0044' name='D'/> + <glyph codepoint='010E' name='Dcaron'/> + <glyph codepoint='0110' name='Dcroat'/> + <glyph codepoint='2206' name='Delta'/> + <glyph codepoint='0394' name='Delta'/> + <glyph codepoint='F6CB' name='Dieresis'/> + <glyph codepoint='F6CC' name='DieresisAcute'/> + <glyph codepoint='F6CD' name='DieresisGrave'/> + <glyph codepoint='F7A8' name='Dieresissmall'/> + <glyph codepoint='F6F7' name='Dotaccentsmall'/> + <glyph codepoint='F764' name='Dsmall'/> + <glyph codepoint='0045' name='E'/> + <glyph codepoint='00C9' name='Eacute'/> + <glyph codepoint='F7E9' name='Eacutesmall'/> + <glyph codepoint='0114' name='Ebreve'/> + <glyph codepoint='011A' name='Ecaron'/> + <glyph codepoint='00CA' name='Ecircumflex'/> + <glyph codepoint='F7EA' name='Ecircumflexsmall'/> + <glyph codepoint='00CB' name='Edieresis'/> + <glyph codepoint='F7EB' name='Edieresissmall'/> + <glyph codepoint='0116' name='Edotaccent'/> + <glyph codepoint='00C8' name='Egrave'/> + <glyph codepoint='F7E8' name='Egravesmall'/> + <glyph codepoint='0112' name='Emacron'/> + <glyph codepoint='014A' name='Eng'/> + <glyph codepoint='0118' name='Eogonek'/> + <glyph codepoint='0395' name='Epsilon'/> + <glyph codepoint='0388' name='Epsilontonos'/> + <glyph codepoint='F765' name='Esmall'/> + <glyph codepoint='0397' name='Eta'/> + <glyph codepoint='0389' name='Etatonos'/> + <glyph codepoint='00D0' name='Eth'/> + <glyph codepoint='F7F0' name='Ethsmall'/> + <glyph codepoint='20AC' name='Euro'/> + <glyph codepoint='0046' name='F'/> + <glyph codepoint='F766' name='Fsmall'/> + <glyph codepoint='0047' name='G'/> + <glyph codepoint='0393' name='Gamma'/> + <glyph codepoint='011E' name='Gbreve'/> + <glyph codepoint='01E6' name='Gcaron'/> + <glyph codepoint='011C' name='Gcircumflex'/> + <glyph codepoint='0122' name='Gcommaaccent'/> + <glyph codepoint='0120' name='Gdotaccent'/> + <glyph codepoint='F6CE' name='Grave'/> + <glyph codepoint='F760' name='Gravesmall'/> + <glyph codepoint='F767' name='Gsmall'/> + <glyph codepoint='0048' name='H'/> + <glyph codepoint='25CF' name='H18533'/> + <glyph codepoint='25AA' name='H18543'/> + <glyph codepoint='25AB' name='H18551'/> + <glyph codepoint='25A1' name='H22073'/> + <glyph codepoint='0126' name='Hbar'/> + <glyph codepoint='0124' name='Hcircumflex'/> + <glyph codepoint='F768' name='Hsmall'/> + <glyph codepoint='F6CF' name='Hungarumlaut'/> + <glyph codepoint='F6F8' name='Hungarumlautsmall'/> + <glyph codepoint='0049' name='I'/> + <glyph codepoint='0132' name='IJ'/> + <glyph codepoint='00CD' name='Iacute'/> + <glyph codepoint='F7ED' name='Iacutesmall'/> + <glyph codepoint='012C' name='Ibreve'/> + <glyph codepoint='00CE' name='Icircumflex'/> + <glyph codepoint='F7EE' name='Icircumflexsmall'/> + <glyph codepoint='00CF' name='Idieresis'/> + <glyph codepoint='F7EF' name='Idieresissmall'/> + <glyph codepoint='0130' name='Idotaccent'/> + <glyph codepoint='2111' name='Ifraktur'/> + <glyph codepoint='00CC' name='Igrave'/> + <glyph codepoint='F7EC' name='Igravesmall'/> + <glyph codepoint='012A' name='Imacron'/> + <glyph codepoint='012E' name='Iogonek'/> + <glyph codepoint='0399' name='Iota'/> + <glyph codepoint='03AA' name='Iotadieresis'/> + <glyph codepoint='038A' name='Iotatonos'/> + <glyph codepoint='F769' name='Ismall'/> + <glyph codepoint='0128' name='Itilde'/> + <glyph codepoint='004A' name='J'/> + <glyph codepoint='0134' name='Jcircumflex'/> + <glyph codepoint='F76A' name='Jsmall'/> + <glyph codepoint='004B' name='K'/> + <glyph codepoint='039A' name='Kappa'/> + <glyph codepoint='0136' name='Kcommaaccent'/> + <glyph codepoint='F76B' name='Ksmall'/> + <glyph codepoint='004C' name='L'/> + <glyph codepoint='F6BF' name='LL'/> + <glyph codepoint='0139' name='Lacute'/> + <glyph codepoint='039B' name='Lambda'/> + <glyph codepoint='013D' name='Lcaron'/> + <glyph codepoint='013B' name='Lcommaaccent'/> + <glyph codepoint='013F' name='Ldot'/> + <glyph codepoint='0141' name='Lslash'/> + <glyph codepoint='F6F9' name='Lslashsmall'/> + <glyph codepoint='F76C' name='Lsmall'/> + <glyph codepoint='004D' name='M'/> + <glyph codepoint='F6D0' name='Macron'/> + <glyph codepoint='F7AF' name='Macronsmall'/> + <glyph codepoint='F76D' name='Msmall'/> + <glyph codepoint='039C' name='Mu'/> + <glyph codepoint='004E' name='N'/> + <glyph codepoint='0143' name='Nacute'/> + <glyph codepoint='0147' name='Ncaron'/> + <glyph codepoint='0145' name='Ncommaaccent'/> + <glyph codepoint='F76E' name='Nsmall'/> + <glyph codepoint='00D1' name='Ntilde'/> + <glyph codepoint='F7F1' name='Ntildesmall'/> + <glyph codepoint='039D' name='Nu'/> + <glyph codepoint='004F' name='O'/> + <glyph codepoint='0152' name='OE'/> + <glyph codepoint='F6FA' name='OEsmall'/> + <glyph codepoint='00D3' name='Oacute'/> + <glyph codepoint='F7F3' name='Oacutesmall'/> + <glyph codepoint='014E' name='Obreve'/> + <glyph codepoint='00D4' name='Ocircumflex'/> + <glyph codepoint='F7F4' name='Ocircumflexsmall'/> + <glyph codepoint='00D6' name='Odieresis'/> + <glyph codepoint='F7F6' name='Odieresissmall'/> + <glyph codepoint='F6FB' name='Ogoneksmall'/> + <glyph codepoint='00D2' name='Ograve'/> + <glyph codepoint='F7F2' name='Ogravesmall'/> + <glyph codepoint='01A0' name='Ohorn'/> + <glyph codepoint='0150' name='Ohungarumlaut'/> + <glyph codepoint='014C' name='Omacron'/> + <glyph codepoint='2126' name='Omega'/> + <glyph codepoint='03A9' name='Omega'/> + <glyph codepoint='038F' name='Omegatonos'/> + <glyph codepoint='039F' name='Omicron'/> + <glyph codepoint='038C' name='Omicrontonos'/> + <glyph codepoint='00D8' name='Oslash'/> + <glyph codepoint='01FE' name='Oslashacute'/> + <glyph codepoint='F7F8' name='Oslashsmall'/> + <glyph codepoint='F76F' name='Osmall'/> + <glyph codepoint='00D5' name='Otilde'/> + <glyph codepoint='F7F5' name='Otildesmall'/> + <glyph codepoint='0050' name='P'/> + <glyph codepoint='03A6' name='Phi'/> + <glyph codepoint='03A0' name='Pi'/> + <glyph codepoint='03A8' name='Psi'/> + <glyph codepoint='F770' name='Psmall'/> + <glyph codepoint='0051' name='Q'/> + <glyph codepoint='F771' name='Qsmall'/> + <glyph codepoint='0052' name='R'/> + <glyph codepoint='0154' name='Racute'/> + <glyph codepoint='0158' name='Rcaron'/> + <glyph codepoint='0156' name='Rcommaaccent'/> + <glyph codepoint='211C' name='Rfraktur'/> + <glyph codepoint='03A1' name='Rho'/> + <glyph codepoint='F6FC' name='Ringsmall'/> + <glyph codepoint='F772' name='Rsmall'/> + <glyph codepoint='0053' name='S'/> + <glyph codepoint='250C' name='SF010000'/> + <glyph codepoint='2514' name='SF020000'/> + <glyph codepoint='2510' name='SF030000'/> + <glyph codepoint='2518' name='SF040000'/> + <glyph codepoint='253C' name='SF050000'/> + <glyph codepoint='252C' name='SF060000'/> + <glyph codepoint='2534' name='SF070000'/> + <glyph codepoint='251C' name='SF080000'/> + <glyph codepoint='2524' name='SF090000'/> + <glyph codepoint='2500' name='SF100000'/> + <glyph codepoint='2502' name='SF110000'/> + <glyph codepoint='2561' name='SF190000'/> + <glyph codepoint='2562' name='SF200000'/> + <glyph codepoint='2556' name='SF210000'/> + <glyph codepoint='2555' name='SF220000'/> + <glyph codepoint='2563' name='SF230000'/> + <glyph codepoint='2551' name='SF240000'/> + <glyph codepoint='2557' name='SF250000'/> + <glyph codepoint='255D' name='SF260000'/> + <glyph codepoint='255C' name='SF270000'/> + <glyph codepoint='255B' name='SF280000'/> + <glyph codepoint='255E' name='SF360000'/> + <glyph codepoint='255F' name='SF370000'/> + <glyph codepoint='255A' name='SF380000'/> + <glyph codepoint='2554' name='SF390000'/> + <glyph codepoint='2569' name='SF400000'/> + <glyph codepoint='2566' name='SF410000'/> + <glyph codepoint='2560' name='SF420000'/> + <glyph codepoint='2550' name='SF430000'/> + <glyph codepoint='256C' name='SF440000'/> + <glyph codepoint='2567' name='SF450000'/> + <glyph codepoint='2568' name='SF460000'/> + <glyph codepoint='2564' name='SF470000'/> + <glyph codepoint='2565' name='SF480000'/> + <glyph codepoint='2559' name='SF490000'/> + <glyph codepoint='2558' name='SF500000'/> + <glyph codepoint='2552' name='SF510000'/> + <glyph codepoint='2553' name='SF520000'/> + <glyph codepoint='256B' name='SF530000'/> + <glyph codepoint='256A' name='SF540000'/> + <glyph codepoint='015A' name='Sacute'/> + <glyph codepoint='0160' name='Scaron'/> + <glyph codepoint='F6FD' name='Scaronsmall'/> + <glyph codepoint='015E' name='Scedilla'/> + <glyph codepoint='F6C1' name='Scedilla'/> + <glyph codepoint='015C' name='Scircumflex'/> + <glyph codepoint='0218' name='Scommaaccent'/> + <glyph codepoint='03A3' name='Sigma'/> + <glyph codepoint='F773' name='Ssmall'/> + <glyph codepoint='0054' name='T'/> + <glyph codepoint='03A4' name='Tau'/> + <glyph codepoint='0166' name='Tbar'/> + <glyph codepoint='0164' name='Tcaron'/> + <glyph codepoint='0162' name='Tcommaaccent'/> + <glyph codepoint='021A' name='Tcommaaccent'/> + <glyph codepoint='0398' name='Theta'/> + <glyph codepoint='00DE' name='Thorn'/> + <glyph codepoint='F7FE' name='Thornsmall'/> + <glyph codepoint='F6FE' name='Tildesmall'/> + <glyph codepoint='F774' name='Tsmall'/> + <glyph codepoint='0055' name='U'/> + <glyph codepoint='00DA' name='Uacute'/> + <glyph codepoint='F7FA' name='Uacutesmall'/> + <glyph codepoint='016C' name='Ubreve'/> + <glyph codepoint='00DB' name='Ucircumflex'/> + <glyph codepoint='F7FB' name='Ucircumflexsmall'/> + <glyph codepoint='00DC' name='Udieresis'/> + <glyph codepoint='F7FC' name='Udieresissmall'/> + <glyph codepoint='00D9' name='Ugrave'/> + <glyph codepoint='F7F9' name='Ugravesmall'/> + <glyph codepoint='01AF' name='Uhorn'/> + <glyph codepoint='0170' name='Uhungarumlaut'/> + <glyph codepoint='016A' name='Umacron'/> + <glyph codepoint='0172' name='Uogonek'/> + <glyph codepoint='03A5' name='Upsilon'/> + <glyph codepoint='03D2' name='Upsilon1'/> + <glyph codepoint='03AB' name='Upsilondieresis'/> + <glyph codepoint='038E' name='Upsilontonos'/> + <glyph codepoint='016E' name='Uring'/> + <glyph codepoint='F775' name='Usmall'/> + <glyph codepoint='0168' name='Utilde'/> + <glyph codepoint='0056' name='V'/> + <glyph codepoint='F776' name='Vsmall'/> + <glyph codepoint='0057' name='W'/> + <glyph codepoint='1E82' name='Wacute'/> + <glyph codepoint='0174' name='Wcircumflex'/> + <glyph codepoint='1E84' name='Wdieresis'/> + <glyph codepoint='1E80' name='Wgrave'/> + <glyph codepoint='F777' name='Wsmall'/> + <glyph codepoint='0058' name='X'/> + <glyph codepoint='039E' name='Xi'/> + <glyph codepoint='F778' name='Xsmall'/> + <glyph codepoint='0059' name='Y'/> + <glyph codepoint='00DD' name='Yacute'/> + <glyph codepoint='F7FD' name='Yacutesmall'/> + <glyph codepoint='0176' name='Ycircumflex'/> + <glyph codepoint='0178' name='Ydieresis'/> + <glyph codepoint='F7FF' name='Ydieresissmall'/> + <glyph codepoint='1EF2' name='Ygrave'/> + <glyph codepoint='F779' name='Ysmall'/> + <glyph codepoint='005A' name='Z'/> + <glyph codepoint='0179' name='Zacute'/> + <glyph codepoint='017D' name='Zcaron'/> + <glyph codepoint='F6FF' name='Zcaronsmall'/> + <glyph codepoint='017B' name='Zdotaccent'/> + <glyph codepoint='0396' name='Zeta'/> + <glyph codepoint='F77A' name='Zsmall'/> + <glyph codepoint='0061' name='a'/> + <glyph codepoint='00E1' name='aacute'/> + <glyph codepoint='0103' name='abreve'/> + <glyph codepoint='00E2' name='acircumflex'/> + <glyph codepoint='00B4' name='acute'/> + <glyph codepoint='0301' name='acutecomb'/> + <glyph codepoint='00E4' name='adieresis'/> + <glyph codepoint='00E6' name='ae'/> + <glyph codepoint='01FD' name='aeacute'/> + <glyph codepoint='2015' name='afii00208'/> + <glyph codepoint='0410' name='afii10017'/> + <glyph codepoint='0411' name='afii10018'/> + <glyph codepoint='0412' name='afii10019'/> + <glyph codepoint='0413' name='afii10020'/> + <glyph codepoint='0414' name='afii10021'/> + <glyph codepoint='0415' name='afii10022'/> + <glyph codepoint='0401' name='afii10023'/> + <glyph codepoint='0416' name='afii10024'/> + <glyph codepoint='0417' name='afii10025'/> + <glyph codepoint='0418' name='afii10026'/> + <glyph codepoint='0419' name='afii10027'/> + <glyph codepoint='041A' name='afii10028'/> + <glyph codepoint='041B' name='afii10029'/> + <glyph codepoint='041C' name='afii10030'/> + <glyph codepoint='041D' name='afii10031'/> + <glyph codepoint='041E' name='afii10032'/> + <glyph codepoint='041F' name='afii10033'/> + <glyph codepoint='0420' name='afii10034'/> + <glyph codepoint='0421' name='afii10035'/> + <glyph codepoint='0422' name='afii10036'/> + <glyph codepoint='0423' name='afii10037'/> + <glyph codepoint='0424' name='afii10038'/> + <glyph codepoint='0425' name='afii10039'/> + <glyph codepoint='0426' name='afii10040'/> + <glyph codepoint='0427' name='afii10041'/> + <glyph codepoint='0428' name='afii10042'/> + <glyph codepoint='0429' name='afii10043'/> + <glyph codepoint='042A' name='afii10044'/> + <glyph codepoint='042B' name='afii10045'/> + <glyph codepoint='042C' name='afii10046'/> + <glyph codepoint='042D' name='afii10047'/> + <glyph codepoint='042E' name='afii10048'/> + <glyph codepoint='042F' name='afii10049'/> + <glyph codepoint='0490' name='afii10050'/> + <glyph codepoint='0402' name='afii10051'/> + <glyph codepoint='0403' name='afii10052'/> + <glyph codepoint='0404' name='afii10053'/> + <glyph codepoint='0405' name='afii10054'/> + <glyph codepoint='0406' name='afii10055'/> + <glyph codepoint='0407' name='afii10056'/> + <glyph codepoint='0408' name='afii10057'/> + <glyph codepoint='0409' name='afii10058'/> + <glyph codepoint='040A' name='afii10059'/> + <glyph codepoint='040B' name='afii10060'/> + <glyph codepoint='040C' name='afii10061'/> + <glyph codepoint='040E' name='afii10062'/> + <glyph codepoint='F6C4' name='afii10063'/> + <glyph codepoint='F6C5' name='afii10064'/> + <glyph codepoint='0430' name='afii10065'/> + <glyph codepoint='0431' name='afii10066'/> + <glyph codepoint='0432' name='afii10067'/> + <glyph codepoint='0433' name='afii10068'/> + <glyph codepoint='0434' name='afii10069'/> + <glyph codepoint='0435' name='afii10070'/> + <glyph codepoint='0451' name='afii10071'/> + <glyph codepoint='0436' name='afii10072'/> + <glyph codepoint='0437' name='afii10073'/> + <glyph codepoint='0438' name='afii10074'/> + <glyph codepoint='0439' name='afii10075'/> + <glyph codepoint='043A' name='afii10076'/> + <glyph codepoint='043B' name='afii10077'/> + <glyph codepoint='043C' name='afii10078'/> + <glyph codepoint='043D' name='afii10079'/> + <glyph codepoint='043E' name='afii10080'/> + <glyph codepoint='043F' name='afii10081'/> + <glyph codepoint='0440' name='afii10082'/> + <glyph codepoint='0441' name='afii10083'/> + <glyph codepoint='0442' name='afii10084'/> + <glyph codepoint='0443' name='afii10085'/> + <glyph codepoint='0444' name='afii10086'/> + <glyph codepoint='0445' name='afii10087'/> + <glyph codepoint='0446' name='afii10088'/> + <glyph codepoint='0447' name='afii10089'/> + <glyph codepoint='0448' name='afii10090'/> + <glyph codepoint='0449' name='afii10091'/> + <glyph codepoint='044A' name='afii10092'/> + <glyph codepoint='044B' name='afii10093'/> + <glyph codepoint='044C' name='afii10094'/> + <glyph codepoint='044D' name='afii10095'/> + <glyph codepoint='044E' name='afii10096'/> + <glyph codepoint='044F' name='afii10097'/> + <glyph codepoint='0491' name='afii10098'/> + <glyph codepoint='0452' name='afii10099'/> + <glyph codepoint='0453' name='afii10100'/> + <glyph codepoint='0454' name='afii10101'/> + <glyph codepoint='0455' name='afii10102'/> + <glyph codepoint='0456' name='afii10103'/> + <glyph codepoint='0457' name='afii10104'/> + <glyph codepoint='0458' name='afii10105'/> + <glyph codepoint='0459' name='afii10106'/> + <glyph codepoint='045A' name='afii10107'/> + <glyph codepoint='045B' name='afii10108'/> + <glyph codepoint='045C' name='afii10109'/> + <glyph codepoint='045E' name='afii10110'/> + <glyph codepoint='040F' name='afii10145'/> + <glyph codepoint='0462' name='afii10146'/> + <glyph codepoint='0472' name='afii10147'/> + <glyph codepoint='0474' name='afii10148'/> + <glyph codepoint='F6C6' name='afii10192'/> + <glyph codepoint='045F' name='afii10193'/> + <glyph codepoint='0463' name='afii10194'/> + <glyph codepoint='0473' name='afii10195'/> + <glyph codepoint='0475' name='afii10196'/> + <glyph codepoint='F6C7' name='afii10831'/> + <glyph codepoint='F6C8' name='afii10832'/> + <glyph codepoint='04D9' name='afii10846'/> + <glyph codepoint='200E' name='afii299'/> + <glyph codepoint='200F' name='afii300'/> + <glyph codepoint='200D' name='afii301'/> + <glyph codepoint='066A' name='afii57381'/> + <glyph codepoint='060C' name='afii57388'/> + <glyph codepoint='0660' name='afii57392'/> + <glyph codepoint='0661' name='afii57393'/> + <glyph codepoint='0662' name='afii57394'/> + <glyph codepoint='0663' name='afii57395'/> + <glyph codepoint='0664' name='afii57396'/> + <glyph codepoint='0665' name='afii57397'/> + <glyph codepoint='0666' name='afii57398'/> + <glyph codepoint='0667' name='afii57399'/> + <glyph codepoint='0668' name='afii57400'/> + <glyph codepoint='0669' name='afii57401'/> + <glyph codepoint='061B' name='afii57403'/> + <glyph codepoint='061F' name='afii57407'/> + <glyph codepoint='0621' name='afii57409'/> + <glyph codepoint='0622' name='afii57410'/> + <glyph codepoint='0623' name='afii57411'/> + <glyph codepoint='0624' name='afii57412'/> + <glyph codepoint='0625' name='afii57413'/> + <glyph codepoint='0626' name='afii57414'/> + <glyph codepoint='0627' name='afii57415'/> + <glyph codepoint='0628' name='afii57416'/> + <glyph codepoint='0629' name='afii57417'/> + <glyph codepoint='062A' name='afii57418'/> + <glyph codepoint='062B' name='afii57419'/> + <glyph codepoint='062C' name='afii57420'/> + <glyph codepoint='062D' name='afii57421'/> + <glyph codepoint='062E' name='afii57422'/> + <glyph codepoint='062F' name='afii57423'/> + <glyph codepoint='0630' name='afii57424'/> + <glyph codepoint='0631' name='afii57425'/> + <glyph codepoint='0632' name='afii57426'/> + <glyph codepoint='0633' name='afii57427'/> + <glyph codepoint='0634' name='afii57428'/> + <glyph codepoint='0635' name='afii57429'/> + <glyph codepoint='0636' name='afii57430'/> + <glyph codepoint='0637' name='afii57431'/> + <glyph codepoint='0638' name='afii57432'/> + <glyph codepoint='0639' name='afii57433'/> + <glyph codepoint='063A' name='afii57434'/> + <glyph codepoint='0640' name='afii57440'/> + <glyph codepoint='0641' name='afii57441'/> + <glyph codepoint='0642' name='afii57442'/> + <glyph codepoint='0643' name='afii57443'/> + <glyph codepoint='0644' name='afii57444'/> + <glyph codepoint='0645' name='afii57445'/> + <glyph codepoint='0646' name='afii57446'/> + <glyph codepoint='0648' name='afii57448'/> + <glyph codepoint='0649' name='afii57449'/> + <glyph codepoint='064A' name='afii57450'/> + <glyph codepoint='064B' name='afii57451'/> + <glyph codepoint='064C' name='afii57452'/> + <glyph codepoint='064D' name='afii57453'/> + <glyph codepoint='064E' name='afii57454'/> + <glyph codepoint='064F' name='afii57455'/> + <glyph codepoint='0650' name='afii57456'/> + <glyph codepoint='0651' name='afii57457'/> + <glyph codepoint='0652' name='afii57458'/> + <glyph codepoint='0647' name='afii57470'/> + <glyph codepoint='06A4' name='afii57505'/> + <glyph codepoint='067E' name='afii57506'/> + <glyph codepoint='0686' name='afii57507'/> + <glyph codepoint='0698' name='afii57508'/> + <glyph codepoint='06AF' name='afii57509'/> + <glyph codepoint='0679' name='afii57511'/> + <glyph codepoint='0688' name='afii57512'/> + <glyph codepoint='0691' name='afii57513'/> + <glyph codepoint='06BA' name='afii57514'/> + <glyph codepoint='06D2' name='afii57519'/> + <glyph codepoint='06D5' name='afii57534'/> + <glyph codepoint='20AA' name='afii57636'/> + <glyph codepoint='05BE' name='afii57645'/> + <glyph codepoint='05C3' name='afii57658'/> + <glyph codepoint='05D0' name='afii57664'/> + <glyph codepoint='05D1' name='afii57665'/> + <glyph codepoint='05D2' name='afii57666'/> + <glyph codepoint='05D3' name='afii57667'/> + <glyph codepoint='05D4' name='afii57668'/> + <glyph codepoint='05D5' name='afii57669'/> + <glyph codepoint='05D6' name='afii57670'/> + <glyph codepoint='05D7' name='afii57671'/> + <glyph codepoint='05D8' name='afii57672'/> + <glyph codepoint='05D9' name='afii57673'/> + <glyph codepoint='05DA' name='afii57674'/> + <glyph codepoint='05DB' name='afii57675'/> + <glyph codepoint='05DC' name='afii57676'/> + <glyph codepoint='05DD' name='afii57677'/> + <glyph codepoint='05DE' name='afii57678'/> + <glyph codepoint='05DF' name='afii57679'/> + <glyph codepoint='05E0' name='afii57680'/> + <glyph codepoint='05E1' name='afii57681'/> + <glyph codepoint='05E2' name='afii57682'/> + <glyph codepoint='05E3' name='afii57683'/> + <glyph codepoint='05E4' name='afii57684'/> + <glyph codepoint='05E5' name='afii57685'/> + <glyph codepoint='05E6' name='afii57686'/> + <glyph codepoint='05E7' name='afii57687'/> + <glyph codepoint='05E8' name='afii57688'/> + <glyph codepoint='05E9' name='afii57689'/> + <glyph codepoint='05EA' name='afii57690'/> + <glyph codepoint='FB2A' name='afii57694'/> + <glyph codepoint='FB2B' name='afii57695'/> + <glyph codepoint='FB4B' name='afii57700'/> + <glyph codepoint='FB1F' name='afii57705'/> + <glyph codepoint='05F0' name='afii57716'/> + <glyph codepoint='05F1' name='afii57717'/> + <glyph codepoint='05F2' name='afii57718'/> + <glyph codepoint='FB35' name='afii57723'/> + <glyph codepoint='05B4' name='afii57793'/> + <glyph codepoint='05B5' name='afii57794'/> + <glyph codepoint='05B6' name='afii57795'/> + <glyph codepoint='05BB' name='afii57796'/> + <glyph codepoint='05B8' name='afii57797'/> + <glyph codepoint='05B7' name='afii57798'/> + <glyph codepoint='05B0' name='afii57799'/> + <glyph codepoint='05B2' name='afii57800'/> + <glyph codepoint='05B1' name='afii57801'/> + <glyph codepoint='05B3' name='afii57802'/> + <glyph codepoint='05C2' name='afii57803'/> + <glyph codepoint='05C1' name='afii57804'/> + <glyph codepoint='05B9' name='afii57806'/> + <glyph codepoint='05BC' name='afii57807'/> + <glyph codepoint='05BD' name='afii57839'/> + <glyph codepoint='05BF' name='afii57841'/> + <glyph codepoint='05C0' name='afii57842'/> + <glyph codepoint='02BC' name='afii57929'/> + <glyph codepoint='2105' name='afii61248'/> + <glyph codepoint='2113' name='afii61289'/> + <glyph codepoint='2116' name='afii61352'/> + <glyph codepoint='202C' name='afii61573'/> + <glyph codepoint='202D' name='afii61574'/> + <glyph codepoint='202E' name='afii61575'/> + <glyph codepoint='200C' name='afii61664'/> + <glyph codepoint='066D' name='afii63167'/> + <glyph codepoint='02BD' name='afii64937'/> + <glyph codepoint='00E0' name='agrave'/> + <glyph codepoint='2135' name='aleph'/> + <glyph codepoint='03B1' name='alpha'/> + <glyph codepoint='03AC' name='alphatonos'/> + <glyph codepoint='0101' name='amacron'/> + <glyph codepoint='0026' name='ampersand'/> + <glyph codepoint='F726' name='ampersandsmall'/> + <glyph codepoint='2220' name='angle'/> + <glyph codepoint='2329' name='angleleft'/> + <glyph codepoint='232A' name='angleright'/> + <glyph codepoint='0387' name='anoteleia'/> + <glyph codepoint='0105' name='aogonek'/> + <glyph codepoint='2248' name='approxequal'/> + <glyph codepoint='00E5' name='aring'/> + <glyph codepoint='01FB' name='aringacute'/> + <glyph codepoint='2194' name='arrowboth'/> + <glyph codepoint='21D4' name='arrowdblboth'/> + <glyph codepoint='21D3' name='arrowdbldown'/> + <glyph codepoint='21D0' name='arrowdblleft'/> + <glyph codepoint='21D2' name='arrowdblright'/> + <glyph codepoint='21D1' name='arrowdblup'/> + <glyph codepoint='2193' name='arrowdown'/> + <glyph codepoint='F8E7' name='arrowhorizex'/> + <glyph codepoint='2190' name='arrowleft'/> + <glyph codepoint='2192' name='arrowright'/> + <glyph codepoint='2191' name='arrowup'/> + <glyph codepoint='2195' name='arrowupdn'/> + <glyph codepoint='21A8' name='arrowupdnbse'/> + <glyph codepoint='F8E6' name='arrowvertex'/> + <glyph codepoint='005E' name='asciicircum'/> + <glyph codepoint='007E' name='asciitilde'/> + <glyph codepoint='002A' name='asterisk'/> + <glyph codepoint='2217' name='asteriskmath'/> + <glyph codepoint='F6E9' name='asuperior'/> + <glyph codepoint='0040' name='at'/> + <glyph codepoint='00E3' name='atilde'/> + <glyph codepoint='0062' name='b'/> + <glyph codepoint='005C' name='backslash'/> + <glyph codepoint='007C' name='bar'/> + <glyph codepoint='03B2' name='beta'/> + <glyph codepoint='2588' name='block'/> + <glyph codepoint='F8F4' name='braceex'/> + <glyph codepoint='007B' name='braceleft'/> + <glyph codepoint='F8F3' name='braceleftbt'/> + <glyph codepoint='F8F2' name='braceleftmid'/> + <glyph codepoint='F8F1' name='bracelefttp'/> + <glyph codepoint='007D' name='braceright'/> + <glyph codepoint='F8FE' name='bracerightbt'/> + <glyph codepoint='F8FD' name='bracerightmid'/> + <glyph codepoint='F8FC' name='bracerighttp'/> + <glyph codepoint='005B' name='bracketleft'/> + <glyph codepoint='F8F0' name='bracketleftbt'/> + <glyph codepoint='F8EF' name='bracketleftex'/> + <glyph codepoint='F8EE' name='bracketlefttp'/> + <glyph codepoint='005D' name='bracketright'/> + <glyph codepoint='F8FB' name='bracketrightbt'/> + <glyph codepoint='F8FA' name='bracketrightex'/> + <glyph codepoint='F8F9' name='bracketrighttp'/> + <glyph codepoint='02D8' name='breve'/> + <glyph codepoint='00A6' name='brokenbar'/> + <glyph codepoint='F6EA' name='bsuperior'/> + <glyph codepoint='2022' name='bullet'/> + <glyph codepoint='0063' name='c'/> + <glyph codepoint='0107' name='cacute'/> + <glyph codepoint='02C7' name='caron'/> + <glyph codepoint='21B5' name='carriagereturn'/> + <glyph codepoint='010D' name='ccaron'/> + <glyph codepoint='00E7' name='ccedilla'/> + <glyph codepoint='0109' name='ccircumflex'/> + <glyph codepoint='010B' name='cdotaccent'/> + <glyph codepoint='00B8' name='cedilla'/> + <glyph codepoint='00A2' name='cent'/> + <glyph codepoint='F6DF' name='centinferior'/> + <glyph codepoint='F7A2' name='centoldstyle'/> + <glyph codepoint='F6E0' name='centsuperior'/> + <glyph codepoint='03C7' name='chi'/> + <glyph codepoint='25CB' name='circle'/> + <glyph codepoint='2297' name='circlemultiply'/> + <glyph codepoint='2295' name='circleplus'/> + <glyph codepoint='02C6' name='circumflex'/> + <glyph codepoint='2663' name='club'/> + <glyph codepoint='003A' name='colon'/> + <glyph codepoint='20A1' name='colonmonetary'/> + <glyph codepoint='002C' name='comma'/> + <glyph codepoint='F6C3' name='commaaccent'/> + <glyph codepoint='F6E1' name='commainferior'/> + <glyph codepoint='F6E2' name='commasuperior'/> + <glyph codepoint='2245' name='congruent'/> + <glyph codepoint='00A9' name='copyright'/> + <glyph codepoint='F8E9' name='copyrightsans'/> + <glyph codepoint='F6D9' name='copyrightserif'/> + <glyph codepoint='00A4' name='currency'/> + <glyph codepoint='F6D1' name='cyrBreve'/> + <glyph codepoint='F6D2' name='cyrFlex'/> + <glyph codepoint='F6D4' name='cyrbreve'/> + <glyph codepoint='F6D5' name='cyrflex'/> + <glyph codepoint='0064' name='d'/> + <glyph codepoint='2020' name='dagger'/> + <glyph codepoint='2021' name='daggerdbl'/> + <glyph codepoint='F6D3' name='dblGrave'/> + <glyph codepoint='F6D6' name='dblgrave'/> + <glyph codepoint='010F' name='dcaron'/> + <glyph codepoint='0111' name='dcroat'/> + <glyph codepoint='00B0' name='degree'/> + <glyph codepoint='03B4' name='delta'/> + <glyph codepoint='2666' name='diamond'/> + <glyph codepoint='00A8' name='dieresis'/> + <glyph codepoint='F6D7' name='dieresisacute'/> + <glyph codepoint='F6D8' name='dieresisgrave'/> + <glyph codepoint='0385' name='dieresistonos'/> + <glyph codepoint='00F7' name='divide'/> + <glyph codepoint='2593' name='dkshade'/> + <glyph codepoint='2584' name='dnblock'/> + <glyph codepoint='0024' name='dollar'/> + <glyph codepoint='F6E3' name='dollarinferior'/> + <glyph codepoint='F724' name='dollaroldstyle'/> + <glyph codepoint='F6E4' name='dollarsuperior'/> + <glyph codepoint='20AB' name='dong'/> + <glyph codepoint='02D9' name='dotaccent'/> + <glyph codepoint='0323' name='dotbelowcomb'/> + <glyph codepoint='0131' name='dotlessi'/> + <glyph codepoint='F6BE' name='dotlessj'/> + <glyph codepoint='22C5' name='dotmath'/> + <glyph codepoint='F6EB' name='dsuperior'/> + <glyph codepoint='0065' name='e'/> + <glyph codepoint='00E9' name='eacute'/> + <glyph codepoint='0115' name='ebreve'/> + <glyph codepoint='011B' name='ecaron'/> + <glyph codepoint='00EA' name='ecircumflex'/> + <glyph codepoint='00EB' name='edieresis'/> + <glyph codepoint='0117' name='edotaccent'/> + <glyph codepoint='00E8' name='egrave'/> + <glyph codepoint='0038' name='eight'/> + <glyph codepoint='2088' name='eightinferior'/> + <glyph codepoint='F738' name='eightoldstyle'/> + <glyph codepoint='2078' name='eightsuperior'/> + <glyph codepoint='2208' name='element'/> + <glyph codepoint='2026' name='ellipsis'/> + <glyph codepoint='0113' name='emacron'/> + <glyph codepoint='2014' name='emdash'/> + <glyph codepoint='2205' name='emptyset'/> + <glyph codepoint='2013' name='endash'/> + <glyph codepoint='014B' name='eng'/> + <glyph codepoint='0119' name='eogonek'/> + <glyph codepoint='03B5' name='epsilon'/> + <glyph codepoint='03AD' name='epsilontonos'/> + <glyph codepoint='003D' name='equal'/> + <glyph codepoint='2261' name='equivalence'/> + <glyph codepoint='212E' name='estimated'/> + <glyph codepoint='F6EC' name='esuperior'/> + <glyph codepoint='03B7' name='eta'/> + <glyph codepoint='03AE' name='etatonos'/> + <glyph codepoint='00F0' name='eth'/> + <glyph codepoint='0021' name='exclam'/> + <glyph codepoint='203C' name='exclamdbl'/> + <glyph codepoint='00A1' name='exclamdown'/> + <glyph codepoint='F7A1' name='exclamdownsmall'/> + <glyph codepoint='F721' name='exclamsmall'/> + <glyph codepoint='2203' name='existential'/> + <glyph codepoint='0066' name='f'/> + <glyph codepoint='2640' name='female'/> + <glyph codepoint='FB00' name='ff'/> + <glyph codepoint='FB03' name='ffi'/> + <glyph codepoint='FB04' name='ffl'/> + <glyph codepoint='FB01' name='fi'/> + <glyph codepoint='2012' name='figuredash'/> + <glyph codepoint='25A0' name='filledbox'/> + <glyph codepoint='25AC' name='filledrect'/> + <glyph codepoint='0035' name='five'/> + <glyph codepoint='215D' name='fiveeighths'/> + <glyph codepoint='2085' name='fiveinferior'/> + <glyph codepoint='F735' name='fiveoldstyle'/> + <glyph codepoint='2075' name='fivesuperior'/> + <glyph codepoint='FB02' name='fl'/> + <glyph codepoint='0192' name='florin'/> + <glyph codepoint='0034' name='four'/> + <glyph codepoint='2084' name='fourinferior'/> + <glyph codepoint='F734' name='fouroldstyle'/> + <glyph codepoint='2074' name='foursuperior'/> + <glyph codepoint='2044' name='fraction'/> + <glyph codepoint='2215' name='fraction'/> + <glyph codepoint='20A3' name='franc'/> + <glyph codepoint='0067' name='g'/> + <glyph codepoint='03B3' name='gamma'/> + <glyph codepoint='011F' name='gbreve'/> + <glyph codepoint='01E7' name='gcaron'/> + <glyph codepoint='011D' name='gcircumflex'/> + <glyph codepoint='0123' name='gcommaaccent'/> + <glyph codepoint='0121' name='gdotaccent'/> + <glyph codepoint='00DF' name='germandbls'/> + <glyph codepoint='2207' name='gradient'/> + <glyph codepoint='0060' name='grave'/> + <glyph codepoint='0300' name='gravecomb'/> + <glyph codepoint='003E' name='greater'/> + <glyph codepoint='2265' name='greaterequal'/> + <glyph codepoint='00AB' name='guillemotleft'/> + <glyph codepoint='00BB' name='guillemotright'/> + <glyph codepoint='2039' name='guilsinglleft'/> + <glyph codepoint='203A' name='guilsinglright'/> + <glyph codepoint='0068' name='h'/> + <glyph codepoint='0127' name='hbar'/> + <glyph codepoint='0125' name='hcircumflex'/> + <glyph codepoint='2665' name='heart'/> + <glyph codepoint='0309' name='hookabovecomb'/> + <glyph codepoint='2302' name='house'/> + <glyph codepoint='02DD' name='hungarumlaut'/> + <glyph codepoint='002D' name='hyphen'/> + <glyph codepoint='00AD' name='hyphen'/> + <glyph codepoint='F6E5' name='hypheninferior'/> + <glyph codepoint='F6E6' name='hyphensuperior'/> + <glyph codepoint='0069' name='i'/> + <glyph codepoint='00ED' name='iacute'/> + <glyph codepoint='012D' name='ibreve'/> + <glyph codepoint='00EE' name='icircumflex'/> + <glyph codepoint='00EF' name='idieresis'/> + <glyph codepoint='00EC' name='igrave'/> + <glyph codepoint='0133' name='ij'/> + <glyph codepoint='012B' name='imacron'/> + <glyph codepoint='221E' name='infinity'/> + <glyph codepoint='222B' name='integral'/> + <glyph codepoint='2321' name='integralbt'/> + <glyph codepoint='F8F5' name='integralex'/> + <glyph codepoint='2320' name='integraltp'/> + <glyph codepoint='2229' name='intersection'/> + <glyph codepoint='25D8' name='invbullet'/> + <glyph codepoint='25D9' name='invcircle'/> + <glyph codepoint='263B' name='invsmileface'/> + <glyph codepoint='012F' name='iogonek'/> + <glyph codepoint='03B9' name='iota'/> + <glyph codepoint='03CA' name='iotadieresis'/> + <glyph codepoint='0390' name='iotadieresistonos'/> + <glyph codepoint='03AF' name='iotatonos'/> + <glyph codepoint='F6ED' name='isuperior'/> + <glyph codepoint='0129' name='itilde'/> + <glyph codepoint='006A' name='j'/> + <glyph codepoint='0135' name='jcircumflex'/> + <glyph codepoint='006B' name='k'/> + <glyph codepoint='03BA' name='kappa'/> + <glyph codepoint='0137' name='kcommaaccent'/> + <glyph codepoint='0138' name='kgreenlandic'/> + <glyph codepoint='006C' name='l'/> + <glyph codepoint='013A' name='lacute'/> + <glyph codepoint='03BB' name='lambda'/> + <glyph codepoint='013E' name='lcaron'/> + <glyph codepoint='013C' name='lcommaaccent'/> + <glyph codepoint='0140' name='ldot'/> + <glyph codepoint='003C' name='less'/> + <glyph codepoint='2264' name='lessequal'/> + <glyph codepoint='258C' name='lfblock'/> + <glyph codepoint='20A4' name='lira'/> + <glyph codepoint='F6C0' name='ll'/> + <glyph codepoint='2227' name='logicaland'/> + <glyph codepoint='00AC' name='logicalnot'/> + <glyph codepoint='2228' name='logicalor'/> + <glyph codepoint='017F' name='longs'/> + <glyph codepoint='25CA' name='lozenge'/> + <glyph codepoint='0142' name='lslash'/> + <glyph codepoint='F6EE' name='lsuperior'/> + <glyph codepoint='2591' name='ltshade'/> + <glyph codepoint='006D' name='m'/> + <glyph codepoint='00AF' name='macron'/> + <glyph codepoint='02C9' name='macron'/> + <glyph codepoint='2642' name='male'/> + <glyph codepoint='2212' name='minus'/> + <glyph codepoint='2032' name='minute'/> + <glyph codepoint='F6EF' name='msuperior'/> + <glyph codepoint='00B5' name='mu'/> + <glyph codepoint='03BC' name='mu'/> + <glyph codepoint='00D7' name='multiply'/> + <glyph codepoint='266A' name='musicalnote'/> + <glyph codepoint='266B' name='musicalnotedbl'/> + <glyph codepoint='006E' name='n'/> + <glyph codepoint='0144' name='nacute'/> + <glyph codepoint='0149' name='napostrophe'/> + <glyph codepoint='0148' name='ncaron'/> + <glyph codepoint='0146' name='ncommaaccent'/> + <glyph codepoint='0039' name='nine'/> + <glyph codepoint='2089' name='nineinferior'/> + <glyph codepoint='F739' name='nineoldstyle'/> + <glyph codepoint='2079' name='ninesuperior'/> + <glyph codepoint='2209' name='notelement'/> + <glyph codepoint='2260' name='notequal'/> + <glyph codepoint='2284' name='notsubset'/> + <glyph codepoint='207F' name='nsuperior'/> + <glyph codepoint='00F1' name='ntilde'/> + <glyph codepoint='03BD' name='nu'/> + <glyph codepoint='0023' name='numbersign'/> + <glyph codepoint='006F' name='o'/> + <glyph codepoint='00F3' name='oacute'/> + <glyph codepoint='014F' name='obreve'/> + <glyph codepoint='00F4' name='ocircumflex'/> + <glyph codepoint='00F6' name='odieresis'/> + <glyph codepoint='0153' name='oe'/> + <glyph codepoint='02DB' name='ogonek'/> + <glyph codepoint='00F2' name='ograve'/> + <glyph codepoint='01A1' name='ohorn'/> + <glyph codepoint='0151' name='ohungarumlaut'/> + <glyph codepoint='014D' name='omacron'/> + <glyph codepoint='03C9' name='omega'/> + <glyph codepoint='03D6' name='omega1'/> + <glyph codepoint='03CE' name='omegatonos'/> + <glyph codepoint='03BF' name='omicron'/> + <glyph codepoint='03CC' name='omicrontonos'/> + <glyph codepoint='0031' name='one'/> + <glyph codepoint='2024' name='onedotenleader'/> + <glyph codepoint='215B' name='oneeighth'/> + <glyph codepoint='F6DC' name='onefitted'/> + <glyph codepoint='00BD' name='onehalf'/> + <glyph codepoint='2081' name='oneinferior'/> + <glyph codepoint='F731' name='oneoldstyle'/> + <glyph codepoint='00BC' name='onequarter'/> + <glyph codepoint='00B9' name='onesuperior'/> + <glyph codepoint='2153' name='onethird'/> + <glyph codepoint='25E6' name='openbullet'/> + <glyph codepoint='00AA' name='ordfeminine'/> + <glyph codepoint='00BA' name='ordmasculine'/> + <glyph codepoint='221F' name='orthogonal'/> + <glyph codepoint='00F8' name='oslash'/> + <glyph codepoint='01FF' name='oslashacute'/> + <glyph codepoint='F6F0' name='osuperior'/> + <glyph codepoint='00F5' name='otilde'/> + <glyph codepoint='0070' name='p'/> + <glyph codepoint='00B6' name='paragraph'/> + <glyph codepoint='0028' name='parenleft'/> + <glyph codepoint='F8ED' name='parenleftbt'/> + <glyph codepoint='F8EC' name='parenleftex'/> + <glyph codepoint='208D' name='parenleftinferior'/> + <glyph codepoint='207D' name='parenleftsuperior'/> + <glyph codepoint='F8EB' name='parenlefttp'/> + <glyph codepoint='0029' name='parenright'/> + <glyph codepoint='F8F8' name='parenrightbt'/> + <glyph codepoint='F8F7' name='parenrightex'/> + <glyph codepoint='208E' name='parenrightinferior'/> + <glyph codepoint='207E' name='parenrightsuperior'/> + <glyph codepoint='F8F6' name='parenrighttp'/> + <glyph codepoint='2202' name='partialdiff'/> + <glyph codepoint='0025' name='percent'/> + <glyph codepoint='002E' name='period'/> + <glyph codepoint='00B7' name='periodcentered'/> + <glyph codepoint='2219' name='periodcentered'/> + <glyph codepoint='F6E7' name='periodinferior'/> + <glyph codepoint='F6E8' name='periodsuperior'/> + <glyph codepoint='22A5' name='perpendicular'/> + <glyph codepoint='2030' name='perthousand'/> + <glyph codepoint='20A7' name='peseta'/> + <glyph codepoint='03C6' name='phi'/> + <glyph codepoint='03D5' name='phi1'/> + <glyph codepoint='03C0' name='pi'/> + <glyph codepoint='002B' name='plus'/> + <glyph codepoint='00B1' name='plusminus'/> + <glyph codepoint='211E' name='prescription'/> + <glyph codepoint='220F' name='product'/> + <glyph codepoint='2282' name='propersubset'/> + <glyph codepoint='2283' name='propersuperset'/> + <glyph codepoint='221D' name='proportional'/> + <glyph codepoint='03C8' name='psi'/> + <glyph codepoint='0071' name='q'/> + <glyph codepoint='003F' name='question'/> + <glyph codepoint='00BF' name='questiondown'/> + <glyph codepoint='F7BF' name='questiondownsmall'/> + <glyph codepoint='F73F' name='questionsmall'/> + <glyph codepoint='0022' name='quotedbl'/> + <glyph codepoint='201E' name='quotedblbase'/> + <glyph codepoint='201C' name='quotedblleft'/> + <glyph codepoint='201D' name='quotedblright'/> + <glyph codepoint='2018' name='quoteleft'/> + <glyph codepoint='201B' name='quotereversed'/> + <glyph codepoint='2019' name='quoteright'/> + <glyph codepoint='201A' name='quotesinglbase'/> + <glyph codepoint='0027' name='quotesingle'/> + <glyph codepoint='0072' name='r'/> + <glyph codepoint='0155' name='racute'/> + <glyph codepoint='221A' name='radical'/> + <glyph codepoint='F8E5' name='radicalex'/> + <glyph codepoint='0159' name='rcaron'/> + <glyph codepoint='0157' name='rcommaaccent'/> + <glyph codepoint='2286' name='reflexsubset'/> + <glyph codepoint='2287' name='reflexsuperset'/> + <glyph codepoint='00AE' name='registered'/> + <glyph codepoint='F8E8' name='registersans'/> + <glyph codepoint='F6DA' name='registerserif'/> + <glyph codepoint='2310' name='revlogicalnot'/> + <glyph codepoint='03C1' name='rho'/> + <glyph codepoint='02DA' name='ring'/> + <glyph codepoint='F6F1' name='rsuperior'/> + <glyph codepoint='2590' name='rtblock'/> + <glyph codepoint='F6DD' name='rupiah'/> + <glyph codepoint='0073' name='s'/> + <glyph codepoint='015B' name='sacute'/> + <glyph codepoint='0161' name='scaron'/> + <glyph codepoint='015F' name='scedilla'/> + <glyph codepoint='F6C2' name='scedilla'/> + <glyph codepoint='015D' name='scircumflex'/> + <glyph codepoint='0219' name='scommaaccent'/> + <glyph codepoint='2033' name='second'/> + <glyph codepoint='00A7' name='section'/> + <glyph codepoint='003B' name='semicolon'/> + <glyph codepoint='0037' name='seven'/> + <glyph codepoint='215E' name='seveneighths'/> + <glyph codepoint='2087' name='seveninferior'/> + <glyph codepoint='F737' name='sevenoldstyle'/> + <glyph codepoint='2077' name='sevensuperior'/> + <glyph codepoint='2592' name='shade'/> + <glyph codepoint='03C3' name='sigma'/> + <glyph codepoint='03C2' name='sigma1'/> + <glyph codepoint='223C' name='similar'/> + <glyph codepoint='0036' name='six'/> + <glyph codepoint='2086' name='sixinferior'/> + <glyph codepoint='F736' name='sixoldstyle'/> + <glyph codepoint='2076' name='sixsuperior'/> + <glyph codepoint='002F' name='slash'/> + <glyph codepoint='263A' name='smileface'/> + <glyph codepoint='0020' name='space'/> + <glyph codepoint='00A0' name='space'/> + <glyph codepoint='2660' name='spade'/> + <glyph codepoint='F6F2' name='ssuperior'/> + <glyph codepoint='00A3' name='sterling'/> + <glyph codepoint='220B' name='suchthat'/> + <glyph codepoint='2211' name='summation'/> + <glyph codepoint='263C' name='sun'/> + <glyph codepoint='0074' name='t'/> + <glyph codepoint='03C4' name='tau'/> + <glyph codepoint='0167' name='tbar'/> + <glyph codepoint='0165' name='tcaron'/> + <glyph codepoint='0163' name='tcommaaccent'/> + <glyph codepoint='021B' name='tcommaaccent'/> + <glyph codepoint='2234' name='therefore'/> + <glyph codepoint='03B8' name='theta'/> + <glyph codepoint='03D1' name='theta1'/> + <glyph codepoint='00FE' name='thorn'/> + <glyph codepoint='0033' name='three'/> + <glyph codepoint='215C' name='threeeighths'/> + <glyph codepoint='2083' name='threeinferior'/> + <glyph codepoint='F733' name='threeoldstyle'/> + <glyph codepoint='00BE' name='threequarters'/> + <glyph codepoint='F6DE' name='threequartersemdash'/> + <glyph codepoint='00B3' name='threesuperior'/> + <glyph codepoint='02DC' name='tilde'/> + <glyph codepoint='0303' name='tildecomb'/> + <glyph codepoint='0384' name='tonos'/> + <glyph codepoint='2122' name='trademark'/> + <glyph codepoint='F8EA' name='trademarksans'/> + <glyph codepoint='F6DB' name='trademarkserif'/> + <glyph codepoint='25BC' name='triagdn'/> + <glyph codepoint='25C4' name='triaglf'/> + <glyph codepoint='25BA' name='triagrt'/> + <glyph codepoint='25B2' name='triagup'/> + <glyph codepoint='F6F3' name='tsuperior'/> + <glyph codepoint='0032' name='two'/> + <glyph codepoint='2025' name='twodotenleader'/> + <glyph codepoint='2082' name='twoinferior'/> + <glyph codepoint='F732' name='twooldstyle'/> + <glyph codepoint='00B2' name='twosuperior'/> + <glyph codepoint='2154' name='twothirds'/> + <glyph codepoint='0075' name='u'/> + <glyph codepoint='00FA' name='uacute'/> + <glyph codepoint='016D' name='ubreve'/> + <glyph codepoint='00FB' name='ucircumflex'/> + <glyph codepoint='00FC' name='udieresis'/> + <glyph codepoint='00F9' name='ugrave'/> + <glyph codepoint='01B0' name='uhorn'/> + <glyph codepoint='0171' name='uhungarumlaut'/> + <glyph codepoint='016B' name='umacron'/> + <glyph codepoint='005F' name='underscore'/> + <glyph codepoint='2017' name='underscoredbl'/> + <glyph codepoint='222A' name='union'/> + <glyph codepoint='2200' name='universal'/> + <glyph codepoint='0173' name='uogonek'/> + <glyph codepoint='2580' name='upblock'/> + <glyph codepoint='03C5' name='upsilon'/> + <glyph codepoint='03CB' name='upsilondieresis'/> + <glyph codepoint='03B0' name='upsilondieresistonos'/> + <glyph codepoint='03CD' name='upsilontonos'/> + <glyph codepoint='016F' name='uring'/> + <glyph codepoint='0169' name='utilde'/> + <glyph codepoint='0076' name='v'/> + <glyph codepoint='0077' name='w'/> + <glyph codepoint='1E83' name='wacute'/> + <glyph codepoint='0175' name='wcircumflex'/> + <glyph codepoint='1E85' name='wdieresis'/> + <glyph codepoint='2118' name='weierstrass'/> + <glyph codepoint='1E81' name='wgrave'/> + <glyph codepoint='0078' name='x'/> + <glyph codepoint='03BE' name='xi'/> + <glyph codepoint='0079' name='y'/> + <glyph codepoint='00FD' name='yacute'/> + <glyph codepoint='0177' name='ycircumflex'/> + <glyph codepoint='00FF' name='ydieresis'/> + <glyph codepoint='00A5' name='yen'/> + <glyph codepoint='1EF3' name='ygrave'/> + <glyph codepoint='007A' name='z'/> + <glyph codepoint='017A' name='zacute'/> + <glyph codepoint='017E' name='zcaron'/> + <glyph codepoint='017C' name='zdotaccent'/> + <glyph codepoint='0030' name='zero'/> + <glyph codepoint='2080' name='zeroinferior'/> + <glyph codepoint='F730' name='zerooldstyle'/> + <glyph codepoint='2070' name='zerosuperior'/> + <glyph codepoint='03B6' name='zeta'/> + </glyphlist> + + <!-- This encodes the Zapf Dingbats Glyph List, version 1.0 (17 July 1997) + located at http://partners.adobe.com/asn/developer/type/zapfdingbats.txt + --> + <glyphlist id='ZGL'> + <glyph codepoint='0020' name='space'/> + <glyph codepoint='00A0' name='space'/> + <glyph codepoint='2701' name='a1'/> + <glyph codepoint='2702' name='a2'/> + <glyph codepoint='2703' name='a202'/> + <glyph codepoint='2704' name='a3'/> + <glyph codepoint='260E' name='a4'/> + <glyph codepoint='2706' name='a5'/> + <glyph codepoint='2707' name='a119'/> + <glyph codepoint='2708' name='a118'/> + <glyph codepoint='2709' name='a117'/> + <glyph codepoint='261B' name='a11'/> + <glyph codepoint='261E' name='a12'/> + <glyph codepoint='270C' name='a13'/> + <glyph codepoint='270D' name='a14'/> + <glyph codepoint='270E' name='a15'/> + <glyph codepoint='270F' name='a16'/> + <glyph codepoint='2710' name='a105'/> + <glyph codepoint='2711' name='a17'/> + <glyph codepoint='2712' name='a18'/> + <glyph codepoint='2713' name='a19'/> + <glyph codepoint='2714' name='a20'/> + <glyph codepoint='2715' name='a21'/> + <glyph codepoint='2716' name='a22'/> + <glyph codepoint='2717' name='a23'/> + <glyph codepoint='2718' name='a24'/> + <glyph codepoint='2719' name='a25'/> + <glyph codepoint='271A' name='a26'/> + <glyph codepoint='271B' name='a27'/> + <glyph codepoint='271C' name='a28'/> + <glyph codepoint='271D' name='a6'/> + <glyph codepoint='271E' name='a7'/> + <glyph codepoint='271F' name='a8'/> + <glyph codepoint='2720' name='a9'/> + <glyph codepoint='2721' name='a10'/> + <glyph codepoint='2722' name='a29'/> + <glyph codepoint='2723' name='a30'/> + <glyph codepoint='2724' name='a31'/> + <glyph codepoint='2725' name='a32'/> + <glyph codepoint='2726' name='a33'/> + <glyph codepoint='2727' name='a34'/> + <glyph codepoint='2605' name='a35'/> + <glyph codepoint='2729' name='a36'/> + <glyph codepoint='272A' name='a37'/> + <glyph codepoint='272B' name='a38'/> + <glyph codepoint='272C' name='a39'/> + <glyph codepoint='272D' name='a40'/> + <glyph codepoint='272E' name='a41'/> + <glyph codepoint='272F' name='a42'/> + <glyph codepoint='2730' name='a43'/> + <glyph codepoint='2731' name='a44'/> + <glyph codepoint='2732' name='a45'/> + <glyph codepoint='2733' name='a46'/> + <glyph codepoint='2734' name='a47'/> + <glyph codepoint='2735' name='a48'/> + <glyph codepoint='2736' name='a49'/> + <glyph codepoint='2737' name='a50'/> + <glyph codepoint='2738' name='a51'/> + <glyph codepoint='2739' name='a52'/> + <glyph codepoint='273A' name='a53'/> + <glyph codepoint='273B' name='a54'/> + <glyph codepoint='273C' name='a55'/> + <glyph codepoint='273D' name='a56'/> + <glyph codepoint='273E' name='a57'/> + <glyph codepoint='273F' name='a58'/> + <glyph codepoint='2740' name='a59'/> + <glyph codepoint='2741' name='a60'/> + <glyph codepoint='2742' name='a61'/> + <glyph codepoint='2743' name='a62'/> + <glyph codepoint='2744' name='a63'/> + <glyph codepoint='2745' name='a64'/> + <glyph codepoint='2746' name='a65'/> + <glyph codepoint='2747' name='a66'/> + <glyph codepoint='2748' name='a67'/> + <glyph codepoint='2749' name='a68'/> + <glyph codepoint='274A' name='a69'/> + <glyph codepoint='274B' name='a70'/> + <glyph codepoint='25CF' name='a71'/> + <glyph codepoint='274D' name='a72'/> + <glyph codepoint='25A0' name='a73'/> + <glyph codepoint='274F' name='a74'/> + <glyph codepoint='2750' name='a203'/> + <glyph codepoint='2751' name='a75'/> + <glyph codepoint='2752' name='a204'/> + <glyph codepoint='25B2' name='a76'/> + <glyph codepoint='25BC' name='a77'/> + <glyph codepoint='25C6' name='a78'/> + <glyph codepoint='2756' name='a79'/> + <glyph codepoint='25D7' name='a81'/> + <glyph codepoint='2758' name='a82'/> + <glyph codepoint='2759' name='a83'/> + <glyph codepoint='275A' name='a84'/> + <glyph codepoint='275B' name='a97'/> + <glyph codepoint='275C' name='a98'/> + <glyph codepoint='275D' name='a99'/> + <glyph codepoint='275E' name='a100'/> + <glyph codepoint='F8D7' name='a89'/> + <glyph codepoint='F8D8' name='a90'/> + <glyph codepoint='F8D9' name='a93'/> + <glyph codepoint='F8DA' name='a94'/> + <glyph codepoint='F8DB' name='a91'/> + <glyph codepoint='F8DC' name='a92'/> + <glyph codepoint='F8DD' name='a205'/> + <glyph codepoint='F8DE' name='a85'/> + <glyph codepoint='F8DF' name='a206'/> + <glyph codepoint='F8E0' name='a86'/> + <glyph codepoint='F8E1' name='a87'/> + <glyph codepoint='F8E2' name='a88'/> + <glyph codepoint='F8E3' name='a95'/> + <glyph codepoint='F8E4' name='a96'/> + <glyph codepoint='2761' name='a101'/> + <glyph codepoint='2762' name='a102'/> + <glyph codepoint='2763' name='a103'/> + <glyph codepoint='2764' name='a104'/> + <glyph codepoint='2765' name='a106'/> + <glyph codepoint='2766' name='a107'/> + <glyph codepoint='2767' name='a108'/> + <glyph codepoint='2663' name='a112'/> + <glyph codepoint='2666' name='a111'/> + <glyph codepoint='2665' name='a110'/> + <glyph codepoint='2660' name='a109'/> + <glyph codepoint='2460' name='a120'/> + <glyph codepoint='2461' name='a121'/> + <glyph codepoint='2462' name='a122'/> + <glyph codepoint='2463' name='a123'/> + <glyph codepoint='2464' name='a124'/> + <glyph codepoint='2465' name='a125'/> + <glyph codepoint='2466' name='a126'/> + <glyph codepoint='2467' name='a127'/> + <glyph codepoint='2468' name='a128'/> + <glyph codepoint='2469' name='a129'/> + <glyph codepoint='2776' name='a130'/> + <glyph codepoint='2777' name='a131'/> + <glyph codepoint='2778' name='a132'/> + <glyph codepoint='2779' name='a133'/> + <glyph codepoint='277A' name='a134'/> + <glyph codepoint='277B' name='a135'/> + <glyph codepoint='277C' name='a136'/> + <glyph codepoint='277D' name='a137'/> + <glyph codepoint='277E' name='a138'/> + <glyph codepoint='277F' name='a139'/> + <glyph codepoint='2780' name='a140'/> + <glyph codepoint='2781' name='a141'/> + <glyph codepoint='2782' name='a142'/> + <glyph codepoint='2783' name='a143'/> + <glyph codepoint='2784' name='a144'/> + <glyph codepoint='2785' name='a145'/> + <glyph codepoint='2786' name='a146'/> + <glyph codepoint='2787' name='a147'/> + <glyph codepoint='2788' name='a148'/> + <glyph codepoint='2789' name='a149'/> + <glyph codepoint='278A' name='a150'/> + <glyph codepoint='278B' name='a151'/> + <glyph codepoint='278C' name='a152'/> + <glyph codepoint='278D' name='a153'/> + <glyph codepoint='278E' name='a154'/> + <glyph codepoint='278F' name='a155'/> + <glyph codepoint='2790' name='a156'/> + <glyph codepoint='2791' name='a157'/> + <glyph codepoint='2792' name='a158'/> + <glyph codepoint='2793' name='a159'/> + <glyph codepoint='2794' name='a160'/> + <glyph codepoint='2192' name='a161'/> + <glyph codepoint='2194' name='a163'/> + <glyph codepoint='2195' name='a164'/> + <glyph codepoint='2798' name='a196'/> + <glyph codepoint='2799' name='a165'/> + <glyph codepoint='279A' name='a192'/> + <glyph codepoint='279B' name='a166'/> + <glyph codepoint='279C' name='a167'/> + <glyph codepoint='279D' name='a168'/> + <glyph codepoint='279E' name='a169'/> + <glyph codepoint='279F' name='a170'/> + <glyph codepoint='27A0' name='a171'/> + <glyph codepoint='27A1' name='a172'/> + <glyph codepoint='27A2' name='a173'/> + <glyph codepoint='27A3' name='a162'/> + <glyph codepoint='27A4' name='a174'/> + <glyph codepoint='27A5' name='a175'/> + <glyph codepoint='27A6' name='a176'/> + <glyph codepoint='27A7' name='a177'/> + <glyph codepoint='27A8' name='a178'/> + <glyph codepoint='27A9' name='a179'/> + <glyph codepoint='27AA' name='a193'/> + <glyph codepoint='27AB' name='a180'/> + <glyph codepoint='27AC' name='a199'/> + <glyph codepoint='27AD' name='a181'/> + <glyph codepoint='27AE' name='a200'/> + <glyph codepoint='27AF' name='a182'/> + <glyph codepoint='27B1' name='a201'/> + <glyph codepoint='27B2' name='a183'/> + <glyph codepoint='27B3' name='a184'/> + <glyph codepoint='27B4' name='a197'/> + <glyph codepoint='27B5' name='a185'/> + <glyph codepoint='27B6' name='a194'/> + <glyph codepoint='27B7' name='a198'/> + <glyph codepoint='27B8' name='a186'/> + <glyph codepoint='27B9' name='a195'/> + <glyph codepoint='27BA' name='a187'/> + <glyph codepoint='27BB' name='a188'/> + <glyph codepoint='27BC' name='a189'/> + <glyph codepoint='27BD' name='a190'/> + <glyph codepoint='27BE' name='a191'/> + </glyphlist> +</glyphlist-set> diff --git a/src/org/apache/fop/fonts/TTFFile.java b/src/org/apache/fop/fonts/TTFFile.java index 7404c7c23..59360955b 100644 --- a/src/org/apache/fop/fonts/TTFFile.java +++ b/src/org/apache/fop/fonts/TTFFile.java @@ -224,29 +224,21 @@ public class TTFFile { // Also add winAnsiWidth - if (false) { - int d = j; - if (j > 127) - d = (int)org.apache.fop.render.pdf.CodePointMapping.map[j]; - if (d < ansiWidth.length) - ansiWidth[d] = mtx_tab[glyphIdx].wx; - } else { - ArrayList v = - (ArrayList)ansiIndex.get(new Integer(j)); - if (v != null) { - for (Iterator e = v.listIterator(); - e.hasNext(); ) { - Integer aIdx = - (Integer)e.next(); - ansiWidth[aIdx.intValue()] = - mtx_tab[glyphIdx].wx; - /* - * System.out.println("Added width "+ - * mtx_tab[glyphIdx].wx + - * " uni: " + j + - * " ansi: " + aIdx.intValue()); - */ - } + ArrayList v = + (ArrayList)ansiIndex.get(new Integer(j)); + if (v != null) { + for (Iterator e = v.listIterator(); + e.hasNext(); ) { + Integer aIdx = + (Integer)e.next(); + ansiWidth[aIdx.intValue()] = + mtx_tab[glyphIdx].wx; + /* + * System.out.println("Added width "+ + * mtx_tab[glyphIdx].wx + + * " uni: " + j + + * " ansi: " + aIdx.intValue()); + */ } } /* @@ -281,24 +273,15 @@ public class TTFFile { // Also add winAnsiWidth - if (false) { - int d = j; - if (j > 127) - d = (int)org.apache.fop.render.pdf.CodePointMapping.map[j]; - - if (d < ansiWidth.length) - ansiWidth[d] = mtx_tab[glyphIdx].wx; - } else { - ArrayList v = - (ArrayList)ansiIndex.get(new Integer(j)); - if (v != null) { - for (Iterator e = v.listIterator(); - e.hasNext(); ) { - Integer aIdx = - (Integer)e.next(); - ansiWidth[aIdx.intValue()] = - mtx_tab[glyphIdx].wx; - } + ArrayList v = + (ArrayList)ansiIndex.get(new Integer(j)); + if (v != null) { + for (Iterator e = v.listIterator(); + e.hasNext(); ) { + Integer aIdx = + (Integer)e.next(); + ansiWidth[aIdx.intValue()] = + mtx_tab[glyphIdx].wx; } } diff --git a/src/org/apache/fop/layout/FontState.java b/src/org/apache/fop/layout/FontState.java index fddd71087..147e1198d 100644 --- a/src/org/apache/fop/layout/FontState.java +++ b/src/org/apache/fop/layout/FontState.java @@ -11,6 +11,7 @@ import java.util.HashMap; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.properties.FontVariant; +import org.apache.fop.render.pdf.CodePointMapping; public class FontState { @@ -109,14 +110,12 @@ public class FontState { } // Use default CodePointMapping - if (c > 127) { - char d = org.apache.fop.render.pdf.CodePointMapping.map[c]; - if (d != 0) { - c = d; - } else { - c = '#'; - } - } + char d = CodePointMapping.getMapping("WinAnsiEncoding").mapChar(c); + if (d != 0) { + c = d; + } else { + c = '#'; + } return c; } diff --git a/src/org/apache/fop/render/pdf/Font.java b/src/org/apache/fop/render/pdf/Font.java index 760200b22..a4f00b24a 100644 --- a/src/org/apache/fop/render/pdf/Font.java +++ b/src/org/apache/fop/render/pdf/Font.java @@ -33,20 +33,9 @@ public abstract class Font implements FontMetric { } /** - * Provide a default mapping + * map a Unicode character to a code point in the font */ - public char mapChar(char c) { - // Use default CodePointMapping - if (c > 127) { - char d = org.apache.fop.render.pdf.CodePointMapping.map[c]; - if (d != 0) { - c = d; - } else { - c = '#'; - } - } - return c; - } + public abstract char mapChar(char c); public boolean isMultiByte() { return false; diff --git a/src/org/apache/fop/render/pdf/fonts/SingleByteFont.java b/src/org/apache/fop/render/pdf/fonts/SingleByteFont.java index 7200b92f7..b29ea9b8c 100644 --- a/src/org/apache/fop/render/pdf/fonts/SingleByteFont.java +++ b/src/org/apache/fop/render/pdf/fonts/SingleByteFont.java @@ -8,6 +8,7 @@ package org.apache.fop.render.pdf.fonts; import org.apache.fop.render.pdf.Font; +import org.apache.fop.render.pdf.CodePointMapping; import org.apache.fop.layout.FontDescriptor; import org.apache.fop.fonts.Glyphs; import org.apache.fop.pdf.PDFStream; @@ -24,6 +25,8 @@ import java.util.HashMap; public class SingleByteFont extends Font implements FontDescriptor { public String fontName = null; public String encoding = "WinAnsiEncoding"; + private final CodePointMapping mapping + = CodePointMapping.getMapping("WinAnsiEncoding"); public int capHeight = 0; public int xHeight = 0; @@ -237,5 +240,13 @@ public class SingleByteFont extends Font implements FontDescriptor { return arr; } + public char mapChar(char c) { + char d = mapping.mapChar(c); + if(d != 0) + return d; + else + return '#'; + } + } diff --git a/src/org/apache/fop/util/CharUtilities.java b/src/org/apache/fop/util/CharUtilities.java index 14187a5ea..7befd4656 100644 --- a/src/org/apache/fop/util/CharUtilities.java +++ b/src/org/apache/fop/util/CharUtilities.java @@ -47,51 +47,53 @@ public class CharUtilities { * versions of space that might not exists in the font. */ public static int getCharWidth(char c, FontState fs) { - int width = fs.width(fs.mapChar(c)); - if (width <= 0) { - // Estimate the width of spaces not represented in - // the font - int em = fs.width(fs.mapChar('m')); - int en = fs.width(fs.mapChar('n')); - if (em <= 0) - em = 500 * fs.getFontSize(); - if (en <= 0) - en = em - 10; + int width; - if (c == ' ') - width = em; - if (c == '\u2000') - width = en; - if (c == '\u2001') - width = em; - if (c == '\u2002') - width = em / 2; - if (c == '\u2003') - width = fs.getFontSize(); - if (c == '\u2004') - width = em / 3; - if (c == '\u2005') - width = em / 4; - if (c == '\u2006') - width = em / 6; - if (c == '\u2007') - width = getCharWidth(' ', fs); - if (c == '\u2008') - width = getCharWidth('.', fs); - if (c == '\u2009') - width = em / 5; - if (c == '\u200A') - width = 5; - if (c == '\u200B') - width = 100; - if (c == '\u00A0') - width = getCharWidth(' ', fs); - if (c == '\u202F') - width = getCharWidth(' ', fs) / 2; - if (c == '\u3000') - width = getCharWidth(' ', fs) * 2; - if ((c == '\n') || (c == '\r') || (c == '\t')) - width = getCharWidth(' ', fs); + if ((c == '\n') || (c == '\r') || (c == '\t') || (c == '\u00A0')) { + width = getCharWidth(' ', fs); + } else { + width = fs.width(fs.mapChar(c)); + if (width <= 0) { + // Estimate the width of spaces not represented in + // the font + int em = fs.width(fs.mapChar('m')); + int en = fs.width(fs.mapChar('n')); + if (em <= 0) + em = 500 * fs.getFontSize(); + if (en <= 0) + en = em - 10; + + if (c == ' ') + width = em; + if (c == '\u2000') + width = en; + if (c == '\u2001') + width = em; + if (c == '\u2002') + width = em / 2; + if (c == '\u2003') + width = fs.getFontSize(); + if (c == '\u2004') + width = em / 3; + if (c == '\u2005') + width = em / 4; + if (c == '\u2006') + width = em / 6; + if (c == '\u2007') + width = getCharWidth(' ', fs); + if (c == '\u2008') + width = getCharWidth('.', fs); + if (c == '\u2009') + width = em / 5; + if (c == '\u200A') + width = 5; + if (c == '\u200B') + width = 100; + if (c == '\u202F') + width = getCharWidth(' ', fs) / 2; + if (c == '\u3000') + width = getCharWidth(' ', fs) * 2; + } } return width; |