diff options
| -rw-r--r-- | docs/bugtests/charwidth.fo | 259 | ||||
| -rw-r--r-- | src/codegen/Helvetica.xml | 4 | ||||
| -rw-r--r-- | src/codegen/Symbol.xml | 3 | ||||
| -rw-r--r-- | src/codegen/Times-Roman.xml | 4 |
4 files changed, 265 insertions, 5 deletions
diff --git a/docs/bugtests/charwidth.fo b/docs/bugtests/charwidth.fo new file mode 100644 index 000000000..15772a4bc --- /dev/null +++ b/docs/bugtests/charwidth.fo @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> +<fo:layout-master-set> + <fo:simple-page-master margin-right="40pt" margin-left="40pt" master-name="one"> + <fo:region-body margin-bottom="30pt" margin-top="30pt"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-name="one"> + <fo:flow font-size="12pt" flow-name="xsl-region-body"> + <fo:block> + This file contains a list of many characters in various fonts. The text is + aligned with the end in order to check that all the characters have their + correct width set in FOP. + </fo:block> + <fo:block> + If the right hand edge is left of the other lines in the same font then + this indicates it expects one (or more) of the characters to be wider + than it really is. Also if the end is to the right of the other lines + then FOP expects a character to be smaller than it really is or the + character is missing from the lookup. + </fo:block> + <fo:block font-size="12pt" font-family="Helvetica" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> +!"#$%&'()*+,-./0123456789:;<1 + </fo:block> + <fo:block> +=>?@ABCDEFGHIJKLMNOPQRSTUVWX1 + </fo:block> + <fo:block> +YZ[\]^_`abcdefghijklmnopq1 + </fo:block> + <fo:block> +rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 + </fo:block> + <fo:block> +©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 + </fo:block> + <fo:block> +ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 + </fo:block> + <fo:block> +ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 + </fo:block> + <fo:block> +òóôõö÷øùúûüýþ1 + </fo:block> + </fo:block> + <fo:block font-size="12pt" font-family="Times Roman" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> +!"#$%&'()*+,-./0123456789:;<1 + </fo:block> + <fo:block> +=>?@ABCDEFGHIJKLMNOPQRSTUVWX1 + </fo:block> + <fo:block> +YZ[\]^_`abcdefghijklmnopq1 + </fo:block> + <fo:block> +rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 + </fo:block> + <fo:block> +©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 + </fo:block> + <fo:block> +ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 + </fo:block> + <fo:block> +ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 + </fo:block> + <fo:block> +òóôõö÷øùúûüýþ1 + </fo:block> + </fo:block> + <fo:block font-family="Courier" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> +!"#$%&'()*+,-./0123456789:;<1 + </fo:block> + <fo:block> +=>?@ABCDEFGHIJKLMNOPQRSTUVWX1 + </fo:block> + <fo:block> +YZ[\]^_`abcdefghijklmnopq1 + </fo:block> + <fo:block> +rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 + </fo:block> + <fo:block> +©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 + </fo:block> + <fo:block> +ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 + </fo:block> + <fo:block> +ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 + </fo:block> + <fo:block> +òóôõö÷øùúûüýþ1 + </fo:block> + </fo:block> + <fo:block font-family="ZapfDingbats" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> +!"#$%&'()*+,-./0123456789:;<1 + </fo:block> + <fo:block> +=>?@ABCDEFGHIJKLMNOPQRSTUVWX1 + </fo:block> + <fo:block> +YZ[\]^_`abcdefghijklmnopq1 + </fo:block> + <fo:block> +rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 + </fo:block> + <fo:block> +©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 + </fo:block> + <fo:block> +ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 + </fo:block> + <fo:block> +ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 + </fo:block> + <fo:block> +òóôõö÷øùúûüýþ1 + </fo:block> + </fo:block> + <fo:block font-family="Symbol" text-align="end"> + <fo:block> + 1 + </fo:block> + <fo:block> + abcdefghijklmnopqrstuvwxyz1 + </fo:block> + <fo:block> + ABCDEFGHIJKLMNOPQRSTUVWXYZ1 + </fo:block> + <fo:block> + 12345678901 + </fo:block> + <fo:block> + `~!@#$%^&*()-_=+1 + </fo:block> + <fo:block> + [{]}\|;:'1 + </fo:block> + <fo:block> + ",<.>/?1 + </fo:block> + <fo:block> +!"#$%&'()*+,-./0123456789:;<1 + </fo:block> + <fo:block> +=>?@ABCDEFGHIJKLMNOPQRSTUVWX1 + </fo:block> + <fo:block> +YZ[\]^_`abcdefghijklmnopq1 + </fo:block> + <fo:block> +rstuvwxyz{|}~ ¡¢£¤¥¦§¨1 + </fo:block> + <fo:block> +©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁ1 + </fo:block> + <fo:block> +ÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ1 + </fo:block> + <fo:block> +ÚÛÜÝÞßàáâãäåæçèéêëìíîïðñ1 + </fo:block> + <fo:block> +òóôõö÷øùúûüýþ1 + </fo:block> + </fo:block> + </fo:flow> + </fo:page-sequence> +</fo:root> diff --git a/src/codegen/Helvetica.xml b/src/codegen/Helvetica.xml index 36f8b0b65..a188996f1 100644 --- a/src/codegen/Helvetica.xml +++ b/src/codegen/Helvetica.xml @@ -158,7 +158,7 @@ <char name="lslash" width="222"/> <char name="m" width="833"/> <char name="macron" width="333"/> - <char name="minus" width="584"/> + <char name="minus" width="324"/> <char name="mu" width="556"/> <char name="multiply" width="584"/> <char name="n" width="556"/> @@ -241,4 +241,4 @@ <char name="zcaron" width="500"/> <char name="zero" width="556"/> </widths> -</font-metrics>
\ No newline at end of file +</font-metrics> diff --git a/src/codegen/Symbol.xml b/src/codegen/Symbol.xml index cfd3f2061..8dcb507ef 100644 --- a/src/codegen/Symbol.xml +++ b/src/codegen/Symbol.xml @@ -86,6 +86,7 @@ <char name="phi1" width="603"/> <char name="kappa" width="549"/> <char name="lambda" width="549"/> + <char name="m" width="576"/> <char name="mu" width="576"/> <char name="nu" width="521"/> <char name="omicron" width="549"/> @@ -199,4 +200,4 @@ <char name="bracerightbt" width="494"/> <char name="apple" width="790"/> </widths> -</font-metrics>
\ No newline at end of file +</font-metrics> diff --git a/src/codegen/Times-Roman.xml b/src/codegen/Times-Roman.xml index 0dee39bbc..d22f89e5f 100644 --- a/src/codegen/Times-Roman.xml +++ b/src/codegen/Times-Roman.xml @@ -158,7 +158,7 @@ <char name="lslash" width="278"/> <char name="m" width="778"/> <char name="macron" width="333"/> - <char name="minus" width="564"/> + <char name="minus" width="324"/> <char name="mu" width="500"/> <char name="multiply" width="564"/> <char name="n" width="500"/> @@ -241,4 +241,4 @@ <char name="zcaron" width="444"/> <char name="zero" width="500"/> </widths> -</font-metrics>
\ No newline at end of file +</font-metrics> |