From a7b11fef21bc9bec8d0e46a597091bc3cf2ea9aa Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 11 Mar 2011 10:27:22 +0000 Subject: More trivial diffs between dvipdfmx and xdvipdfmx git-svn-id: svn://tug.org/texlive/trunk@21688 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvipdfmx/ChangeLog.TL | 4 ++++ Build/source/texk/xdvipdfmx/src/dpxconf.c | 5 +++-- Build/source/texk/xdvipdfmx/src/dpxconf.h | 4 +++- Build/source/texk/xdvipdfmx/src/numbers.c | 6 +++++- Build/source/texk/xdvipdfmx/src/numbers.h | 6 +++++- Build/source/texk/xdvipdfmx/src/pdfresource.c | 6 +++++- Build/source/texk/xdvipdfmx/src/pdfresource.h | 6 +++++- Build/source/texk/xdvipdfmx/src/pst_obj.c | 4 +++- Build/source/texk/xdvipdfmx/src/pst_obj.h | 4 +++- Build/source/texk/xdvipdfmx/src/tfm.c | 6 +++++- Build/source/texk/xdvipdfmx/src/tfm.h | 7 +++++-- Build/source/texk/xdvipdfmx/src/tt_table.h | 8 +++++--- 12 files changed, 51 insertions(+), 15 deletions(-) diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index dbb47c46ca2..222ef7b0257 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -5,6 +5,10 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx * src/dpxcrypt.c: Sync with dvipdfmx. + * src/dpxconf.[ch], src/numbers.[ch], src/pdfresource.[ch], + src/pst_obj.[ch], src/tfm.[ch], src/tt_table.h: Remove more + trivial diffs with dvipdfmx (unused functions). + 2011-03-10 Peter Breitenlohner * src/cff_dict.h, src/cff_types.h, src/cmap.c, src/cmap_write.c, diff --git a/Build/source/texk/xdvipdfmx/src/dpxconf.c b/Build/source/texk/xdvipdfmx/src/dpxconf.c index e77165b2fab..5b8670310d6 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxconf.c +++ b/Build/source/texk/xdvipdfmx/src/dpxconf.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/dpxconf.c,v 1.2 2008/05/22 10:08:02 matthias Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/dpxconf.c,v 1.4 2009/05/10 16:39:53 matthias Exp $ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. @@ -94,6 +94,7 @@ paperinfo (const char *ppformat) #endif /* HAVE_LIBPAPER */ +#if 0 void dumppaperinfo (void) { @@ -108,4 +109,4 @@ dumppaperinfo (void) ppinfo = papernext(ppinfo); } } - +#endif diff --git a/Build/source/texk/xdvipdfmx/src/dpxconf.h b/Build/source/texk/xdvipdfmx/src/dpxconf.h index 8e097d93533..63a73ddef4f 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxconf.h +++ b/Build/source/texk/xdvipdfmx/src/dpxconf.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/dpxconf.h,v 1.1 2005/07/20 10:41:54 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/dpxconf.h,v 1.2 2008/11/30 21:12:27 matthias Exp $ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. @@ -55,6 +55,8 @@ extern const struct paper *paperinfo (const char *ppformat); #define systempapersizefile() NULL #endif /* HAVE_LIBPAPER */ +#if 0 extern void dumppaperinfo (void); +#endif #endif /* _DPXCONF_H_ */ diff --git a/Build/source/texk/xdvipdfmx/src/numbers.c b/Build/source/texk/xdvipdfmx/src/numbers.c index 2a0b2c3a0c2..4b1a56524d3 100644 --- a/Build/source/texk/xdvipdfmx/src/numbers.c +++ b/Build/source/texk/xdvipdfmx/src/numbers.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/numbers.c,v 1.8 2004/03/03 13:19:00 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/numbers.c,v 1.9 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -35,10 +35,12 @@ UNSIGNED_BYTE get_unsigned_byte (FILE *file) return (UNSIGNED_BYTE) ch; } +#if 0 UNSIGNED_BYTE sget_unsigned_byte (char *s) { return *((unsigned char *) s); } +#endif SIGNED_BYTE get_signed_byte (FILE *file) { @@ -168,6 +170,7 @@ SIGNED_QUAD sqxfw (SIGNED_QUAD sq, fixword fw) return (sign > 0) ? result : result * -1L; } +#if 0 SIGNED_QUAD axboverc (SIGNED_QUAD n1, SIGNED_QUAD n2, SIGNED_QUAD divide) { int sign = 1; @@ -221,4 +224,5 @@ SIGNED_QUAD axboverc (SIGNED_QUAD n1, SIGNED_QUAD n2, SIGNED_QUAD divide) result += 1; return (sign>0)?result:-result; } +#endif diff --git a/Build/source/texk/xdvipdfmx/src/numbers.h b/Build/source/texk/xdvipdfmx/src/numbers.h index 9e6b2306508..485794cd5be 100644 --- a/Build/source/texk/xdvipdfmx/src/numbers.h +++ b/Build/source/texk/xdvipdfmx/src/numbers.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/numbers.h,v 1.9 2005/07/20 10:41:54 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/numbers.h,v 1.10 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -35,7 +35,9 @@ typedef long UNSIGNED_TRIPLE, SIGNED_TRIPLE, SIGNED_QUAD; typedef unsigned long UNSIGNED_QUAD; extern UNSIGNED_BYTE get_unsigned_byte (FILE *); +#if 0 extern UNSIGNED_BYTE sget_unsigned_byte (char *); +#endif extern SIGNED_BYTE get_signed_byte (FILE *); extern UNSIGNED_PAIR get_unsigned_pair (FILE *); extern UNSIGNED_PAIR sget_unsigned_pair (unsigned char *); @@ -48,7 +50,9 @@ extern UNSIGNED_QUAD get_unsigned_quad (FILE *); typedef signed long fixword; extern SIGNED_QUAD sqxfw (SIGNED_QUAD sq, fixword fw); +#if 0 extern SIGNED_QUAD axboverc (SIGNED_QUAD n1, SIGNED_QUAD n2, SIGNED_QUAD divide); +#endif #ifndef MAX # define MAX(a,b) ((a)>(b)?(a):(b)) diff --git a/Build/source/texk/xdvipdfmx/src/pdfresource.c b/Build/source/texk/xdvipdfmx/src/pdfresource.c index b79974e0ddd..e55a9737aa6 100644 --- a/Build/source/texk/xdvipdfmx/src/pdfresource.c +++ b/Build/source/texk/xdvipdfmx/src/pdfresource.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/pdfresource.c,v 1.8 2004/09/05 13:30:05 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/pdfresource.c,v 1.9 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -256,6 +256,7 @@ pdf_defineresource (const char *category, return (long) ((cat_id << 16)|(res_id)); } +#if 0 int pdf_resource_exist (const char *category, const char *resname) { @@ -281,6 +282,7 @@ pdf_resource_exist (const char *category, const char *resname) return 0; } +#endif long pdf_findresource (const char *category, const char *resname) @@ -342,6 +344,7 @@ pdf_get_resource_reference (long rc_id) return pdf_link_obj(res->reference); } +#if 0 pdf_obj * pdf_get_resource (long rc_id) { @@ -371,3 +374,4 @@ pdf_get_resource (long rc_id) return res->object; } +#endif diff --git a/Build/source/texk/xdvipdfmx/src/pdfresource.h b/Build/source/texk/xdvipdfmx/src/pdfresource.h index 38fc8189b09..199d22d1665 100644 --- a/Build/source/texk/xdvipdfmx/src/pdfresource.h +++ b/Build/source/texk/xdvipdfmx/src/pdfresource.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/pdfresource.h,v 1.6 2004/09/05 13:30:05 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/pdfresource.h,v 1.7 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -35,9 +35,13 @@ extern void pdf_close_resources (void); extern long pdf_defineresource (const char *category, const char *resname, pdf_obj *object, int flags); extern long pdf_findresource (const char *category, const char *resname); +#if 0 extern int pdf_resource_exist (const char *category, const char *resname); +#endif extern pdf_obj *pdf_get_resource_reference (long res_id); +#if 0 extern pdf_obj *pdf_get_resource (long res_id); +#endif #endif /* _PDF_RESOURCE_H_ */ diff --git a/Build/source/texk/xdvipdfmx/src/pst_obj.c b/Build/source/texk/xdvipdfmx/src/pst_obj.c index 1b0793bc562..8b82d8d4ecb 100644 --- a/Build/source/texk/xdvipdfmx/src/pst_obj.c +++ b/Build/source/texk/xdvipdfmx/src/pst_obj.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/pst_obj.c,v 1.8 2008/05/22 10:08:02 matthias Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/pst_obj.c,v 1.10 2011/03/06 03:14:15 chofchof Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -594,6 +594,7 @@ pst_name_release (pst_name *obj) RELEASE(obj); } +#if 0 int pst_name_is_valid (const char *name) { @@ -633,6 +634,7 @@ pst_name_encode (const char *name) return encoded_name; } +#endif pst_obj * pst_parse_name (unsigned char **inbuf, unsigned char *inbufend) /* / is required */ diff --git a/Build/source/texk/xdvipdfmx/src/pst_obj.h b/Build/source/texk/xdvipdfmx/src/pst_obj.h index dbd5afdff89..cfa0c849302 100644 --- a/Build/source/texk/xdvipdfmx/src/pst_obj.h +++ b/Build/source/texk/xdvipdfmx/src/pst_obj.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/pst_obj.h,v 1.3 2004/03/14 04:23:04 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/pst_obj.h,v 1.4 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -33,7 +33,9 @@ extern pst_obj *pst_parse_name (unsigned char **inbuf, unsigned char *inbufend extern pst_obj *pst_parse_number (unsigned char **inbuf, unsigned char *inbufend); extern pst_obj *pst_parse_string (unsigned char **inbuf, unsigned char *inbufend); +#if 0 extern int pst_name_is_valid (const char *name); extern char *pst_name_encode (const char *name); +#endif #endif /* _PST_OBJ_H_ */ diff --git a/Build/source/texk/xdvipdfmx/src/tfm.c b/Build/source/texk/xdvipdfmx/src/tfm.c index e5fee9e7d88..16043c44d57 100644 --- a/Build/source/texk/xdvipdfmx/src/tfm.c +++ b/Build/source/texk/xdvipdfmx/src/tfm.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/tfm.c,v 1.22 2007/11/17 18:08:58 matthias Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/tfm.c,v 1.23 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -1058,6 +1058,7 @@ tfm_get_width (int font_id, SIGNED_QUAD ch) return ((double) tfm_get_fw_width(font_id, ch)/FWBASE); } +#if 0 double tfm_get_height (int font_id, SIGNED_QUAD ch) { @@ -1069,6 +1070,7 @@ tfm_get_depth (int font_id, SIGNED_QUAD ch) { return ((double) tfm_get_fw_depth(font_id, ch)/FWBASE); } +#endif /* tfm_string_xxx() do not work for OFM... */ fixword @@ -1160,6 +1162,7 @@ tfm_get_design_size (int font_id) return (double) (fms[font_id].designsize)/FWBASE*(72.0/72.27); } +#if 0 char * tfm_get_codingscheme (int font_id) { @@ -1184,6 +1187,7 @@ tfm_is_vert (int font_id) return 0; } #endif /* !WITHOUT_ASCII_PTEX */ +#endif int tfm_exists (const char *tfm_name) diff --git a/Build/source/texk/xdvipdfmx/src/tfm.h b/Build/source/texk/xdvipdfmx/src/tfm.h index e3306a49e82..0f32734bc78 100644 --- a/Build/source/texk/xdvipdfmx/src/tfm.h +++ b/Build/source/texk/xdvipdfmx/src/tfm.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/tfm.h,v 1.11 2004/09/11 14:50:29 hirata Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/tfm.h,v 1.12 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -33,8 +33,10 @@ extern int tfm_open (const char * tex_name, int must_exist); extern void tfm_close_all (void); extern double tfm_get_width (int font_id, SIGNED_QUAD ch); +#if 0 extern double tfm_get_height (int font_id, SIGNED_QUAD ch); extern double tfm_get_depth (int font_id, SIGNED_QUAD ch); +#endif extern fixword tfm_get_fw_width (int font_id, SIGNED_QUAD ch); extern fixword tfm_get_fw_height (int font_id, SIGNED_QUAD ch); @@ -48,9 +50,10 @@ extern double tfm_get_space (int font_id); /* From TFM header */ extern double tfm_get_design_size (int font_id); +#if 0 extern char *tfm_get_codingscheme (int font_id); - extern int tfm_is_vert (int font_id); +#endif extern int tfm_exists (const char *tfm_name); diff --git a/Build/source/texk/xdvipdfmx/src/tt_table.h b/Build/source/texk/xdvipdfmx/src/tt_table.h index 30679a78a56..7db97123fff 100644 --- a/Build/source/texk/xdvipdfmx/src/tt_table.h +++ b/Build/source/texk/xdvipdfmx/src/tt_table.h @@ -1,8 +1,8 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/tt_table.h,v 1.7 2007/02/14 05:56:43 chofchof Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/tt_table.h,v 1.8 2008/11/30 21:12:27 matthias Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team This program is free software; you can redistribute it and/or modify @@ -175,7 +175,9 @@ extern char *tt_pack_maxp_table (struct tt_maxp_table *table); extern struct tt_maxp_table *tt_read_maxp_table (sfnt *sfont); /* vhea */ +#if 0 extern char *tt_pack_vhea_table (struct tt_vhea_table *table); +#endif extern struct tt_vhea_table *tt_read_vhea_table (sfnt *sfont); /* VORG */ @@ -183,7 +185,7 @@ extern struct tt_VORG_table *tt_read_VORG_table (sfnt *sfont); /* hmtx and vmtx */ extern struct tt_longMetrics *tt_read_longMetrics (sfnt *sfont, - USHORT numGlyphs, USHORT numLongMetrics, USHORT numExSideBearings); + USHORT numGlyphs, USHORT numLongMetrics, USHORT numExSideBearings); /* OS/2 table */ extern struct tt_os2__table *tt_read_os2__table (sfnt *sfont); -- cgit v1.2.3