You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2002/06/28 09:52:54 UTC

cvs commit: xml-fop/src/org/apache/fop/util CharUtilities.java

keiron      2002/06/28 00:52:54

  Modified:    .        build.bat build.sh build.xml
               docs/examples/fo fonts.fo list.fo pdfoutline.fo readme.fo
               src/codegen Courier.xml CourierBold.xml
                        CourierBoldOblique.xml CourierOblique.xml
                        Helvetica.xml HelveticaBold.xml
                        HelveticaBoldOblique.xml HelveticaOblique.xml
                        Symbol.xml TimesBold.xml TimesBoldItalic.xml
                        TimesItalic.xml TimesRoman.xml ZapfDingbats.xml
                        code-point-mapping.xsl font-file.xsl
               src/org/apache/fop/fonts TTFFile.java
               src/org/apache/fop/layout FontState.java
               src/org/apache/fop/render/pdf Font.java
               src/org/apache/fop/render/pdf/fonts SingleByteFont.java
               src/org/apache/fop/util CharUtilities.java
  Added:       lib      xalan-2.3.1.LICENSE.txt xalan-2.3.1.jar
                        xml-apis.jar
               src/codegen encodings.xml glyphlist.xml
  Removed:     lib      xalan-2.2D11.LICENSE.txt xalan-2.2D11.jar
  Log:
  proper use of font encodings for native fonts
  updated xalan
  Submitted by:	Rainer Garus <ra...@arcor.de>
  
  Revision  Changes    Path
  1.17      +1 -1      xml-fop/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.bat,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.bat	11 Apr 2002 09:33:21 -0000	1.16
  +++ build.bat	28 Jun 2002 07:52:51 -0000	1.17
  @@ -6,7 +6,7 @@
   if "%JAVA_HOME%" == "" goto error
   
   set LIBDIR=lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.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%
  
  
  
  1.18      +1 -1      xml-fop/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.sh,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.sh	11 Apr 2002 09:33:23 -0000	1.17
  +++ build.sh	28 Jun 2002 07:52:51 -0000	1.18
  @@ -13,7 +13,7 @@
     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
  
  
  
  1.54      +15 -17    xml-fop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- build.xml	11 Apr 2002 09:33:24 -0000	1.53
  +++ build.xml	28 Jun 2002 07:52:51 -0000	1.54
  @@ -186,6 +186,8 @@
       <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 @@
       <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 @@
       <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: 
  
  
  
  1.9       +124 -6    xml-fop/docs/examples/fo/fonts.fo
  
  Index: fonts.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/fo/fonts.fo,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- fonts.fo	11 Dec 2001 12:08:28 -0000	1.8
  +++ fonts.fo	28 Jun 2002 07:52:51 -0000	1.9
  @@ -27,36 +27,154 @@
   Helvetica
     </fo:block>
     <fo:block space-after.optimum="10pt" font-family="Helvetica">
  -&#33; &#34; &#35; &#36; &#37; &#38; &#39; &#40; &#41; &#42; &#43; &#44; &#45; &#46; &#47; &#48; &#49; &#50; &#51; &#52; &#53; &#54; &#55; &#56; &#57; &#58; &#59; &#60; &#61; &#62; &#63; &#64; &#65; &#66; &#67; &#68; &#69; &#70; &#71; &#72; &#73; &#74; &#75; &#76; &#77; &#78; &#79; &#80; &#81; &#82; &#83; &#84; &#85; &#86; &#87; &#88; &#89; &#90; &#91; &#92; &#93; &#94; &#95; &#96; &#97; &#98; &#99; &#100; &#101; &#102; &#103; &#104; &#105; &#106; &#107; &#108; &#109; &#110; &#111; &#112; &#113; &#114; &#115; &#116; &#117; &#118; &#119; &#120; &#121; &#122; &#123; &#124; &#125; &#126; &#127;  &#160; &#161; &#162; &#163; &#164; &#165; &#166; &#167; &#168; &#169; &#170; &#171; &#172; &#174; &#175; &#176; &#177; &#178; &#179; &#180; &#181; &#182; &#183; &#184; &#185; &#186; &#187; &#188; &#189; &#190; &#191; &#192; &#193; &#194; &#195; &#196; &#197; &#198; &#199; &#200; &#201; &#202; &#203; &#204; &#205; &#206; &#207; &#208; &#209; &#210; &#211; &#212; &#213; &#214; &#215; &#216; &#217; &#218; &#219; &#220; &#221; &#222; &#223; &#224; &#225; &#226; &#227; &#228; &#229; &#230; &#231; &#232; &#233; &#234; &#235; &#236; &#237; &#238; &#239; &#240; &#241; &#242; &#243; &#244; &#245; &#246; &#247; &#248; &#249; &#250; &#251; &#252; &#253; &#254;
  +&#x21; &#x22; &#x23; &#x24; &#x25; &#x26; &#x27; &#x28; &#x29; &#x2A;
  +&#x2B; &#x2C; &#x2D; &#x2E; &#x2F; &#x30; &#x31; &#x32; &#x33; &#x34;
  +&#x35; &#x36; &#x37; &#x38; &#x39; &#x3A; &#x3B; &#x3C; &#x3D; &#x3E;
  +&#x3F; &#x40; &#x41; &#x42; &#x43; &#x44; &#x45; &#x46; &#x47; &#x48;
  +&#x49; &#x4A; &#x4B; &#x4C; &#x4D; &#x4E; &#x4F; &#x50; &#x51; &#x52;
  +&#x53; &#x54; &#x55; &#x56; &#x57; &#x58; &#x59; &#x5A; &#x5B; &#x5C;
  +&#x5D; &#x5E; &#x5F; &#x60; &#x61; &#x62; &#x63; &#x64; &#x65; &#x66;
  +&#x67; &#x68; &#x69; &#x6A; &#x6B; &#x6C; &#x6D; &#x6E; &#x6F; &#x70;
  +&#x71; &#x72; &#x73; &#x74; &#x75; &#x76; &#x77; &#x78; &#x79; &#x7A;
  +&#x7B; &#x7C; &#x7D; &#x7E; &#xA1; &#xA2; &#xA3; &#xA4; &#xA5; &#xA6;
  +&#xA7; &#xA8; &#xA9; &#xAA; &#xAB; &#xAC; &#xAE; &#xAF; &#xB0; &#xB1;
  +&#xB2; &#xB3; &#xB4; &#xB5; &#xB6; &#xB7; &#xB8; &#xB9; &#xBA; &#xBB;
  +&#xBC; &#xBD; &#xBE; &#xBF; &#xC0; &#xC1; &#xC2; &#xC3; &#xC4; &#xC5;
  +&#xC6; &#xC7; &#xC8; &#xC9; &#xCA; &#xCB; &#xCC; &#xCD; &#xCE; &#xCF;
  +&#xD0; &#xD1; &#xD2; &#xD3; &#xD4; &#xD5; &#xD6; &#xD7; &#xD8; &#xD9;
  +&#xDA; &#xDB; &#xDC; &#xDD; &#xDE; &#xDF; &#xE0; &#xE1; &#xE2; &#xE3;
  +&#xE4; &#xE5; &#xE6; &#xE7; &#xE8; &#xE9; &#xEA; &#xEB; &#xEC; &#xED;
  +&#xEE; &#xEF; &#xF0; &#xF1; &#xF2; &#xF3; &#xF4; &#xF5; &#xF6; &#xF7;
  +&#xF8; &#xF9; &#xFA; &#xFB; &#xFC; &#xFD; &#xFE; &#xFF;
  +&#x0152; &#x0153; &#x0160; &#x0161; &#x0178;
  +&#x017D; &#x017E; &#x0192; &#x02DC; &#x2013; &#x2014; &#x2018;
  +&#x2019; &#x201A; &#x201C; &#x201D; &#x201E; &#x2020; &#x2021;
  +&#x2022; &#x2026; &#x2030; &#x2039; &#x203A; &#x2122;
     </fo:block>
   
     <fo:block font-family="Helvetica"  font-size="14pt">
   Times Roman
     </fo:block>
     <fo:block space-after.optimum="10pt" font-family="Times Roman">
  -&#33; &#34; &#35; &#36; &#37; &#38; &#39; &#40; &#41; &#42; &#43; &#44; &#45; &#46; &#47; &#48; &#49; &#50; &#51; &#52; &#53; &#54; &#55; &#56; &#57; &#58; &#59; &#60; &#61; &#62; &#63; &#64; &#65; &#66; &#67; &#68; &#69; &#70; &#71; &#72; &#73; &#74; &#75; &#76; &#77; &#78; &#79; &#80; &#81; &#82; &#83; &#84; &#85; &#86; &#87; &#88; &#89; &#90; &#91; &#92; &#93; &#94; &#95; &#96; &#97; &#98; &#99; &#100; &#101; &#102; &#103; &#104; &#105; &#106; &#107; &#108; &#109; &#110; &#111; &#112; &#113; &#114; &#115; &#116; &#117; &#118; &#119; &#120; &#121; &#122; &#123; &#124; &#125; &#126; &#127; &#160; &#161; &#162; &#163; &#164; &#165; &#166; &#167; &#168; &#169; &#170; &#171; &#172; &#174; &#175; &#176; &#177; &#178; &#179; &#180; &#181; &#182; &#183; &#184; &#185; &#186; &#187; &#188; &#189; &#190; &#191; &#192; &#193; &#194; &#195; &#196; &#197; &#198; &#199; &#200; &#201; &#202; &#203; &#204; &#205; &#206; &#207; &#208; &#209; &#210; &#211; &#212; &#213; &#214; &#215; &#216; &#217; &#218; &#219; &#220; &#221; &#222; &#223; &#224; &#225; &#226; &#227; &#228; &#229; &#230; &#231; &#232; &#233; &#234; &#235; &#236; &#237; &#238; &#239; &#240; &#241; &#242; &#243; &#244; &#245; &#246; &#247; &#248; &#249; &#250; &#251; &#252; &#253; &#254; 
  +&#x21; &#x22; &#x23; &#x24; &#x25; &#x26; &#x27; &#x28; &#x29; &#x2A;
  +&#x2B; &#x2C; &#x2D; &#x2E; &#x2F; &#x30; &#x31; &#x32; &#x33; &#x34;
  +&#x35; &#x36; &#x37; &#x38; &#x39; &#x3A; &#x3B; &#x3C; &#x3D; &#x3E;
  +&#x3F; &#x40; &#x41; &#x42; &#x43; &#x44; &#x45; &#x46; &#x47; &#x48;
  +&#x49; &#x4A; &#x4B; &#x4C; &#x4D; &#x4E; &#x4F; &#x50; &#x51; &#x52;
  +&#x53; &#x54; &#x55; &#x56; &#x57; &#x58; &#x59; &#x5A; &#x5B; &#x5C;
  +&#x5D; &#x5E; &#x5F; &#x60; &#x61; &#x62; &#x63; &#x64; &#x65; &#x66;
  +&#x67; &#x68; &#x69; &#x6A; &#x6B; &#x6C; &#x6D; &#x6E; &#x6F; &#x70;
  +&#x71; &#x72; &#x73; &#x74; &#x75; &#x76; &#x77; &#x78; &#x79; &#x7A;
  +&#x7B; &#x7C; &#x7D; &#x7E; &#xA1; &#xA2; &#xA3; &#xA4; &#xA5; &#xA6;
  +&#xA7; &#xA8; &#xA9; &#xAA; &#xAB; &#xAC; &#xAE; &#xAF; &#xB0; &#xB1;
  +&#xB2; &#xB3; &#xB4; &#xB5; &#xB6; &#xB7; &#xB8; &#xB9; &#xBA; &#xBB;
  +&#xBC; &#xBD; &#xBE; &#xBF; &#xC0; &#xC1; &#xC2; &#xC3; &#xC4; &#xC5;
  +&#xC6; &#xC7; &#xC8; &#xC9; &#xCA; &#xCB; &#xCC; &#xCD; &#xCE; &#xCF;
  +&#xD0; &#xD1; &#xD2; &#xD3; &#xD4; &#xD5; &#xD6; &#xD7; &#xD8; &#xD9;
  +&#xDA; &#xDB; &#xDC; &#xDD; &#xDE; &#xDF; &#xE0; &#xE1; &#xE2; &#xE3;
  +&#xE4; &#xE5; &#xE6; &#xE7; &#xE8; &#xE9; &#xEA; &#xEB; &#xEC; &#xED;
  +&#xEE; &#xEF; &#xF0; &#xF1; &#xF2; &#xF3; &#xF4; &#xF5; &#xF6; &#xF7;
  +&#xF8; &#xF9; &#xFA; &#xFB; &#xFC; &#xFD; &#xFE; &#xFF; &#x0152;
  +&#x0153; &#x0160; &#x0161; &#x0178; &#x017D; &#x017E; &#x0192;
  +&#x02DC; &#x2013; &#x2014; &#x2018; &#x2019; &#x201A;
  +&#x201C; &#x201D; &#x201E; &#x2020; &#x2021; &#x2022; &#x2026;
  +&#x2030; &#x2039; &#x203A; &#x2122;
     </fo:block>
   
     <fo:block font-family="Helvetica"  font-size="14pt">
   Courier
     </fo:block>
     <fo:block space-after.optimum="10pt" font-family="Courier">
  -&#33; &#34; &#35; &#36; &#37; &#38; &#39; &#40; &#41; &#42; &#43; &#44; &#45; &#46; &#47; &#48; &#49; &#50; &#51; &#52; &#53; &#54; &#55; &#56; &#57; &#58; &#59; &#60; &#61; &#62; &#63; &#64; &#65; &#66; &#67; &#68; &#69; &#70; &#71; &#72; &#73; &#74; &#75; &#76; &#77; &#78; &#79; &#80; &#81; &#82; &#83; &#84; &#85; &#86; &#87; &#88; &#89; &#90; &#91; &#92; &#93; &#94; &#95; &#96; &#97; &#98; &#99; &#100; &#101; &#102; &#103; &#104; &#105; &#106; &#107; &#108; &#109; &#110; &#111; &#112; &#113; &#114; &#115; &#116; &#117; &#118; &#119; &#120; &#121; &#122; &#123; &#124; &#125; &#126; &#127;  &#160; &#161; &#162; &#163; &#164; &#165; &#166; &#167; &#168; &#169; &#170; &#171; &#172; &#174; &#175; &#176; &#177; &#178; &#179; &#180; &#181; &#182; &#183; &#184; &#185; &#186; &#187; &#188; &#189; &#190; &#191; &#192; &#193; &#194; &#195; &#196; &#197; &#198; &#199; &#200; &#201; &#202; &#203; &#204; &#205; &#206; &#207; &#208; &#209; &#210; &#211; &#212; &#213; &#214; &#215; &#216; &#217; &#218; &#219; &#220; &#221; &#222; &#223; &#224; &#225; &#226; &#227; &#228; &#229; &#230; &#231; &#232; &#233; &#234; &#235; &#236; &#237; &#238; &#239; &#240; &#241; &#242; &#243; &#244; &#245; &#246; &#247; &#248; &#249; &#250; &#251; &#252; &#253; &#254; 
  +&#x21; &#x22; &#x23; &#x24; &#x25; &#x26; &#x27; &#x28; &#x29; &#x2A;
  +&#x2B; &#x2C; &#x2D; &#x2E; &#x2F; &#x30; &#x31; &#x32; &#x33; &#x34;
  +&#x35; &#x36; &#x37; &#x38; &#x39; &#x3A; &#x3B; &#x3C; &#x3D; &#x3E;
  +&#x3F; &#x40; &#x41; &#x42; &#x43; &#x44; &#x45; &#x46; &#x47; &#x48;
  +&#x49; &#x4A; &#x4B; &#x4C; &#x4D; &#x4E; &#x4F; &#x50; &#x51; &#x52;
  +&#x53; &#x54; &#x55; &#x56; &#x57; &#x58; &#x59; &#x5A; &#x5B; &#x5C;
  +&#x5D; &#x5E; &#x5F; &#x60; &#x61; &#x62; &#x63; &#x64; &#x65; &#x66;
  +&#x67; &#x68; &#x69; &#x6A; &#x6B; &#x6C; &#x6D; &#x6E; &#x6F; &#x70;
  +&#x71; &#x72; &#x73; &#x74; &#x75; &#x76; &#x77; &#x78; &#x79; &#x7A;
  +&#x7B; &#x7C; &#x7D; &#x7E; &#xA1; &#xA2; &#xA3; &#xA4; &#xA5; &#xA6;
  +&#xA7; &#xA8; &#xA9; &#xAA; &#xAB; &#xAC; &#xAE; &#xAF; &#xB0; &#xB1;
  +&#xB2; &#xB3; &#xB4; &#xB5; &#xB6; &#xB7; &#xB8; &#xB9; &#xBA; &#xBB;
  +&#xBC; &#xBD; &#xBE; &#xBF; &#xC0; &#xC1; &#xC2; &#xC3; &#xC4; &#xC5;
  +&#xC6; &#xC7; &#xC8; &#xC9; &#xCA; &#xCB; &#xCC; &#xCD; &#xCE; &#xCF;
  +&#xD0; &#xD1; &#xD2; &#xD3; &#xD4; &#xD5; &#xD6; &#xD7; &#xD8; &#xD9;
  +&#xDA; &#xDB; &#xDC; &#xDD; &#xDE; &#xDF; &#xE0; &#xE1; &#xE2; &#xE3;
  +&#xE4; &#xE5; &#xE6; &#xE7; &#xE8; &#xE9; &#xEA; &#xEB; &#xEC; &#xED;
  +&#xEE; &#xEF; &#xF0; &#xF1; &#xF2; &#xF3; &#xF4; &#xF5; &#xF6; &#xF7;
  +&#xF8; &#xF9; &#xFA; &#xFB; &#xFC; &#xFD; &#xFE; &#xFF; &#x0152;
  +&#x0153; &#x0160; &#x0161; &#x0178; &#x017D;
  +&#x017E; &#x0192; &#x02DC; &#x2013; &#x2014; &#x2018;
  +&#x2019; &#x201A; &#x201C; &#x201D; &#x201E; &#x2020; &#x2021;
  +&#x2022; &#x2026; &#x2030; &#x2039; &#x203A; &#x2122;
     </fo:block>
   
     <fo:block font-family="Helvetica"  font-size="14pt">
    ZapfDingbats:   
     </fo:block>
     <fo:block space-after.optimum="10pt" font-family="ZapfDingbats">
  -&#33; &#34; &#35; &#36; &#37; &#38; &#39; &#40; &#41; &#42; &#43; &#44; &#45; &#46; &#47; &#48; &#49; &#50; &#51; &#52; &#53; &#54; &#55; &#56; &#57; &#58; &#59; &#60; &#61; &#62; &#63; &#64; &#65; &#66; &#67; &#68; &#69; &#70; &#71; &#72; &#73; &#74; &#75; &#76; &#77; &#78; &#79; &#80; &#81; &#82; &#83; &#84; &#85; &#86; &#87; &#88; &#89; &#90; &#91; &#92; &#93; &#94; &#95; &#96; &#97; &#98; &#99; &#100; &#101; &#102; &#103; &#104; &#105; &#106; &#107; &#108; &#109; &#110; &#111; &#112; &#113; &#114; &#115; &#116; &#117; &#118; &#119; &#120; &#121; &#122; &#123; &#124; &#125; &#126; &#127;  &#160; &#161; &#162; &#163; &#164; &#165; &#166; &#167; &#168; &#169; &#170; &#171; &#172; &#174; &#175; &#176; &#177; &#178; &#179; &#180; &#181; &#182; &#183; &#184; &#185; &#186; &#187; &#188; &#189; &#190; &#191; &#192; &#193; &#194; &#195; &#196; &#197; &#198; &#199; &#200; &#201; &#202; &#203; &#204; &#205; &#206; &#207; &#208; &#209; &#210; &#211; &#212; &#213; &#214; &#215; &#216; &#217; &#218; &#219; &#220; &#221; &#222; &#223; &#224; &#225; &#226; &#227; &#228; &#229; &#230; &#231; &#232; &#233; &#234; &#235; &#236; &#237; &#238; &#239; &#240; &#241; &#242; &#243; &#244; &#245; &#246; &#247; &#248; &#249; &#250; &#251; &#252; &#253; &#254; 
  +&#x2701; &#x2702; &#x2703; &#x2704; &#x260E; &#x2706; &#x2707;
  +&#x2708; &#x2709; &#x261B; &#x261E; &#x270C; &#x270D; &#x270E;
  +&#x270F; &#x2710; &#x2711; &#x2712; &#x2713; &#x2714; &#x2715;
  +&#x2716; &#x2717; &#x2718; &#x2719; &#x271A; &#x271B; &#x271C;
  +&#x271D; &#x271E; &#x271F; &#x2720; &#x2721; &#x2722; &#x2723;
  +&#x2724; &#x2725; &#x2726; &#x2727; &#x2605; &#x2729; &#x272A;
  +&#x272B; &#x272C; &#x272D; &#x272E; &#x272F; &#x2730; &#x2731;
  +&#x2732; &#x2733; &#x2734; &#x2735; &#x2736; &#x2737; &#x2738;
  +&#x2739; &#x273A; &#x273B; &#x273C; &#x273D; &#x273E; &#x273F;
  +&#x2740; &#x2741; &#x2742; &#x2743; &#x2744; &#x2745; &#x2746;
  +&#x2747; &#x2748; &#x2749; &#x274A; &#x274B; &#x25CF; &#x274D;
  +&#x25A0; &#x274F; &#x2750; &#x2751; &#x2752; &#x25B2; &#x25BC;
  +&#x25C6; &#x2756; &#x25D7; &#x2758; &#x2759; &#x275A; &#x275B;
  +&#x275C; &#x275D; &#x275E; &#x2761; &#x2762; &#x2763; &#x2764;
  +&#x2765; &#x2766; &#x2767; &#x2663; &#x2666; &#x2665; &#x2660;
  +&#x2460; &#x2461; &#x2462; &#x2463; &#x2464; &#x2465; &#x2466;
  +&#x2467; &#x2468; &#x2469; &#x2776; &#x2777; &#x2778; &#x2779;
  +&#x277A; &#x277B; &#x277C; &#x277D; &#x277E; &#x277F; &#x2780;
  +&#x2781; &#x2782; &#x2783; &#x2784; &#x2785; &#x2786; &#x2787;
  +&#x2788; &#x2789; &#x278A; &#x278B; &#x278C; &#x278D; &#x278E;
  +&#x278F; &#x2790; &#x2791; &#x2792; &#x2793; &#x2794; &#x2192;
  +&#x2194; &#x2195; &#x2798; &#x2799; &#x279A; &#x279B; &#x279C;
  +&#x279D; &#x279E; &#x279F; &#x27A0; &#x27A1; &#x27A2; &#x27A3;
  +&#x27A4; &#x27A5; &#x27A6; &#x27A7; &#x27A8; &#x27A9; &#x27AA;
  +&#x27AB; &#x27AC; &#x27AD; &#x27AE; &#x27AF; &#x27B1; &#x27B2;
  +&#x27B3; &#x27B4; &#x27B5; &#x27B6; &#x27B7; &#x27B8; &#x27B9;
  +&#x27BA; &#x27BB; &#x27BC; &#x27BD; &#x27BE; &#xF8E0; &#xF8DE;
  +&#xF8E3; &#xF8DD; &#xF8D7; &#xF8E1; &#xF8DB; &#xF8D8; &#xF8DF;
  +&#xF8DA; &#xF8D9; &#xF8DC; &#xF8E4; &#xF8E2;
     </fo:block>
   
  -
     <fo:block font-family="Helvetica"  font-size="14pt">
    Symbol:
     </fo:block>
     <fo:block space-after.optimum="10pt" font-family="Symbol">
  -&#33; &#34; &#35; &#36; &#37; &#38; &#39; &#40; &#41; &#42; &#43; &#44; &#45; &#46; &#47; &#48; &#49; &#50; &#51; &#52; &#53; &#54; &#55; &#56; &#57; &#58; &#59; &#60; &#61; &#62; &#63; &#64; &#65; &#66; &#67; &#68; &#69; &#70; &#71; &#72; &#73; &#74; &#75; &#76; &#77; &#78; &#79; &#80; &#81; &#82; &#83; &#84; &#85; &#86; &#87; &#88; &#89; &#90; &#91; &#92; &#93; &#94; &#95; &#96; &#97; &#98; &#99; &#100; &#101; &#102; &#103; &#104; &#105; &#106; &#107; &#108; &#109; &#110; &#111; &#112; &#113; &#114; &#115; &#116; &#117; &#118; &#119; &#120; &#121; &#122; &#123; &#124; &#125; &#126; &#127;  &#160; &#161; &#162; &#163; &#164; &#165; &#166; &#167; &#168; &#169; &#170; &#171; &#172; &#174; &#175; &#176; &#177; &#178; &#179; &#180; &#181; &#182; &#183; &#184; &#185; &#186; &#187; &#188; &#189; &#190; &#191; &#192; &#193; &#194; &#195; &#196; &#197; &#198; &#199; &#200; &#201; &#202; &#203; &#204; &#205; &#206; &#207; &#208; &#209; &#210; &#211; &#212; &#213; &#214; &#215; &#216; &#217; &#218; &#219; &#220; &#221; &#222; &#223; &#224; &#225; &#226; &#227; &#228; &#229; &#230; &#231; &#232; &#233; &#234; &#235; &#236; &#237; &#238; &#239; &#240; &#241; &#242; &#243; &#244; &#245; &#246; &#247; &#248; &#249; &#250; &#251; &#252; &#253; &#254; 
  +&#x21; &#x23; &#x25; &#x26; &#x28; &#x29; &#x2B; &#x2C; &#x2E; &#x2F;
  +&#x30; &#x31; &#x32; &#x33; &#x34; &#x35; &#x36; &#x37; &#x38; &#x39;
  +&#x3A; &#x3B; &#x3C; &#x3D; &#x3E; &#x3F; &#x5B; &#x5D; &#x5F; &#x6D;
  +&#x7B; &#x7C; &#x7D; &#xAC; &#xB0; &#xB1; &#xB5; &#xD7; &#xF7;
  +&#x0192; &#x0391; &#x0392; &#x0393; &#x0395; &#x0396; &#x0397;
  +&#x0398; &#x0399; &#x039A; &#x039B; &#x039C; &#x039D; &#x039E;
  +&#x039F; &#x03A0; &#x03A1; &#x03A3; &#x03A4; &#x03A5; &#x03A6;
  +&#x03A7; &#x03A8; &#x03B1; &#x03B2; &#x03B3; &#x03B4; &#x03B5;
  +&#x03B6; &#x03B7; &#x03B8; &#x03B9; &#x03BA; &#x03BB; &#x03BD;
  +&#x03BE; &#x03BF; &#x03C0; &#x03C1; &#x03C2; &#x03C3; &#x03C4;
  +&#x03C5; &#x03C6; &#x03C7; &#x03C8; &#x03C9; &#x03D1; &#x03D2;
  +&#x03D5; &#x03D6; &#x2022; &#x2026; &#x2032; &#x2033; &#x2044;
  +&#x2111; &#x2118; &#x211C; &#x2126; &#x2135; &#x2190; &#x2191;
  +&#x2192; &#x2193; &#x2194; &#x21B5; &#x21D0; &#x21D1; &#x21D2;
  +&#x21D3; &#x21D4; &#x2200; &#x2202; &#x2203; &#x2205; &#x2206;
  +&#x2207; &#x2208; &#x2209; &#x220B; &#x220F; &#x2211; &#x2212;
  +&#x2217; &#x221A; &#x221D; &#x221E; &#x2220; &#x2227; &#x2228;
  +&#x2229; &#x222A; &#x222B; &#x2234; &#x223C; &#x2245; &#x2248;
  +&#x2260; &#x2261; &#x2264; &#x2265; &#x2282; &#x2283; &#x2284;
  +&#x2286; &#x2287; &#x2295; &#x2297; &#x22A5; &#x22C5; &#x2320;
  +&#x2321; &#x2329; &#x232A; &#x25CA; &#x2660; &#x2663; &#x2665;
  +&#x2666; &#xF6D9; &#xF6DA; &#xF6DB; &#xF8E5; &#xF8E6; &#xF8E7;
  +&#xF8E8; &#xF8E9; &#xF8EA; &#xF8EB; &#xF8EC; &#xF8ED; &#xF8EE;
  +&#xF8EF; &#xF8F0; &#xF8F1; &#xF8F2; &#xF8F3; &#xF8F4; &#xF8F5;
  +&#xF8F6; &#xF8F7; &#xF8F8; &#xF8F9; &#xF8FA; &#xF8FB; &#xF8FC;
  +&#xF8FD; &#xF8FE;
     </fo:block>
   
     <fo:block font-family="Helvetica"  font-size="12pt">
  
  
  
  1.8       +126 -126  xml-fop/docs/examples/fo/list.fo
  
  Index: list.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/fo/list.fo,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- list.fo	11 Dec 2001 12:08:28 -0000	1.7
  +++ list.fo	28 Jun 2002 07:52:51 -0000	1.8
  @@ -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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-size="10pt" font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-size="10pt" font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-size="10pt" font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +      <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +      <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</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">&#183;</fo:inline></fo:block>
  +            <fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
             </fo:list-item-label>
             <!-- list text --> 
             <fo:list-item-body start-indent="body-start()">
  
  
  
  1.5       +77 -77    xml-fop/docs/examples/fo/pdfoutline.fo
  
  Index: pdfoutline.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/fo/pdfoutline.fo,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pdfoutline.fo	10 Jun 2002 08:58:50 -0000	1.4
  +++ pdfoutline.fo	28 Jun 2002 07:52:51 -0000	1.5
  @@ -357,7 +357,7 @@
       <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">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
       <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">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
     <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">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1111,7 +1111,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1124,7 +1124,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1137,7 +1137,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1150,7 +1150,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1163,7 +1163,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1176,7 +1176,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1189,7 +1189,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  
  
  
  1.13      +77 -77    xml-fop/docs/examples/fo/readme.fo
  
  Index: readme.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/fo/readme.fo,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- readme.fo	11 Dec 2001 12:08:28 -0000	1.12
  +++ readme.fo	28 Jun 2002 07:52:51 -0000	1.13
  @@ -285,7 +285,7 @@
       <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">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
       <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">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
   </fo:list-item>
         <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</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 @@
     <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">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1039,7 +1039,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1052,7 +1052,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1065,7 +1065,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1078,7 +1078,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1091,7 +1091,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1104,7 +1104,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  @@ -1117,7 +1117,7 @@
   </fo:list-item>
       <fo:list-item>
   <fo:list-item-label end-indent="label-end()">
  -<fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
  +<fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
   </fo:list-item-label>
   <fo:list-item-body start-indent="body-start()">
   <fo:block>
  
  
  
  1.1                  xml-fop/lib/xalan-2.3.1.LICENSE.txt
  
  Index: xalan-2.3.1.LICENSE.txt
  ===================================================================
  /*
   * 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/>.
   */
  
  
  
  1.2       +3524 -0   xml-fop/lib/xalan-2.3.1.jar
  
  	<<Binary file>>
  
  
  1.2       +338 -0    xml-fop/lib/xml-apis.jar
  
  	<<Binary file>>
  
  
  1.5       +1 -1      xml-fop/src/codegen/Courier.xml
  
  Index: Courier.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/Courier.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Courier.xml	13 Dec 2001 08:26:07 -0000	1.4
  +++ Courier.xml	28 Jun 2002 07:52:53 -0000	1.5
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/CourierBold.xml
  
  Index: CourierBold.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/CourierBold.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CourierBold.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ CourierBold.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/CourierBoldOblique.xml
  
  Index: CourierBoldOblique.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/CourierBoldOblique.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CourierBoldOblique.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ CourierBoldOblique.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/CourierOblique.xml
  
  Index: CourierOblique.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/CourierOblique.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CourierOblique.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ CourierOblique.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.6       +1 -1      xml-fop/src/codegen/Helvetica.xml
  
  Index: Helvetica.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/Helvetica.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Helvetica.xml	13 Dec 2001 08:26:07 -0000	1.5
  +++ Helvetica.xml	28 Jun 2002 07:52:53 -0000	1.6
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/HelveticaBold.xml
  
  Index: HelveticaBold.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/HelveticaBold.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelveticaBold.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ HelveticaBold.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/HelveticaBoldOblique.xml
  
  Index: HelveticaBoldOblique.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/HelveticaBoldOblique.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelveticaBoldOblique.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ HelveticaBoldOblique.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/HelveticaOblique.xml
  
  Index: HelveticaOblique.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/HelveticaOblique.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HelveticaOblique.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ HelveticaOblique.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.4       +1 -1      xml-fop/src/codegen/Symbol.xml
  
  Index: Symbol.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/Symbol.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Symbol.xml	27 Nov 2000 05:32:40 -0000	1.3
  +++ Symbol.xml	28 Jun 2002 07:52:53 -0000	1.4
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/TimesBold.xml
  
  Index: TimesBold.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/TimesBold.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TimesBold.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ TimesBold.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/TimesBoldItalic.xml
  
  Index: TimesBoldItalic.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/TimesBoldItalic.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TimesBoldItalic.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ TimesBoldItalic.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/TimesItalic.xml
  
  Index: TimesItalic.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/TimesItalic.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TimesItalic.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ TimesItalic.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.2       +1 -1      xml-fop/src/codegen/TimesRoman.xml
  
  Index: TimesRoman.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/TimesRoman.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TimesRoman.xml	18 Dec 2001 11:55:02 -0000	1.1
  +++ TimesRoman.xml	28 Jun 2002 07:52:53 -0000	1.2
  @@ -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>
  
  
  
  1.3       +1 -1      xml-fop/src/codegen/ZapfDingbats.xml
  
  Index: ZapfDingbats.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/ZapfDingbats.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ZapfDingbats.xml	2 Nov 2000 12:48:13 -0000	1.2
  +++ ZapfDingbats.xml	28 Jun 2002 07:52:53 -0000	1.3
  @@ -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>
  
  
  
  1.7       +92 -15    xml-fop/src/codegen/code-point-mapping.xsl
  
  Index: code-point-mapping.xsl
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/code-point-mapping.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- code-point-mapping.xsl	6 Mar 2000 21:34:40 -0000	1.6
  +++ code-point-mapping.xsl	28 Jun 2002 07:52:53 -0000	1.7
  @@ -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 &lt; table.length; i += 2) {
  +           if(table[i+1] &lt; 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 &lt; 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 &amp;&amp; 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 &lt; 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 &lt; 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>
  
  
  
  1.10      +33 -27    xml-fop/src/codegen/font-file.xsl
  
  Index: font-file.xsl
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/codegen/font-file.xsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- font-file.xsl	26 Aug 2001 14:23:04 -0000	1.9
  +++ font-file.xsl	28 Jun 2002 07:52:53 -0000	1.10
  @@ -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">
   
  +  <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"/>
   
  -<!-- Note: this key is used with charlist.xml in a for-each. -->
  -<xsl:key name="adobe-char-map" match="map" use="@adobe-name"/>
  -
  -<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 @@
       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 @@
           for( int i = 0; i &lt; 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>
   
  
  
  
  1.2       +1633 -0   xml-fop/src/codegen/encodings.xml
  
  
  
  
  1.2       +1276 -0   xml-fop/src/codegen/glyphlist.xml
  
  
  
  
  1.8       +25 -42    xml-fop/src/org/apache/fop/fonts/TTFFile.java
  
  Index: TTFFile.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fonts/TTFFile.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TTFFile.java	14 Nov 2001 13:45:45 -0000	1.7
  +++ TTFFile.java	28 Jun 2002 07:52:54 -0000	1.8
  @@ -224,29 +224,21 @@
   
   
                               // 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 @@
   
   
                               // 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;
                                   }
                               }
   
  
  
  
  1.18      +8 -9      xml-fop/src/org/apache/fop/layout/FontState.java
  
  Index: FontState.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/FontState.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- FontState.java	27 Jun 2002 11:45:54 -0000	1.17
  +++ FontState.java	28 Jun 2002 07:52:54 -0000	1.18
  @@ -11,6 +11,7 @@
   
   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 @@
           }
   
           // 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;
       }
  
  
  
  1.11      +3 -14     xml-fop/src/org/apache/fop/render/pdf/Font.java
  
  Index: Font.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/Font.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Font.java	11 Feb 2002 09:45:39 -0000	1.10
  +++ Font.java	28 Jun 2002 07:52:54 -0000	1.11
  @@ -33,20 +33,9 @@
       }
   
       /**
  -     * 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;
  
  
  
  1.5       +12 -1     xml-fop/src/org/apache/fop/render/pdf/fonts/SingleByteFont.java
  
  Index: SingleByteFont.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/fonts/SingleByteFont.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SingleByteFont.java	9 Nov 2001 11:32:42 -0000	1.4
  +++ SingleByteFont.java	28 Jun 2002 07:52:54 -0000	1.5
  @@ -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 @@
   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;
  @@ -235,6 +238,14 @@
           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 '#';
       }
   
   }
  
  
  
  1.3       +48 -46    xml-fop/src/org/apache/fop/util/CharUtilities.java
  
  Index: CharUtilities.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/util/CharUtilities.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CharUtilities.java	25 Feb 2002 21:28:28 -0000	1.2
  +++ CharUtilities.java	28 Jun 2002 07:52:54 -0000	1.3
  @@ -47,51 +47,53 @@
        * 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;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org