summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL23
-rw-r--r--Build/source/texk/xdvipdfmx/src/fontmap.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/fontmap.h2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfcolor.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfcolor.h3
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfdev.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfdev.h2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfdraw.c9
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfdraw.h8
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdffont.c4
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdffont.h4
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfobj.c9
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfobj.h8
-rw-r--r--Build/source/texk/xdvipdfmx/src/type0.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/type0.h2
15 files changed, 79 insertions, 3 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 5173f5c65cd..c7527823070 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,29 @@
ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
=================================================
+2012-09-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * fontmap.c: unused function pdf_clear_fontmaps
+ * fontmap.h: unused function pdf_clear_fontmaps
+ * pdfcolor.c: unused functions pdf_get_colorspace_num_components,
+ pdf_get_colorspace_subtype
+ * pdfcolor.h: unused functions pdf_get_colorspace_num_components,
+ pdf_get_colorspace_subtype
+ * pdfdev.c: unused functions pdf_dev_currentfont, pdf_dev_get_font_ptsize
+ * pdfdev.h: unused functions pdf_dev_currentfont, pdf_dev_get_font_ptsize
+ * pdfdraw.c: unused functions static int pdf_coord__itransform,
+ pdf_dev_setflat, pdf_dev_itransform, pdf_dev_rectstroke
+ * pdfdraw.h: unused functions pdf_dev_setflat, pdf_dev_itransform,
+ pdf_dev_rectstroke
+ * pdffont.c: unused functions pdf_get_font_fontname, pdf_font_get_flags
+ * pdffont.h: unused functions pdf_get_font_fontname, pdf_font_get_flags
+ * pdfobj.c: unused functions pdf_put_array, pdf_shift_array,
+ pdf_pop_array, pdf_put_dict, pdf_stream_set_flags, pdf_stream_get_flags
+ * pdfobj.h: unused functions pdf_put_array, pdf_shift_array,
+ pdf_pop_array, pdf_put_dict, pdf_stream_set_flags, pdf_stream_get_flags
+ * type0.c: unused function Type0Font_get_encoding
+ * type0.h: unused function Type0Font_get_encoding
+
2012-09-06 Khaled Hosny <khaledhosny@eglug.org>
* configure.ac, src/fontmap.c, src/Makefile.am: Remove FontConfig
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c
index da236ac947d..308bcc1ecce 100644
--- a/Build/source/texk/xdvipdfmx/src/fontmap.c
+++ b/Build/source/texk/xdvipdfmx/src/fontmap.c
@@ -1300,12 +1300,14 @@ pdf_close_fontmaps (void)
release_sfd_record();
}
+#if 0
void
pdf_clear_fontmaps (void)
{
pdf_close_fontmaps();
pdf_init_fontmaps();
}
+#endif
/* CIDFont options
*
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.h b/Build/source/texk/xdvipdfmx/src/fontmap.h
index 75de62374d1..d549c806a0f 100644
--- a/Build/source/texk/xdvipdfmx/src/fontmap.h
+++ b/Build/source/texk/xdvipdfmx/src/fontmap.h
@@ -87,7 +87,9 @@ typedef struct fontmap_rec {
extern void pdf_fontmap_set_verbose (void);
extern void pdf_init_fontmaps (void);
+#if 0
extern void pdf_clear_fontmaps (void);
+#endif
extern void pdf_close_fontmaps (void);
extern void pdf_init_fontmap_record (fontmap_rec *mrec);
diff --git a/Build/source/texk/xdvipdfmx/src/pdfcolor.c b/Build/source/texk/xdvipdfmx/src/pdfcolor.c
index f194c2f7cd8..e354116aa8c 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfcolor.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfcolor.c
@@ -1452,6 +1452,7 @@ pdf_get_colorspace_reference (int cspc_id)
return pdf_link_obj(colorspace->reference);
}
+#if 0
int
pdf_get_colorspace_num_components (int cspc_id)
{
@@ -1496,6 +1497,7 @@ pdf_get_colorspace_subtype (int cspc_id)
return colorspace->subtype;
}
+#endif /* 0 */
void
pdf_init_colors (void)
diff --git a/Build/source/texk/xdvipdfmx/src/pdfcolor.h b/Build/source/texk/xdvipdfmx/src/pdfcolor.h
index 769d7e52a5c..74225e4b2e9 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfcolor.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfcolor.h
@@ -74,8 +74,11 @@ extern void pdf_init_colors (void);
extern void pdf_close_colors (void);
extern pdf_obj *pdf_get_colorspace_reference (int cspc_id);
+
+#if 0
extern int pdf_get_colorspace_num_components (int cspc_id);
extern int pdf_get_colorspace_subtype (int cspc_id);
+#endif
/* Not working */
extern int pdf_colorspace_load_ICCBased (const char *ident,
diff --git a/Build/source/texk/xdvipdfmx/src/pdfdev.c b/Build/source/texk/xdvipdfmx/src/pdfdev.c
index 24727d12944..68c3e627dc2 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfdev.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfdev.c
@@ -838,6 +838,7 @@ dev_set_font (int font_id)
/* Access text state parameters.
*/
+#if 0
int
pdf_dev_currentfont (void)
{
@@ -856,6 +857,7 @@ pdf_dev_get_font_ptsize (int font_id)
return 1.0;
}
+#endif /* 0 */
int
pdf_dev_get_font_wmode (int font_id)
diff --git a/Build/source/texk/xdvipdfmx/src/pdfdev.h b/Build/source/texk/xdvipdfmx/src/pdfdev.h
index 4934f053e5e..be925e5c9a9 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfdev.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfdev.h
@@ -164,8 +164,10 @@ extern void pdf_dev_set_origin (double orig_x, double orig_y);
extern double pdf_dev_scale (void);
/* Access text state parameters. */
+#if 0
extern int pdf_dev_currentfont (void); /* returns font_id */
extern double pdf_dev_get_font_ptsize (int font_id);
+#endif /* 0 */
extern int pdf_dev_get_font_wmode (int font_id); /* ps: special support want this (pTeX). */
/* Text composition (direction) mode
diff --git a/Build/source/texk/xdvipdfmx/src/pdfdraw.c b/Build/source/texk/xdvipdfmx/src/pdfdraw.c
index 55de69b1866..3eae1d882cc 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfdraw.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfdraw.c
@@ -138,6 +138,7 @@ pdf_coord__transform (pdf_coord *p, const pdf_tmatrix *M)
return 0;
}
+#if 0
static /* __inline__ */ int
pdf_coord__itransform (pdf_coord *p, const pdf_tmatrix *M)
{
@@ -155,6 +156,7 @@ pdf_coord__itransform (pdf_coord *p, const pdf_tmatrix *M)
return 0;
}
+#endif /* 0 */
static /* __inline__ */ int
pdf_coord__dtransform (pdf_coord *p, const pdf_tmatrix *M)
@@ -1417,6 +1419,7 @@ pdf_dev_setdash (int count, double *pattern, double offset)
return 0;
}
+#if 0
int
pdf_dev_setflat (int flatness)
{
@@ -1436,6 +1439,7 @@ pdf_dev_setflat (int flatness)
return 0;
}
+#endif /* 0 */
/* ZSYUEDVEDEOF */
int
@@ -1672,6 +1676,7 @@ pdf_dev_transform (pdf_coord *p, const pdf_tmatrix *M)
return;
}
+#if 0
void
pdf_dev_itransform (pdf_coord *p, const pdf_tmatrix *M)
{
@@ -1685,6 +1690,7 @@ pdf_dev_itransform (pdf_coord *p, const pdf_tmatrix *M)
return;
}
+#endif /* 0 */
int
pdf_dev_arc (double c_x , double c_y, double r,
@@ -1756,7 +1762,7 @@ pdf_dev_bspline (double x0, double y0,
return pdf_path__curveto(cpa, cpt, &p1, &p2, &p3);
}
-
+#if 0
int
pdf_dev_rectstroke (double x, double y,
double w, double h,
@@ -1772,6 +1778,7 @@ pdf_dev_rectstroke (double x, double y,
return pdf_dev__rectshape(NULL, &r, M, 'S');
}
+#endif /* 0 */
int
pdf_dev_rectfill (double x, double y,
diff --git a/Build/source/texk/xdvipdfmx/src/pdfdraw.h b/Build/source/texk/xdvipdfmx/src/pdfdraw.h
index 863f952da1f..0dfe449e28a 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfdraw.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfdraw.h
@@ -71,7 +71,9 @@ extern int pdf_dev_setlinejoin (int style);
extern int pdf_dev_setdash (int count,
double *pattern,
double offset);
+#if 0
extern int pdf_dev_setflat (int flatness);
+#endif /* 0 */
/* Path Construction */
extern int pdf_dev_moveto (double x , double y);
@@ -104,11 +106,13 @@ extern int pdf_dev_newpath (void);
extern int pdf_dev_clip (void);
extern int pdf_dev_eoclip (void);
-
+#if 0
extern int pdf_dev_rectstroke (double x, double y,
double w, double h,
const pdf_tmatrix *M /* optional */
);
+#endif /* 0 */
+
extern int pdf_dev_rectfill (double x, double y, double w, double h);
extern int pdf_dev_rectclip (double x, double y, double w, double h);
extern int pdf_dev_rectadd (double x, double y, double w, double h);
@@ -125,7 +129,9 @@ extern int pdf_dev_concat (const pdf_tmatrix *M);
extern void pdf_dev_dtransform (pdf_coord *p, const pdf_tmatrix *M);
extern void pdf_dev_idtransform (pdf_coord *p, const pdf_tmatrix *M);
extern void pdf_dev_transform (pdf_coord *p, const pdf_tmatrix *M);
+#if 0
extern void pdf_dev_itransform (pdf_coord *p, const pdf_tmatrix *M);
+#endif /* 0 */
extern int pdf_dev_gsave (void);
extern int pdf_dev_grestore (void);
diff --git a/Build/source/texk/xdvipdfmx/src/pdffont.c b/Build/source/texk/xdvipdfmx/src/pdffont.c
index 25907106d49..3866ed15f16 100644
--- a/Build/source/texk/xdvipdfmx/src/pdffont.c
+++ b/Build/source/texk/xdvipdfmx/src/pdffont.c
@@ -374,6 +374,7 @@ pdf_get_font_subtype (int font_id)
return font->subtype;
}
+#if 0
char *
pdf_get_font_fontname (int font_id)
{
@@ -385,6 +386,7 @@ pdf_get_font_fontname (int font_id)
return font->fontname;
}
+#endif /* 0 */
int
pdf_get_font_encoding (int font_id)
@@ -929,6 +931,7 @@ pdf_font_get_flag (pdf_font *font, int mask)
return ((font->flags & mask) ? 1 : 0);
}
+#if 0
int
pdf_font_get_flags (pdf_font *font)
{
@@ -936,6 +939,7 @@ pdf_font_get_flags (pdf_font *font)
return font->flags;
}
+#endif /* 0 */
double
pdf_font_get_param (pdf_font *font, int param_type)
diff --git a/Build/source/texk/xdvipdfmx/src/pdffont.h b/Build/source/texk/xdvipdfmx/src/pdffont.h
index 1312b01c14d..91dca225ffa 100644
--- a/Build/source/texk/xdvipdfmx/src/pdffont.h
+++ b/Build/source/texk/xdvipdfmx/src/pdffont.h
@@ -66,7 +66,9 @@ extern int pdf_get_font_subtype (int font_id);
extern pdf_obj *pdf_get_font_reference (int font_id);
extern char *pdf_get_font_usedchars (int font_id);
+#if 0
extern char *pdf_get_font_fontname (int font_id); /* without unique tag */
+#endif /* 0 */
extern int pdf_get_font_encoding (int font_id);
extern int pdf_get_font_wmode (int font_id);
extern unsigned short *pdf_get_font_ft_to_gid (int font_id);
@@ -90,7 +92,9 @@ extern char *pdf_font_get_usedchars (pdf_font *font);
extern int pdf_font_get_encoding (pdf_font *font);
extern int pdf_font_get_flag (pdf_font *font, int mask);
+#if 0
extern int pdf_font_get_flags (pdf_font *font);
+#endif /* 0 */
extern double pdf_font_get_param (pdf_font *font, int type);
extern int pdf_font_get_index (pdf_font *font);
diff --git a/Build/source/texk/xdvipdfmx/src/pdfobj.c b/Build/source/texk/xdvipdfmx/src/pdfobj.c
index efde7bd3005..23069ceb9c5 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfobj.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfobj.c
@@ -1216,6 +1216,7 @@ pdf_add_array (pdf_obj *array, pdf_obj *object)
return;
}
+#if 0
void
pdf_put_array (pdf_obj *array, unsigned idx, pdf_obj *object)
{
@@ -1268,6 +1269,7 @@ pdf_shift_array (pdf_obj *array)
return result;
}
+#endif /* 0 */
/* Prepend an object to an array */
void
@@ -1289,6 +1291,7 @@ pdf_unshift_array (pdf_obj *array, pdf_obj *object)
data->size++;
}
+#if 0
pdf_obj *
pdf_pop_array (pdf_obj *array)
{
@@ -1307,7 +1310,7 @@ pdf_pop_array (pdf_obj *array)
return result;
}
-
+#endif /* 0 */
static void
write_dict (pdf_dict *dict, FILE *file)
@@ -1397,6 +1400,7 @@ pdf_add_dict (pdf_obj *dict, pdf_obj *key, pdf_obj *value)
return 0;
}
+#if 0
void
pdf_put_dict (pdf_obj *dict, const char *key, pdf_obj *value)
{
@@ -1439,6 +1443,7 @@ pdf_put_dict (pdf_obj *dict, const char *key, pdf_obj *value)
data->value = value;
}
}
+#endif /* 0 */
/* pdf_merge_dict makes a link for each item in dict2 before stealing it */
void
@@ -1875,6 +1880,7 @@ pdf_stream_uncompress (pdf_obj *src) {
return dst;
}
+#if 0
void
pdf_stream_set_flags (pdf_obj *stream, int flags)
{
@@ -1897,6 +1903,7 @@ pdf_stream_get_flags (pdf_obj *stream)
return data->_flags;
}
+#endif /* 0 */
static void
pdf_write_obj (pdf_obj *object, FILE *file)
diff --git a/Build/source/texk/xdvipdfmx/src/pdfobj.h b/Build/source/texk/xdvipdfmx/src/pdfobj.h
index fb0f58d5e74..413579f825c 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfobj.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfobj.h
@@ -105,13 +105,17 @@ extern pdf_obj *pdf_new_array (void);
* pdf_put_dict(dict, key, value)
*/
extern void pdf_add_array (pdf_obj *array, pdf_obj *object);
+#if 0
extern void pdf_put_array (pdf_obj *array, unsigned idx, pdf_obj *object);
+#endif /* 0 */
extern pdf_obj *pdf_get_array (pdf_obj *array, long idx);
extern unsigned pdf_array_length (pdf_obj *array);
extern void pdf_unshift_array (pdf_obj *array, pdf_obj *object);
+#if 0
extern pdf_obj *pdf_shift_array (pdf_obj *array);
extern pdf_obj *pdf_pop_array (pdf_obj *array);
+#endif /* 0 */
extern pdf_obj *pdf_new_dict (void);
extern void pdf_remove_dict (pdf_obj *dict, const char *key);
@@ -127,7 +131,9 @@ extern pdf_obj *pdf_dict_keys (pdf_obj *dict);
* already removed that.
*/
extern int pdf_add_dict (pdf_obj *dict, pdf_obj *key, pdf_obj *value);
+#if 0
extern void pdf_put_dict (pdf_obj *dict, const char *key, pdf_obj *value);
+#endif /* 0 */
/* Apply proc(key, value, pdata) for each key-value pairs in dict, stop if proc()
* returned non-zero value (and that value is returned). PDF object is passed for
@@ -149,8 +155,10 @@ extern int pdf_add_stream_flate (pdf_obj *stream,
extern int pdf_concat_stream (pdf_obj *dst, pdf_obj *src);
extern pdf_obj *pdf_stream_dict (pdf_obj *stream);
extern long pdf_stream_length (pdf_obj *stream);
+#if 0
extern void pdf_stream_set_flags (pdf_obj *stream, int flags);
extern int pdf_stream_get_flags (pdf_obj *stream);
+#endif /* 0 */
extern const void *pdf_stream_dataptr (pdf_obj *stream);
#if 0
diff --git a/Build/source/texk/xdvipdfmx/src/type0.c b/Build/source/texk/xdvipdfmx/src/type0.c
index bb1b12f135b..dfdc3d51605 100644
--- a/Build/source/texk/xdvipdfmx/src/type0.c
+++ b/Build/source/texk/xdvipdfmx/src/type0.c
@@ -290,6 +290,7 @@ Type0Font_get_wmode (Type0Font *font)
return font->wmode;
}
+#if 0
char *
Type0Font_get_encoding (Type0Font *font)
{
@@ -297,6 +298,7 @@ Type0Font_get_encoding (Type0Font *font)
return font->encoding;
}
+#endif /* 0 */
char *
Type0Font_get_usedchars (Type0Font *font)
diff --git a/Build/source/texk/xdvipdfmx/src/type0.h b/Build/source/texk/xdvipdfmx/src/type0.h
index c3999ecd977..9e57878f61e 100644
--- a/Build/source/texk/xdvipdfmx/src/type0.h
+++ b/Build/source/texk/xdvipdfmx/src/type0.h
@@ -33,7 +33,9 @@ typedef struct Type0Font Type0Font;
extern void Type0Font_set_verbose (void);
extern int Type0Font_get_wmode (Type0Font *font);
+#if 0
extern char *Type0Font_get_encoding (Type0Font *font);
+#endif /* 0 */
extern char *Type0Font_get_usedchars (Type0Font *font);
extern pdf_obj *Type0Font_get_resource (Type0Font *font);