From 0623c5dbdba93ded6c215bb7e6c7dfcf8970c44f Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 7 Aug 2008 20:26:10 +0000 Subject: really fix the tfm-font-mapping bug this time git-svn-id: svn://tug.org/texlive/trunk@10148 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/xetexdir/xetex.ch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Build/source/texk/web2c/xetexdir/xetex.ch') diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch index a4ada822844..b6634d23cd8 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.ch +++ b/Build/source/texk/web2c/xetexdir/xetex.ch @@ -6734,11 +6734,12 @@ if eTeX_ex then for k:=int_val to inter_char_val do @x print_file_name(font_name[k],font_area[k],""); @y - if is_native_font(k) then + if is_native_font(k) or (font_mapping[k]<>0) then begin print_file_name(font_name[k],"",""); - print_err("Can't \dump a format with preloaded native fonts"); - help2("You really, really don't want to do this.") - ("It won't work, and only confuses me."); + print_err("Can't \dump a format with native fonts or font-mappings"); + help3("You really, really don't want to do this.") + ("It won't work, and only confuses me.") + ("(Load them at runtime, not as part of the format file.)"); error; end else print_file_name(font_name[k],font_area[k],""); @@ -6762,6 +6763,13 @@ font_bc:=xmalloc_array(UTF16_code, font_max); font_ec:=xmalloc_array(UTF16_code, font_max); @z +@x +undump_things(font_check[null_font], font_ptr+1-null_font); +@y +for k:=null_font to font_ptr do font_mapping[k]:=0; +undump_things(font_check[null_font], font_ptr+1-null_font); +@z + @x dump_int(trie_op_ptr); @y @@ -8847,7 +8855,6 @@ begin font_letter_space[font_ptr] := loaded_font_letter_space; {measure the width of the space character and set up font parameters} - font_mapping[font_ptr] := nil; p := new_native_character(font_ptr, " "); s := width(p) + loaded_font_letter_space; free_node(p, native_size(p)); -- cgit v1.2.3