diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font')
21 files changed, 78 insertions, 74 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/dofont.w b/Build/source/texk/web2c/luatexdir/font/dofont.w index 38278e8d1cb..3dad8b50abe 100644 --- a/Build/source/texk/web2c/luatexdir/font/dofont.w +++ b/Build/source/texk/web2c/luatexdir/font/dofont.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: dofont.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/dofont.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/dofont.w $"; @ a bit more interfacing is needed for proper error reporting diff --git a/Build/source/texk/web2c/luatexdir/font/luafont.w b/Build/source/texk/web2c/luatexdir/font/luafont.w index bde66530fb4..6ea114de45a 100644 --- a/Build/source/texk/web2c/luatexdir/font/luafont.w +++ b/Build/source/texk/web2c/luatexdir/font/luafont.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: luafont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/luafont.w $"; + "$Id: luafont.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/luafont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -111,7 +111,7 @@ static void dump_intfield(lua_State * L, const char *n, int c) } -void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) +static void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) { int i; for (i = 0; i < l; i++) { @@ -136,7 +136,7 @@ void dump_math_kerns(lua_State * L, charinfo * co, int l, int id) } -void font_char_to_lua(lua_State * L, internal_font_number f, charinfo * co) +static void font_char_to_lua(lua_State * L, internal_font_number f, charinfo * co) { int i, j; liginfo *l; @@ -739,7 +739,7 @@ make_luaS_index(vert_variants); make_luaS_index(mathkern); make_luaS_index(commands); -void init_font_string_pointers(lua_State * L) +static void init_font_string_pointers(lua_State * L) { init_luaS_index(width); init_luaS_index(height); @@ -856,7 +856,7 @@ static int count_char_packet_bytes(lua_State * L) -scaled sp_to_dvi(halfword sp, halfword atsize) +static scaled sp_to_dvi(halfword sp, halfword atsize) { double result, mult; mult = (double) (atsize / 65536.0); @@ -1174,7 +1174,7 @@ static void store_math_kerns(lua_State * L, charinfo * co, int id) } @ @c -void +static void font_char_from_lua(lua_State * L, internal_font_number f, int i, int *l_fonts, boolean has_math) { diff --git a/Build/source/texk/web2c/luatexdir/font/mapfile.w b/Build/source/texk/web2c/luatexdir/font/mapfile.w index 3d129183d6f..8d06d046628 100644 --- a/Build/source/texk/web2c/luatexdir/font/mapfile.w +++ b/Build/source/texk/web2c/luatexdir/font/mapfile.w @@ -21,7 +21,7 @@ static const char _svn_version[] = "$Id: mapfile.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/mapfile.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/mapfile.w $"; #include <math.h> #include "ptexlib.h" diff --git a/Build/source/texk/web2c/luatexdir/font/pkin.w b/Build/source/texk/web2c/luatexdir/font/pkin.w index 077680eb596..a807ab39d0c 100644 --- a/Build/source/texk/web2c/luatexdir/font/pkin.w +++ b/Build/source/texk/web2c/luatexdir/font/pkin.w @@ -53,7 +53,7 @@ typedef short shalfword; static const char _svn_version[] = "$Id: pkin.w 3584 2010-04-02 17:45:55Z hhenkel $" - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/pkin.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/pkin.w $"; @ Now we have some routines to get stuff from the pk file. pkbyte returns diff --git a/Build/source/texk/web2c/luatexdir/font/sfnt.w b/Build/source/texk/web2c/luatexdir/font/sfnt.w index 25fb3fcd086..53044ca0fee 100644 --- a/Build/source/texk/web2c/luatexdir/font/sfnt.w +++ b/Build/source/texk/web2c/luatexdir/font/sfnt.w @@ -33,7 +33,7 @@ static const char _svn_version[] = "$Id: sfnt.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/sfnt.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/sfnt.w $"; diff --git a/Build/source/texk/web2c/luatexdir/font/subfont.w b/Build/source/texk/web2c/luatexdir/font/subfont.w index 5ae8639bb41..b7ea88064cf 100644 --- a/Build/source/texk/web2c/luatexdir/font/subfont.w +++ b/Build/source/texk/web2c/luatexdir/font/subfont.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: subfont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/subfont.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/subfont.w $"; @ @c static struct avl_table *sfd_tree = NULL; diff --git a/Build/source/texk/web2c/luatexdir/font/texfont.w b/Build/source/texk/web2c/luatexdir/font/texfont.w index 19dcb0769af..b2dd0a6cb86 100644 --- a/Build/source/texk/web2c/luatexdir/font/texfont.w +++ b/Build/source/texk/web2c/luatexdir/font/texfont.w @@ -33,8 +33,8 @@ problematic |if 0 != null|. @c static const char _svn_version[] = - "$Id: texfont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/texfont.w $"; + "$Id: texfont.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/texfont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -189,7 +189,7 @@ charinfo *get_charinfo(internal_font_number f, int c) } @ @c -void set_charinfo(internal_font_number f, int c, charinfo * ci) +static void set_charinfo(internal_font_number f, int c, charinfo * ci) { sa_tree_item glyph; if (proper_char_index(c)) { @@ -366,7 +366,8 @@ int char_exists(internal_font_number f, int c) } @ @c -int lua_char_exists_callback(internal_font_number f, int c) +#if 0 +static int lua_char_exists_callback(internal_font_number f, int c) { int callback_id; lua_State *L = Luas; @@ -389,7 +390,7 @@ int lua_char_exists_callback(internal_font_number f, int c) } return ret; } - +#endif @ @c extinfo *new_variant(int glyph, int startconnect, int endconnect, @@ -408,7 +409,7 @@ extinfo *new_variant(int glyph, int startconnect, int endconnect, @ @c -extinfo *copy_variant(extinfo * old) +static extinfo *copy_variant(extinfo * old) { extinfo *ext; ext = xmalloc(sizeof(extinfo)); @@ -422,7 +423,7 @@ extinfo *copy_variant(extinfo * old) } @ @c -void dump_variant(extinfo * ext) +static void dump_variant(extinfo * ext) { dump_int(ext->glyph); dump_int(ext->start_overlap); @@ -434,7 +435,7 @@ void dump_variant(extinfo * ext) @ @c -extinfo *undump_variant(void) +static extinfo *undump_variant(void) { int x; extinfo *ext; @@ -502,7 +503,7 @@ extinfo *copy_variants(extinfo * o) @ @c -void dump_charinfo_variants(extinfo * o) +static void dump_charinfo_variants(extinfo * o) { while (o != NULL) { dump_variant(o); @@ -513,7 +514,7 @@ void dump_charinfo_variants(extinfo * o) } @ @c -extinfo *undump_charinfo_variants(void) +static extinfo *undump_charinfo_variants(void) { extinfo *c, *t, *h = NULL; c = undump_variant(); @@ -1440,7 +1441,7 @@ scaled get_kern(internal_font_number f, int lc, int rc) x = 0; dump_int(x); \ } -void dump_charinfo(int f, int c) +static void dump_charinfo(int f, int c) { charinfo *co; int x; @@ -1503,7 +1504,7 @@ void dump_charinfo(int f, int c) dump_math_kerns(co); } -void dump_font_entry(texfont * f) +static void dump_font_entry(texfont * f) { int x; dump_int(f->_font_size); @@ -1583,7 +1584,7 @@ void dump_font(int f) } @ @c -int undump_charinfo(int f) +static int undump_charinfo(int f) { charinfo *co; int x, i; @@ -1678,7 +1679,7 @@ int undump_charinfo(int f) a(f,s); } -void undump_font_entry(texfont * f) +static void undump_font_entry(texfont * f) { int x = 0; /* *INDENT-OFF* */ diff --git a/Build/source/texk/web2c/luatexdir/font/tfmofm.w b/Build/source/texk/web2c/luatexdir/font/tfmofm.w index 842af38b405..afe58217373 100644 --- a/Build/source/texk/web2c/luatexdir/font/tfmofm.w +++ b/Build/source/texk/web2c/luatexdir/font/tfmofm.w @@ -22,7 +22,7 @@ static const char _svn_version[] = "$Id: tfmofm.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tfmofm.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tfmofm.w $"; @ Here are some macros that help process ligatures and kerns @c diff --git a/Build/source/texk/web2c/luatexdir/font/tounicode.w b/Build/source/texk/web2c/luatexdir/font/tounicode.w index 9ca84210606..14bf9bedad9 100644 --- a/Build/source/texk/web2c/luatexdir/font/tounicode.w +++ b/Build/source/texk/web2c/luatexdir/font/tounicode.w @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: tounicode.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tounicode.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tounicode.w $"; @ @c #define isXdigit(c) (isdigit(c) || ('A' <= (c) && (c) <= 'F')) diff --git a/Build/source/texk/web2c/luatexdir/font/tt_glyf.w b/Build/source/texk/web2c/luatexdir/font/tt_glyf.w index b22d5748284..2a1fcf02f66 100644 --- a/Build/source/texk/web2c/luatexdir/font/tt_glyf.w +++ b/Build/source/texk/web2c/luatexdir/font/tt_glyf.w @@ -31,7 +31,7 @@ static const char _svn_version[] = "$Id: tt_glyf.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tt_glyf.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tt_glyf.w $"; @ @c #define NUM_GLYPH_LIMIT 65534 diff --git a/Build/source/texk/web2c/luatexdir/font/tt_table.w b/Build/source/texk/web2c/luatexdir/font/tt_table.w index 35da4284ee8..744baa8e6bf 100644 --- a/Build/source/texk/web2c/luatexdir/font/tt_table.w +++ b/Build/source/texk/web2c/luatexdir/font/tt_table.w @@ -28,7 +28,7 @@ static const char _svn_version[] = "$Id: tt_table.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/tt_table.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/tt_table.w $"; @ tables contains information refered by other tables diff --git a/Build/source/texk/web2c/luatexdir/font/vfovf.w b/Build/source/texk/web2c/luatexdir/font/vfovf.w index cc3c93ad8b5..68852e209e5 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfovf.w +++ b/Build/source/texk/web2c/luatexdir/font/vfovf.w @@ -22,8 +22,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: vfovf.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/vfovf.w $"; + "$Id: vfovf.w 3612 2010-04-13 09:29:42Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/vfovf.w $"; @ @c /* this is a hack! */ @@ -208,7 +208,7 @@ vf_local_font_warning(internal_font_number f, internal_font_number k, @ process a local font in \.{VF} file @c -internal_font_number +static internal_font_number vf_def_font(internal_font_number f, unsigned char *vf_buffer, int *vf_cr) { internal_font_number k; @@ -386,7 +386,7 @@ static int open_vf_file(const char *fn, unsigned char **vbuffer, int *vsize) } @ @c -int count_packet_bytes(eight_bits * vf_buf, int cur_bute, int count) +static int count_packet_bytes(eight_bits * vf_buf, int cur_bute, int count) { unsigned k = 0; int ff = 0; @@ -1595,7 +1595,8 @@ letter_space_font(halfword u, internal_font_number f, int e) @ the fontname has [+-]\d+ls at the end @c -boolean is_letterspaced_font(internal_font_number f) +#if 0 +static boolean is_letterspaced_font(internal_font_number f) { char *i, *j; if (font_type(f) != virtual_font_type) @@ -1616,6 +1617,7 @@ boolean is_letterspaced_font(internal_font_number f) return false; return true; } +#endif @ @c internal_font_number copy_font_info(internal_font_number f) diff --git a/Build/source/texk/web2c/luatexdir/font/vfpacket.w b/Build/source/texk/web2c/luatexdir/font/vfpacket.w index eb28fcdcc4c..8a222e04c04 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfpacket.w +++ b/Build/source/texk/web2c/luatexdir/font/vfpacket.w @@ -23,7 +23,7 @@ static const char _svn_version[] = "$Id: vfpacket.w 3584 2010-04-02 17:45:55Z hhenkel $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/vfpacket.w $"; + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/vfpacket.w $"; @ The |do_vf_packet| procedure is called in order to interpret the diff --git a/Build/source/texk/web2c/luatexdir/font/writecff.w b/Build/source/texk/web2c/luatexdir/font/writecff.w index 91d1f3c9af2..afbf9ef8ff9 100644 --- a/Build/source/texk/web2c/luatexdir/font/writecff.w +++ b/Build/source/texk/web2c/luatexdir/font/writecff.w @@ -25,7 +25,7 @@ static const char _svn_version[] = "$Id: writecff.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writecff.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writecff.w $"; @ @c #define get_offset(s,n) get_unsigned(s, (n)) diff --git a/Build/source/texk/web2c/luatexdir/font/writeenc.w b/Build/source/texk/web2c/luatexdir/font/writeenc.w index 1b98c824970..b8db3e9791b 100644 --- a/Build/source/texk/web2c/luatexdir/font/writeenc.w +++ b/Build/source/texk/web2c/luatexdir/font/writeenc.w @@ -22,8 +22,8 @@ #include "ptexlib.h" static const char _svn_version[] = - "$Id: writeenc.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writeenc.w $"; + "$Id: writeenc.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writeenc.w $"; @ All encoding entries go into AVL tree for fast search by name. @c @@ -37,7 +37,7 @@ static int comp_fe_entry(const void *pa, const void *pb, void *p) return strcmp(((const fe_entry *) pa)->name, ((const fe_entry *) pb)->name); } -fe_entry *new_fe_entry(void) +static fe_entry *new_fe_entry(void) { fe_entry *fe; fe = xtalloc(1, fe_entry); @@ -48,7 +48,7 @@ fe_entry *new_fe_entry(void) return fe; } -fe_entry *lookup_fe_entry(char *s) +static fe_entry *lookup_fe_entry(char *s) { fe_entry fe; assert(s != NULL); @@ -60,7 +60,7 @@ fe_entry *lookup_fe_entry(char *s) return (fe_entry *) avl_find(fe_tree, &fe); } -void register_fe_entry(fe_entry * fe) +static void register_fe_entry(fe_entry * fe) { void **aa; if (fe_tree == NULL) { @@ -88,7 +88,7 @@ fe_entry *get_fe_entry(char *s) } @ @c -void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree, +static void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree, int fe_objnum) { int i_old, *p; @@ -116,7 +116,7 @@ void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree, pdf_end_dict(pdf); } -void write_fontencoding(PDF pdf, fe_entry * fe) +static void write_fontencoding(PDF pdf, fe_entry * fe) { assert(fe != NULL); write_enc(pdf, fe->glyph_names, fe->tx_tree, fe->fe_objnum); diff --git a/Build/source/texk/web2c/luatexdir/font/writefont.w b/Build/source/texk/web2c/luatexdir/font/writefont.w index 523cae59740..d130b976bf1 100644 --- a/Build/source/texk/web2c/luatexdir/font/writefont.w +++ b/Build/source/texk/web2c/luatexdir/font/writefont.w @@ -20,8 +20,8 @@ @ @c static const char _svn_version[] = - "$Id: writefont.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writefont.w $"; + "$Id: writefont.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writefont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -66,7 +66,7 @@ static int comp_fd_entry(const void *pa, const void *pb, void *p) @ initialize data structure for /Type /Font @c -fo_entry *new_fo_entry(void) +static fo_entry *new_fo_entry(void) { fo_entry *fo; fo = xtalloc(1, fo_entry); @@ -227,7 +227,7 @@ fd_entry *lookup_fd_entry(char *s) return (fd_entry *) avl_find(fd_tree, &fd); } -fd_entry *lookup_fontdescriptor(fo_entry * fo) +static fd_entry *lookup_fontdescriptor(fo_entry * fo) { assert(fo != NULL); assert(fo->fm != NULL); @@ -248,7 +248,7 @@ void register_fd_entry(fd_entry * fd) assert(aa != NULL); } -void create_fontdescriptor(fo_entry * fo, internal_font_number f) +static void create_fontdescriptor(fo_entry * fo, internal_font_number f) { assert(fo != NULL); assert(fo->fm != NULL); @@ -268,7 +268,7 @@ from external reencoding (.enc) file and collect these in the glyph tree |gl_tree| of font descriptor |fd| referenced by font dictionary |fo|. @c -void mark_reenc_glyphs(fo_entry * fo, internal_font_number f) +static void mark_reenc_glyphs(fo_entry * fo, internal_font_number f) { int i; char **g; @@ -294,7 +294,7 @@ Function |mark_chars| has 2 uses: \item 2. Mark encoding pairs used by \TeX\ to optimize encoding vector. @c -struct avl_table *mark_chars(fo_entry * fo, struct avl_table *tx_tree, +static struct avl_table *mark_chars(fo_entry * fo, struct avl_table *tx_tree, internal_font_number f) { int i, *j; @@ -316,7 +316,7 @@ struct avl_table *mark_chars(fo_entry * fo, struct avl_table *tx_tree, @ @c -void get_char_range(fo_entry * fo, internal_font_number f) +static void get_char_range(fo_entry * fo, internal_font_number f) { int i; assert(fo != NULL); @@ -384,7 +384,7 @@ static void write_charwidth_array(PDF pdf, fo_entry * fo, @ Remark: Font objects from embedded PDF files are never registered into |fo_tree|; they are individually written out. @c -fo_entry *lookup_fo_entry(char *s) +static fo_entry *lookup_fo_entry(char *s) { fo_entry fo; fm_entry fm; @@ -398,7 +398,7 @@ fo_entry *lookup_fo_entry(char *s) return (fo_entry *) avl_find(fo_tree, &fo); } -void register_fo_entry(fo_entry * fo) +static void register_fo_entry(fo_entry * fo) { void **aa; if (fo_tree == NULL) { @@ -561,7 +561,7 @@ static void write_fontdescriptor(PDF pdf, fd_entry * fd) pdf_end_dict(pdf); } -void write_fontdescriptors(PDF pdf) +static void write_fontdescriptors(PDF pdf) { fd_entry *fd; struct avl_traverser t; @@ -575,7 +575,7 @@ void write_fontdescriptors(PDF pdf) @ @c -void write_fontdictionary(PDF pdf, fo_entry * fo) +static void write_fontdictionary(PDF pdf, fo_entry * fo) { assert(fo != NULL); assert(fo->fm != NULL); @@ -623,7 +623,7 @@ void write_fontdictionary(PDF pdf, fo_entry * fo) pdf_end_dict(pdf); } -void write_fontdictionaries(PDF pdf) +static void write_fontdictionaries(PDF pdf) { fo_entry *fo; struct avl_traverser t; @@ -827,7 +827,7 @@ void do_pdf_font(PDF pdf, internal_font_number f) at this point in the program. @c -int comp_glw_entry(const void *pa, const void *pb, void *p +static int comp_glw_entry(const void *pa, const void *pb, void *p __attribute__ ((unused))) { unsigned short i, j; @@ -838,7 +838,7 @@ int comp_glw_entry(const void *pa, const void *pb, void *p return 0; } -void create_cid_fontdescriptor(fo_entry * fo, internal_font_number f) +static void create_cid_fontdescriptor(fo_entry * fo, internal_font_number f) { assert(fo != NULL); assert(fo->fm != NULL); diff --git a/Build/source/texk/web2c/luatexdir/font/writet1.w b/Build/source/texk/web2c/luatexdir/font/writet1.w index 69ac40bac04..ccb2196c451 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet1.w +++ b/Build/source/texk/web2c/luatexdir/font/writet1.w @@ -20,8 +20,8 @@ @ @c static const char _svn_version[] = - "$Id: writet1.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writet1.w $"; + "$Id: writet1.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writet1.w $"; #include "ptexlib.h" #include <string.h> @@ -353,7 +353,8 @@ char **load_enc_file(char *enc_name) } @ @c -void free_glyph_names(char **glyph_names) +#if 0 +static void free_glyph_names(char **glyph_names) { int i; assert(glyph_names != NULL); @@ -362,7 +363,7 @@ void free_glyph_names(char **glyph_names) xfree(glyph_names[i]); xfree(glyph_names); } - +#endif static void t1_check_pfa(void) { @@ -760,7 +761,7 @@ static void copy_glyph_names(char **glyph_names, int a, int b) @ read encoding from Type1 font file, return |glyph_names| array, or |pdffail()| @c -char **t1_builtin_enc(void) +static char **t1_builtin_enc(void) { int i, a, b, c, counter = 0; char *r, *p, **glyph_names; @@ -1304,7 +1305,7 @@ static int comp_t1_glyphs(const void *pa, const void *pb, void *p return strcmp(*(const char *const *) pa, *(const char *const *) pb); } -struct avl_table *create_t1_glyph_tree(char **glyph_names) +static struct avl_table *create_t1_glyph_tree(char **glyph_names) { int i; void **aa; @@ -1322,7 +1323,7 @@ struct avl_table *create_t1_glyph_tree(char **glyph_names) return gl_tree; } -void destroy_t1_glyph_tree(struct avl_table *gl_tree) +static void destroy_t1_glyph_tree(struct avl_table *gl_tree) { assert(gl_tree != NULL); avl_destroy(gl_tree, NULL); diff --git a/Build/source/texk/web2c/luatexdir/font/writet3.w b/Build/source/texk/web2c/luatexdir/font/writet3.w index 9301ba5f4f3..b138df57c94 100644 --- a/Build/source/texk/web2c/luatexdir/font/writet3.w +++ b/Build/source/texk/web2c/luatexdir/font/writet3.w @@ -21,7 +21,7 @@ @ @c static const char _svn_version[] = "$Id: writet3.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writet3.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writet3.w $"; #include "ptexlib.h" #include <kpathsea/tex-glyph.h> diff --git a/Build/source/texk/web2c/luatexdir/font/writettf.w b/Build/source/texk/web2c/luatexdir/font/writettf.w index bbeb346c020..2a7c5c644c0 100644 --- a/Build/source/texk/web2c/luatexdir/font/writettf.w +++ b/Build/source/texk/web2c/luatexdir/font/writettf.w @@ -24,8 +24,8 @@ #include <string.h> static const char _svn_version[] = - "$Id: writettf.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writettf.w $"; + "$Id: writettf.w 3612 2010-04-13 09:29:42Z taco $ " +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writettf.w $"; #define DEFAULT_NTABS 14 #define NEW_CMAP_SIZE 2 @@ -410,7 +410,7 @@ static const char *newtabnames[] = { @ Back to code. Low-level helpers first. @c -ttf_cmap_entry *new_ttf_cmap_entry(void) +static ttf_cmap_entry *new_ttf_cmap_entry(void) { ttf_cmap_entry *e; e = xtalloc(1, ttf_cmap_entry); @@ -1763,7 +1763,7 @@ void writettf(PDF pdf, fd_entry * fd) cur_file_name = NULL; } -void do_writeotf(PDF pdf, fd_entry * fd) +static void do_writeotf(PDF pdf, fd_entry * fd) { long i; dirtab_entry *tab; diff --git a/Build/source/texk/web2c/luatexdir/font/writetype0.w b/Build/source/texk/web2c/luatexdir/font/writetype0.w index f902ad89a2a..818a23b5ca1 100644 --- a/Build/source/texk/web2c/luatexdir/font/writetype0.w +++ b/Build/source/texk/web2c/luatexdir/font/writetype0.w @@ -24,7 +24,7 @@ static const char _svn_version[] = "$Id: writetype0.w 3584 2010-04-02 17:45:55Z hhenkel $ " -"$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writetype0.w $"; +"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writetype0.w $"; @ @c void writetype0(PDF pdf, fd_entry * fd) diff --git a/Build/source/texk/web2c/luatexdir/font/writetype2.w b/Build/source/texk/web2c/luatexdir/font/writetype2.w index 5081d9f0986..66b97f7d201 100644 --- a/Build/source/texk/web2c/luatexdir/font/writetype2.w +++ b/Build/source/texk/web2c/luatexdir/font/writetype2.w @@ -27,7 +27,7 @@ #include "font/tt_glyf.h" static const char _svn_version[] = - "$Id: writetype2.w 3584 2010-04-02 17:45:55Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/font/writetype2.w $"; + "$Id: writetype2.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/font/writetype2.w $"; @ forward declaration @c @@ -237,7 +237,7 @@ static struct { }; -unsigned long ttc_read_offset(sfnt * sfont, int ttc_idx) +static unsigned long ttc_read_offset(sfnt * sfont, int ttc_idx) { ULONG version; unsigned long offset = 0; |