From 5e1c96bef29aeaaaa4c1aabb42336268c73ee974 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 10 Jul 2014 06:32:08 +0000 Subject: omegafonts: More char codes from Supplementary Unicode Planes git-svn-id: svn://tug.org/texlive/trunk@34563 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/omegafonts/ChangeLog | 9 ++++++--- Build/source/texk/web2c/omegafonts/char_routines.c | 3 +++ Build/source/texk/web2c/omegafonts/ofonts.test | 4 ---- Build/source/texk/web2c/omegafonts/omfonts.c | 2 +- Build/source/texk/web2c/omegafonts/overbmp.test | 3 --- Build/source/texk/web2c/omegafonts/param_routines.c | 3 +++ Build/source/texk/web2c/omegafonts/tests/inbmp.opl | 2 -- Build/source/texk/web2c/omegafonts/tests/realnum.out | 2 -- Build/source/texk/web2c/omegafonts/tests/sample.out | 2 -- Build/source/texk/web2c/omegafonts/tests/sample.ovp | 2 -- Build/source/texk/web2c/omegafonts/tests/sample0-h.opl | 2 -- 11 files changed, 13 insertions(+), 21 deletions(-) (limited to 'Build/source/texk/web2c/omegafonts') diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog index 9583e665f1c..6145c11a60c 100644 --- a/Build/source/texk/web2c/omegafonts/ChangeLog +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -1,12 +1,15 @@ +2014-07-10 Peter Breitenlohner + + * char_routines.c, ligkern_routines.c, omfonts.c, + param_routines.c, parse_ofm.c: Allow char codes 10000..10FFFF + from Supplementary Unicode Planes. + 2014-07-09 Peter Breitenlohner * Makefile.am: Drop Automake conditional OMFONTS. * ofonts.test, overbmp.test, tests/ofont*, tests/inbmp.opl, tests/overbmp.* (new): Shell scripts and data for new tests. - * char_routines.c, ligkern_routines.c, parse_ofm.c: Allow char - codes from Supplementary Unicode Planes (<=10FFFF). - 2013-12-06 Peter Breitenlohner * omfonts.c (main): Use make_suffix() for implied ofm_name. diff --git a/Build/source/texk/web2c/omegafonts/char_routines.c b/Build/source/texk/web2c/omegafonts/char_routines.c index b7e65d2377c..5f7678a7313 100644 --- a/Build/source/texk/web2c/omegafonts/char_routines.c +++ b/Build/source/texk/web2c/omegafonts/char_routines.c @@ -222,6 +222,9 @@ output_ovf_chars(void) FOR_ALL_EXISTING_CHARACTERS( unsigned c = plane*PLANE + index; + + if ((entry->indices[C_WD] == NULL) || (entry->indices[C_WD]->index == 0)) + continue; wd = lval(entry->indices[C_WD]); if (design_units != UNITY) wd = zround(((double)wd) / ((double)design_units) * 1048576.0); diff --git a/Build/source/texk/web2c/omegafonts/ofonts.test b/Build/source/texk/web2c/omegafonts/ofonts.test index 16a5bee25b5..ff874a2b7a4 100755 --- a/Build/source/texk/web2c/omegafonts/ofonts.test +++ b/Build/source/texk/web2c/omegafonts/ofonts.test @@ -12,9 +12,6 @@ TEXMFCNF=$srcdir/../../kpathsea OFMFONTS=.:$srcdir/tests export TEXMFCNF OFMFONTS -exit 77 -set -x - for f in $VPL; do ./omfonts -opl2ofm $srcdir/tests/$f.pl tests/x$f.tfm || exit 1 ./omfonts -ofm2opl tests/x$f.tfm tests/x$f.pl || exit 1 @@ -53,4 +50,3 @@ done exit 0 - diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c index 09db093fd93..c44ae04b521 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.c +++ b/Build/source/texk/web2c/omegafonts/omfonts.c @@ -299,7 +299,7 @@ main (int argc, string *argv) yyin = file_ovp; (void)yyparse(); output_ofm_file(); - /*(void)fclose(file_ofm);*/ + (void)fclose(file_ofm); output_ovf_file(); (void)fclose(file_ovf); break; diff --git a/Build/source/texk/web2c/omegafonts/overbmp.test b/Build/source/texk/web2c/omegafonts/overbmp.test index fc3771c73c2..0038657a160 100755 --- a/Build/source/texk/web2c/omegafonts/overbmp.test +++ b/Build/source/texk/web2c/omegafonts/overbmp.test @@ -9,9 +9,6 @@ TEXMFCNF=$srcdir/../../kpathsea OFMFONTS=./tests export TEXMFCNF OFMFONTS -exit 77 -set -x - ./omfonts -opl2ofm $srcdir/tests/inbmp tests/xinbmp || exit 1 ./omfonts -ofm2opl xinbmp tests/xinbmp || exit 1 diff --git a/Build/source/texk/web2c/omegafonts/param_routines.c b/Build/source/texk/web2c/omegafonts/param_routines.c index 959d4019d98..89403874369 100644 --- a/Build/source/texk/web2c/omegafonts/param_routines.c +++ b/Build/source/texk/web2c/omegafonts/param_routines.c @@ -119,6 +119,9 @@ print_parameters(void) { av_list L = param_list; + if (L == NULL) + return; + print_font_dimension(); while (L != NULL) { print_parameter(lattr(L), lval(L)); diff --git a/Build/source/texk/web2c/omegafonts/tests/inbmp.opl b/Build/source/texk/web2c/omegafonts/tests/inbmp.opl index aef0f847fbf..46eab47d831 100644 --- a/Build/source/texk/web2c/omegafonts/tests/inbmp.opl +++ b/Build/source/texk/web2c/omegafonts/tests/inbmp.opl @@ -8,8 +8,6 @@ (COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) (CHECKSUM H AA6297E0) (SEVENBITSAFEFLAG FALSE) -(FONTDIMEN - ) (CHARACTER H 4E00 (CHARWD R 1.0) ) diff --git a/Build/source/texk/web2c/omegafonts/tests/realnum.out b/Build/source/texk/web2c/omegafonts/tests/realnum.out index c6b56b6a6bf..97091f7d828 100644 --- a/Build/source/texk/web2c/omegafonts/tests/realnum.out +++ b/Build/source/texk/web2c/omegafonts/tests/realnum.out @@ -5,8 +5,6 @@ (COMMENT DESIGNSIZE IS IN POINTS) (COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) (CHECKSUM H 0) -(FONTDIMEN - ) (COMMENT (CHARWD_ENTRY D 0 R 0.0) (CHARWD_ENTRY D 1 R 0.0) diff --git a/Build/source/texk/web2c/omegafonts/tests/sample.out b/Build/source/texk/web2c/omegafonts/tests/sample.out index 1f697187483..4e756fcec07 100644 --- a/Build/source/texk/web2c/omegafonts/tests/sample.out +++ b/Build/source/texk/web2c/omegafonts/tests/sample.out @@ -9,8 +9,6 @@ (COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) (CHECKSUM H 0) (SEVENBITSAFEFLAG FALSE) -(FONTDIMEN - ) (MAPFONT D 0 (FONTNAME sample0-h) (FONTCHECKSUM H 0) diff --git a/Build/source/texk/web2c/omegafonts/tests/sample.ovp b/Build/source/texk/web2c/omegafonts/tests/sample.ovp index d83bd6f2ed6..e1bdf269a03 100644 --- a/Build/source/texk/web2c/omegafonts/tests/sample.ovp +++ b/Build/source/texk/web2c/omegafonts/tests/sample.ovp @@ -9,8 +9,6 @@ (COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) (CHECKSUM H 0) (SEVENBITSAFEFLAG FALSE) -(FONTDIMEN - ) (MAPFONT D 0 (FONTNAME sample0-h) (FONTCHECKSUM H 0) diff --git a/Build/source/texk/web2c/omegafonts/tests/sample0-h.opl b/Build/source/texk/web2c/omegafonts/tests/sample0-h.opl index e0b4e8a8c96..06a3c2ede54 100644 --- a/Build/source/texk/web2c/omegafonts/tests/sample0-h.opl +++ b/Build/source/texk/web2c/omegafonts/tests/sample0-h.opl @@ -6,8 +6,6 @@ (COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) (CHECKSUM H 11AB1731) (SEVENBITSAFEFLAG TRUE) -(FONTDIMEN - ) (COMMENT (CHARWD_ENTRY D 0 R 0.0) (CHARWD_ENTRY D 1 R 1.0) -- cgit v1.2.3