summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog56
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/libpdftex.am2
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am33
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftosrc.am5
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/ttf2afm.am5
-rw-r--r--Build/source/texk/web2c/pdftexdir/mapfile.c2
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.ch18
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc25
-rw-r--r--Build/source/texk/web2c/pdftexdir/ptexlib.h2
-rw-r--r--Build/source/texk/web2c/pdftexdir/ttf2afm.c51
-rw-r--r--Build/source/texk/web2c/pdftexdir/utils.c4
11 files changed, 152 insertions, 51 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index fd510692aa4..7e2e88ac07e 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,7 +1,60 @@
+2009-10-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftoepdf.cc: Adapt to poppler-0.12.
+
+ * FIXME: epdf.h, ptexlib.h: Multiple prototypes for pdftex_fail,
+ pdftex_warn, and probably others.
+
+2009-10-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am, am/ttf2afm.am: Enable compiler warnings.
+
+ * mapfile.c, ptexlib.h: Declare pdfinitmapfile() param string
+ as const.
+ * pdftex.ch (get_strings_started): Drop unused variables.
+ * ttf2afm.c: All functions: ANSI C definition, declare as static.
+ (ttf_fail): Declare as noreturn.
+ (ttf_fail, ttf_warn, name_lookup, ttf_seek_tab, ttf_seek_off):
+ Declare param strings as const.
+ (get_kern_value): Comment out unused function.
+
+2009-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftex.ch (do_extension): Recover variables unused by TeX.
+
2009-09-16 Han The Thanh <hanthethanh@gmail.com>
* writettf.c: patch for TTC from Liu Yubao <yubao.liu@gmail.com>
+2009-09-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am: Adapt to new makecpool with one argument.
+
+2009-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/libpdftex.am, am/pdftosrc.am: Prepare compiler warnings.
+
+2009-08-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * utils.c: #include <kpathsea/version.h> and drop extern decls.
+
+2009-08-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ttf2afm.am (ttf2afm_DEPENDENCIES): Use default_dependencies.
+
+2009-08-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am: SyncTeX now integrated into ../texmfmp.h.
+
+2009-08-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am (pdf_tangle): Use tangle-sh.
+ Adapt to tangle-sh and web2c-sh.
+
+2009-08-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am (pdftex_c_h): avoid to split the C code.
+
2009-08-12 Karl Berry <karl@tug.org>
* pdftex.web (sup_dest_names_size): increase to 500000;
@@ -19,13 +72,12 @@
* pdftex.web: bugfix from Hartmut: fix \pdfobj file {foo} for files
foo that don't end with '\n'
-
2009-06-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* epdf.h, ttf2afm.c, writet1.c:
removed #include <kpathsea/c-proto.h>.
* avlstuff.c, epdf.c: removed #include <kpathsea/c-proto.h> and
- #include <stdarg.h>.
+ #include <stdarg.h>.
2009-06-23 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
index e51220cae5b..e488d50a721 100644
--- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -8,6 +8,8 @@
EXTRA_LIBRARIES += libpdftex.a
libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
+libpdftex_a_CFLAGS = # $(WARNING_CFLAGS)
+libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
libpdftex_a_SOURCES = \
pdftexdir/avl.c \
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 3f2ddbeb8ca..4df0ae01081 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -11,7 +11,7 @@ pdftex_cppflags += -I$(srcdir)/pdftexdir
pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS)
pdftex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a
-pdftex_dependencies = $(proglib)
+pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND)
pdftex_dependencies += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND)
pdftex_dependencies += $(OBSDCOMPAT_DEPEND) libmd5.a
@@ -22,36 +22,35 @@ bin_PROGRAMS += pdftex
endif PDFTEX
EXTRA_PROGRAMS += pdftex
-## Force Automake to use CXXLD for linking
+# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
-pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
+pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
pdftex_CPPFLAGS = $(pdftex_cppflags)
+pdftex_CFLAGS = $(WARNING_CFLAGS)
+pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
-## With --enable-ipc, pdfTeX may need to link with -lsocket.
+# With --enable-ipc, pdfTeX may need to link with -lsocket.
pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h
+pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c pdftexdir/pdftexextra.h
$(pdftex_c_h): pdftex-web2c
+ @$(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
- $(web2c) pdftex
- : $(synctex_convert_pdftex)
- echo timestamp >$@
- touch $(pdftex_c_h)
+ @$(web2c) pdftex
pdftexextra.c: pdftexd.h pdftexdir/pdftexextra.h lib/texmfmp.c pdftexd.h
sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@
pdftex.p pdftex.pool: pdftex-tangle
-pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch
- $(pdf_tangle) pdftex pdftex
- echo timestamp >$@
- touch pdftex.p pdftex.pool
-pdftex-pool.c: pdftex.pool $(makecpool_stamp) pdftexdir/ptexlib.h pdftexd.h
- $(makecpool) pdftex.pool pdftexdir/ptexlib.h >$@ || rm -f $@
-## Extract pdftex version
+ @$(pdf_tangle) pdftex pdftex
+pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
+ @$(pdf_tangle) pdftex pdftex
+pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
+ $(makecpool) pdftex >$@ || rm -f $@
+# Extract pdftex version
pdftexdir/pdftex.version: pdftexdir/pdftex.web
$(mkdir_p) pdftexdir
grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
@@ -60,7 +59,7 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd
sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
-e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
$(srcdir)/pdftexdir/pdftexextra.in >$@
-## Generate pdftex.ch
+# Generate pdftex.ch
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
pdftex_ch_srcs = \
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
index d2ccdfff813..78f2015c860 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
@@ -10,10 +10,11 @@ bin_PROGRAMS += pdftosrc
endif PDFTEX
EXTRA_PROGRAMS += pdftosrc
-## Force Automake to use CXXLD for linking
+# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
pdftosrc_CPPFLAGS = $(pdftex_cppflags)
+pdftosrc_CXXFLAGS = # $(WARNING_CXXFLAGS)
pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
@@ -21,5 +22,5 @@ pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libpdftex.a
+$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libpdftex.a
diff --git a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
index c93bab94217..12e31675c41 100644
--- a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
+++ b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
@@ -10,9 +10,12 @@ bin_PROGRAMS += ttf2afm
endif PDFTEX
EXTRA_PROGRAMS += ttf2afm
-ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir
+ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir
+ttf2afm_CFLAGS = $(WARNING_CFLAGS)
ttf2afm_SOURCES = pdftexdir/ttf2afm.c
+ttf2afm_DEPENDENCIES = $(default_dependencies)
+
## included by pdftexdir/ttf2afm.c
EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c
index f19c4dde883..e0851e1f2a1 100644
--- a/Build/source/texk/web2c/pdftexdir/mapfile.c
+++ b/Build/source/texk/web2c/pdftexdir/mapfile.c
@@ -801,7 +801,7 @@ void pdfmapline(integer t)
flushstr(lasttokensstring);
}
-void pdfinitmapfile(string map_name)
+void pdfinitmapfile(const_string map_name)
{
assert(mitem == NULL);
mitem = xtalloc(1, mapitem);
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.ch b/Build/source/texk/web2c/pdftexdir/pdftex.ch
index b5e18ce67c5..3acc599c4d3 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.ch
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.ch
@@ -40,6 +40,15 @@
@z
@x
+@!m,@!n:text_char; {characters input from |pool_file|}
+@!g:str_number; {garbage}
+@!a:integer; {accumulator for check sum}
+@!c:boolean; {check sum has been checked}
+@y
+@!g:str_number; {garbage}
+@z
+
+@x
@ @d bad_pool(#)==begin wake_up_terminal; write_ln(term_out,#);
a_close(pool_file); get_strings_started:=false; return;
end
@@ -461,6 +470,15 @@ font_ptr:=null_font; fmem_ptr:=7;
make_pdftex_banner;
@z
+% i, j, q, and r are unused by TeX but required for pdfTeX
+@x [53.1348] (do_extension)
+var k:integer; {all-purpose integers}
+@!p:pointer; {all-purpose pointers}
+@y
+var i,@!j,@!k:integer; {all-purpose integers}
+@!p,@!q,@!r:pointer; {all-purpose pointers}
+@z
+
@x [53a.1379] l.??? -etex command line switch
@!init if (buffer[loc]="*")and(format_ident=" (INITEX)") then
@y
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index 25f42ccbf58..c2f7e8baf14 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -650,7 +650,11 @@ static void writeEncodings()
}
for (r = encodingList; r != 0; r = n) {
n = r->next;
+#ifdef POPPLER_VERSION
+ r->font->decRefCnt();
+#else
delete r->font;
+#endif
delete r;
}
}
@@ -690,7 +694,11 @@ read_pdf_info(char *image_name, char *page_name, integer page_num,
Page *page;
int rotate;
PDFRectangle *pagebox;
+#ifdef HAVE_GETPDFMAJORVERSION
+ int pdf_major_version_found, pdf_minor_version_found;
+#else
float pdf_version_found, pdf_version_wanted;
+#endif
// initialize
if (!isInit) {
globalParams = new GlobalParams();
@@ -705,9 +713,23 @@ read_pdf_info(char *image_name, char *page_name, integer page_num,
// this works only for PDF 1.x -- but since any versions of PDF newer
// than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
// then have to changed drastically anyway.
+#ifdef HAVE_GETPDFMAJORVERSION
+ pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
+ pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
+ if ((pdf_major_version_found > 1)
+ || (pdf_minor_version_found > minor_pdf_version_wanted)) {
+ const char *msg =
+ "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+ if (pdf_inclusion_errorlevel > 0) {
+ pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+ } else {
+ pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
+ }
+ }
+#else
pdf_version_found = pdf_doc->doc->getPDFVersion();
pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
- if (pdf_version_found > pdf_version_wanted) {
+ if (pdf_version_found > pdf_version_wanted + 0.01) {
char msg[] =
"PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
if (pdf_inclusion_errorlevel > 0) {
@@ -716,6 +738,7 @@ read_pdf_info(char *image_name, char *page_name, integer page_num,
pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
}
}
+#endif
epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
if (page_name) {
// get page by name
diff --git a/Build/source/texk/web2c/pdftexdir/ptexlib.h b/Build/source/texk/web2c/pdftexdir/ptexlib.h
index f6cc38a62ff..a925988392a 100644
--- a/Build/source/texk/web2c/pdftexdir/ptexlib.h
+++ b/Build/source/texk/web2c/pdftexdir/ptexlib.h
@@ -178,7 +178,7 @@ extern void fm_read_info(void);
extern ff_entry *check_ff_exist(char *, boolean);
extern void pdfmapfile(integer);
extern void pdfmapline(integer);
-extern void pdfinitmapfile(string map_name);
+extern void pdfinitmapfile(const_string map_name);
extern fm_entry *new_fm_entry(void);
extern void delete_fm_entry(fm_entry *);
extern int avl_do_entry(fm_entry *, int);
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
index 482ca875db5..0e3a0c30244 100644
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c
+++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
@@ -130,7 +130,10 @@ TTF_USHORT unicode_map[0xFFFF];
#include "macnames.c"
-void ttf_fail(char *fmt, ...)
+#if defined __GNUC__ && __GNUC__ >=3
+__attribute__((__noreturn__))
+#endif
+static void ttf_fail(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
@@ -144,7 +147,7 @@ void ttf_fail(char *fmt, ...)
exit(-1);
}
-void ttf_warn(char *fmt, ...)
+static void ttf_warn(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
@@ -157,7 +160,7 @@ void ttf_warn(char *fmt, ...)
va_end(args);
}
-int xgetc(FILE * stream)
+static int xgetc(FILE * stream)
{
int c = getc(stream);
if (c < 0 && c != EOF)
@@ -165,7 +168,7 @@ int xgetc(FILE * stream)
return c;
}
-long ttf_getnum(int s)
+static long ttf_getnum(int s)
{
long i = 0;
int c;
@@ -178,7 +181,7 @@ long ttf_getnum(int s)
return i;
}
-dirtab_entry *name_lookup(char *s)
+static dirtab_entry *name_lookup(const char *s)
{
dirtab_entry *p;
for (p = dir_tab; p - dir_tab < ntabs; p++)
@@ -189,7 +192,7 @@ dirtab_entry *name_lookup(char *s)
return p;
}
-void ttf_seek_tab(char *name, TTF_LONG offset)
+static void ttf_seek_tab(const char *name, TTF_LONG offset)
{
dirtab_entry *p = name_lookup(name);
if (p == NULL)
@@ -198,13 +201,13 @@ void ttf_seek_tab(char *name, TTF_LONG offset)
ttf_fail("fseek() failed while reading `%s' table", name);
}
-void ttf_seek_off(char *name, TTF_LONG offset)
+static void ttf_seek_off(const char *name, TTF_LONG offset)
{
if (fseek(fontfile, offset, SEEK_SET) < 0)
ttf_fail("fseek() failed while reading `%s' table", name);
}
-void store_kern_value(TTF_USHORT i, TTF_USHORT j, TTF_FWORD v)
+static void store_kern_value(TTF_USHORT i, TTF_USHORT j, TTF_FWORD v)
{
kern_entry *pk;
for (pk = kern_tab + i; pk->next != NULL; pk = pk->next);
@@ -215,7 +218,8 @@ void store_kern_value(TTF_USHORT i, TTF_USHORT j, TTF_FWORD v)
pk->value = v;
}
-TTF_FWORD get_kern_value(TTF_USHORT i, TTF_USHORT j)
+#if 0 /* unused */
+static TTF_FWORD get_kern_value(TTF_USHORT i, TTF_USHORT j)
{
kern_entry *pk;
for (pk = kern_tab + i; pk->next != NULL; pk = pk->next)
@@ -223,8 +227,9 @@ TTF_FWORD get_kern_value(TTF_USHORT i, TTF_USHORT j)
return pk->value;
return 0;
}
+#endif
-void free_tabs()
+static void free_tabs(void)
{
int i;
kern_entry *p, *q, *r;
@@ -256,7 +261,7 @@ void free_tabs()
xfree(kern_tab);
}
-void enc_getline()
+static void enc_getline(void)
{
char *p;
int c;
@@ -273,7 +278,7 @@ void enc_getline()
goto restart;
}
-void read_encoding(char *encname)
+static void read_encoding(char *encname)
{
char buf[ENC_BUF_SIZE], *q, *r;
int i;
@@ -319,7 +324,7 @@ void read_encoding(char *encname)
names_count, 256);
}
-void append_unicode(long glyph_index, TTF_USHORT code)
+static void append_unicode(long glyph_index, TTF_USHORT code)
{
mtx_entry *m;
unicode_entry *u, *v;
@@ -336,7 +341,7 @@ void append_unicode(long glyph_index, TTF_USHORT code)
}
}
-void read_cmap()
+static void read_cmap(void)
{
cmap_entry *e;
seg_entry *seg_tab, *s;
@@ -423,7 +428,7 @@ void read_cmap()
select_unicode, unicode_map_count);
}
-void read_font()
+static void read_font(void)
{
long i, j, k, l, n, m, platform_id, encoding_id;
TTF_FWORD kern_value;
@@ -487,7 +492,7 @@ void read_font()
switch (post_format) {
case 0x00010000:
for (pm = mtx_tab; pm - mtx_tab < NMACGLYPHS; pm++)
- pm->name = (char *) mac_glyph_names[pm - mtx_tab];
+ pm->name = mac_glyph_names[pm - mtx_tab];
break;
case 0x00020000:
l = get_ushort(); /* some fonts have this value different from nglyphs */
@@ -505,7 +510,7 @@ void read_font()
}
for (pm = mtx_tab; pm - mtx_tab < l; pm++) {
if (pm->index < NMACGLYPHS)
- pm->name = (char *) mac_glyph_names[pm->index];
+ pm->name = mac_glyph_names[pm->index];
else {
k = pm->index - NMACGLYPHS;
if (k < m) {
@@ -675,7 +680,7 @@ void read_font()
}
}
-int null_glyph(const char *s)
+static int null_glyph(const char *s)
{
return (s == NULL || s == notdef);
/*
@@ -686,7 +691,7 @@ int null_glyph(const char *s)
*/
}
-void print_glyph_name(FILE * f, long glyph_index, int convention)
+static void print_glyph_name(FILE * f, long glyph_index, int convention)
{
unicode_entry *u;
static char buf[1024];
@@ -732,7 +737,7 @@ void print_glyph_name(FILE * f, long glyph_index, int convention)
}
}
-void print_char_metric(FILE * f, int charcode, long glyph_index)
+static void print_char_metric(FILE * f, int charcode, long glyph_index)
{
assert(glyph_index >= 0 && glyph_index < nglyphs);
fprintf(f, "C %i ; WX %i ; N ", (int) charcode,
@@ -745,7 +750,7 @@ void print_char_metric(FILE * f, int charcode, long glyph_index)
(int) get_ttf_funit(mtx_tab[glyph_index].bbox[3]));
}
-void print_afm(char *date, char *fontname)
+static void print_afm(char *date, char *fontname)
{
int ncharmetrics;
mtx_entry *pm;
@@ -850,7 +855,7 @@ void print_afm(char *date, char *fontname)
fputs("EndFontMetrics\n", outfile);
}
-void print_encoding(char *fontname)
+static void print_encoding(char *fontname)
{
long int i, k, first_code, length;
FILE *file;
@@ -961,7 +966,7 @@ void print_encoding(char *fontname)
xfree(enc_name);
}
-void usage()
+static void usage(void)
{
cur_file_name = NULL;
fprintf(stderr,
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index ecdeb6b8aa9..ce0c9a2b42f 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -36,6 +36,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <kpathsea/c-proto.h>
#include <kpathsea/c-stat.h>
#include <kpathsea/c-fopen.h>
+#include <kpathsea/version.h>
#include <string.h>
#include <time.h>
#include <float.h> /* for DBL_EPSILON */
@@ -61,9 +62,6 @@ strnumber last_tex_string;
static char print_buf[PRINTF_BUF_SIZE];
static char *jobname_cstr = NULL;
static char *job_id_string = NULL;
-extern string ptexbanner; /* from web2c/lib/texmfmp.c */
-extern string versionstring; /* from web2c/lib/version.c */
-extern KPSEDLL string kpathsea_version_string; /* from kpathsea/version.c */
size_t last_ptr_index; /* for use with alloc_array */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 03:24:05 +0000