[Debian-tex-commits] SVN tetex-bin commit + diffs: r1955 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at alioth.debian.org
Fri Nov 24 15:31:42 CET 2006
Author: frank
Date: 2006-11-24 15:31:41 +0100 (Fri, 24 Nov 2006)
New Revision: 1955
Added:
tetex-bin/trunk/debian/patches/patch-pdftex-cjkfonts-overflow
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/patch-pdftex-ttftable
tetex-bin/trunk/debian/patches/series
tetex-bin/trunk/debian/rules
Log:
Apply patch from upstream to pdftex that allows it to work properly
with CJK fonts with their large number of subfonts. Many thanks to
Thanh Han The <hanthethanh at gmail.com>, Jie Luo
<luojie at nlsde.buaa.edu.cn> for the patch and many others for
debugging.
This fixes a FTBFS bug in debian-reference and closes: #399897, hence
the urgency
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-11-22 11:26:46 UTC (rev 1954)
+++ tetex-bin/trunk/debian/changelog 2006-11-24 14:31:41 UTC (rev 1955)
@@ -1,11 +1,18 @@
-tetex-bin (3.0-24~1) unstable; urgency=low
+tetex-bin (3.0-24) unstable; urgency=high
+ * Apply patch from upstream to pdftex that allows it to work properly
+ with CJK fonts with their large number of subfonts. Many thanks to
+ Thanh Han The <hanthethanh at gmail.com>, Jie Luo
+ <luojie at nlsde.buaa.edu.cn> for the patch and many others for
+ debugging.
+ This fixes a FTBFS bug in debian-reference and closes: #399897, hence
+ the urgency
* Write a proper manpage for texconfig, and document which commands
make sense to be used on a Debian system. Thanks to Géraud Meyer
<geraud_meyer at hotmail.com> for reminding us (closes: #396823)
* Make "texconfig faq" find the teTeX faq
- -- Frank Küster <frank at debian.org> Fri, 3 Nov 2006 15:53:28 +0100
+ -- Frank Küster <frank at debian.org> Fri, 24 Nov 2006 15:28:51 +0100
tetex-bin (3.0-23) unstable; urgency=low
Added: tetex-bin/trunk/debian/patches/patch-pdftex-cjkfonts-overflow
===================================================================
--- tetex-bin/trunk/debian/patches/patch-pdftex-cjkfonts-overflow 2006-11-22 11:26:46 UTC (rev 1954)
+++ tetex-bin/trunk/debian/patches/patch-pdftex-cjkfonts-overflow 2006-11-24 14:31:41 UTC (rev 1955)
@@ -0,0 +1,96 @@
+ texk/web2c/pdftexdir/hz.ch | 3 ++-
+ texk/web2c/pdftexdir/pdftex.ch | 1 +
+ texk/web2c/pdftexdir/pdftex.defines | 1 +
+ texk/web2c/pdftexdir/utils.c | 30 +++++++++++++++++++++++++++++-
+ 4 files changed, 33 insertions(+), 2 deletions(-)
+
+Index: trunk/texk/web2c/pdftexdir/hz.ch
+===================================================================
+--- trunk.orig/texk/web2c/pdftexdir/hz.ch 2006-11-22 19:21:03.000000000 +0100
++++ trunk/texk/web2c/pdftexdir/hz.ch 2006-11-24 08:21:59.000000000 +0100
+@@ -266,7 +266,7 @@
+ pdf_font_expand_ratio[k] := e;
+ pdf_font_step[k] := pdf_font_step[f];
+ pdf_font_auto_expand[k] := pdf_font_auto_expand[f];
+- pdf_font_blink[k] := f; {???}
++ pdf_font_blink[k] := f;
+ pdf_font_lp_base[k] := pdf_font_lp_base[f];
+ pdf_font_rp_base[k] := pdf_font_rp_base[f];
+ pdf_font_ef_base[k] := pdf_font_ef_base[f];
+@@ -337,6 +337,7 @@
+ e := pdf_font_expand_ratio[f];
+ for k := 0 to vf_local_font_num[bf] - 1 do begin
+ lf := vf_default_font[bf] + k;
++ allocvffnts;
+ vf_e_fnts[vf_nf] := vf_e_fnts[lf];
+ vf_i_fnts[vf_nf] := auto_expand_font(vf_i_fnts[lf], e);
+ set_expand_param(vf_i_fnts[vf_nf], vf_i_fnts[lf], e);
+Index: trunk/texk/web2c/pdftexdir/pdftex.ch
+===================================================================
+--- trunk.orig/texk/web2c/pdftexdir/pdftex.ch 2006-11-22 19:21:03.000000000 +0100
++++ trunk/texk/web2c/pdftexdir/pdftex.ch 2006-11-24 08:21:59.000000000 +0100
+@@ -2260,6 +2260,7 @@
+ cmd := vf_byte;
+ save_vf_nf := vf_nf;
+ while (cmd >= fnt_def1) and (cmd <= fnt_def1 + 3) do begin
++ allocvffnts;
+ vf_e_fnts[vf_nf] := vf_read(cmd - fnt_def1 + 1);
+ vf_i_fnts[vf_nf] := vf_def_font(f);
+ incr(vf_nf);
+Index: trunk/texk/web2c/pdftexdir/pdftex.defines
+===================================================================
+--- trunk.orig/texk/web2c/pdftexdir/pdftex.defines 2006-11-24 08:20:05.000000000 +0100
++++ trunk/texk/web2c/pdftexdir/pdftex.defines 2006-11-24 08:22:46.000000000 +0100
+@@ -53,6 +53,7 @@
+ @define procedure escapestr();
+ @define function escapedstrlen;
+ @define function getescapedchar();
++ at define procedure allocvffnts;
+
+ { functions from vfpacket.c }
+ @define function newvfpacket();
+Index: trunk/texk/web2c/pdftexdir/utils.c
+===================================================================
+--- trunk.orig/texk/web2c/pdftexdir/utils.c 2006-10-18 12:13:08.000000000 +0200
++++ trunk/texk/web2c/pdftexdir/utils.c 2006-11-24 08:21:59.000000000 +0100
+@@ -48,7 +48,15 @@
+
+ /* define char_ptr, char_array & char_limit */
+ typedef char char_entry;
+-define_array(char);
++define_array(char);
++
++/* define vf_e_fnts_ptr, vf_e_fnts_array & vf_e_fnts_limit */
++typedef integer vf_e_fnts_entry;
++define_array (vf_e_fnts);
++
++/* define vf_i_fnts_ptr, vf_i_fnts_array & vf_i_fnts_limit */
++typedef internalfontnumber vf_i_fnts_entry;
++define_array (vf_i_fnts);
+
+ integer fb_offset(void)
+ {
+@@ -628,3 +636,23 @@
+ pdftex_fail("getescapedchar(): index out of range");
+ return escaped_string[index];
+ }
++
++void allocvffnts(void)
++{
++ if (vf_e_fnts_array == NULL) {
++ vf_e_fnts_array = vfefnts;
++ vf_e_fnts_limit = fontmax;
++ vf_e_fnts_ptr = vf_e_fnts_array;
++ vf_i_fnts_array = vfifnts;
++ vf_i_fnts_limit = fontmax;
++ vf_i_fnts_ptr = vf_i_fnts_array;
++ }
++ alloc_array(vf_e_fnts, 1, fontmax);
++ vf_e_fnts_ptr++;
++ alloc_array(vf_i_fnts, 1, fontmax);
++ vf_i_fnts_ptr++;
++ if (vf_e_fnts_array != vfefnts) {
++ vfefnts = vf_e_fnts_array;
++ vfifnts = vf_i_fnts_array;
++ }
++}
Modified: tetex-bin/trunk/debian/patches/patch-pdftex-ttftable
===================================================================
--- tetex-bin/trunk/debian/patches/patch-pdftex-ttftable 2006-11-22 11:26:46 UTC (rev 1954)
+++ tetex-bin/trunk/debian/patches/patch-pdftex-ttftable 2006-11-24 14:31:41 UTC (rev 1955)
@@ -3,8 +3,8 @@
Index: trunk/texk/web2c/pdftexdir/writettf.c
===================================================================
---- trunk.orig/texk/web2c/pdftexdir/writettf.c 2006-10-18 12:13:08.000000000 +0200
-+++ trunk/texk/web2c/pdftexdir/writettf.c 2006-10-19 07:46:18.000000000 +0200
+--- trunk.orig/texk/web2c/pdftexdir/writettf.c 2006-11-22 19:21:03.000000000 +0100
++++ trunk/texk/web2c/pdftexdir/writettf.c 2006-11-24 08:17:49.000000000 +0100
@@ -1023,7 +1023,7 @@
TTF_USHORT version;
ttf_reset_chksm(tab);
Modified: tetex-bin/trunk/debian/patches/series
===================================================================
--- tetex-bin/trunk/debian/patches/series 2006-11-22 11:26:46 UTC (rev 1954)
+++ tetex-bin/trunk/debian/patches/series 2006-11-24 14:31:41 UTC (rev 1955)
@@ -13,3 +13,4 @@
patch-texdoctk-tmp
patch-a2ping_invocation
patch-pdftex-ttftable
+patch-pdftex-cjkfonts-overflow
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2006-11-22 11:26:46 UTC (rev 1954)
+++ tetex-bin/trunk/debian/rules 2006-11-24 14:31:41 UTC (rev 1955)
@@ -329,7 +329,7 @@
done
# needs devscripts in etch or from backports.org
- debchange --distribution sarge-backports -b --newversion 3.0-22~1~bpo.1~bpo.1 "Recompiled for sarge."
+ debchange --distribution sarge-backports -b --newversion 3.0-24~1~bpo.1 "Recompiled for sarge."
debchange --append \
"Add a Build-Depends on sarge's xlibs-dev to prevent linking against XOrg"
debchange --append \
More information about the Debian-tex-commits
mailing list