summaryrefslogtreecommitdiff
path: root/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea')
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea105
1 files changed, 105 insertions, 0 deletions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea
new file mode 100644
index 00000000000..23a25bd8696
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea
@@ -0,0 +1,105 @@
+diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w cjkutils-4.8.2/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w 2009-10-01 00:04:37.000000000 +0200
++++ cjkutils-4.8.2/hbf2gf/hbf2gf.w 2010-12-17 21:38:32.783541781 +0100
+@@ -71,8 +71,6 @@
+ @s HBF_BBOX int
+
+ @s __inline__ int
+-@s DllImport int
+-@s KPSEDLL int
+
+
+ @* Introduction.
+@@ -408,6 +406,9 @@
+
+ @
+ @<Include files@>=
++#ifdef HAVE_CONFIG_H
++#include <c-auto.h>
++#endif
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -2461,21 +2462,13 @@
+
+ We support three searching engines: emtexdir, kpathsea, and MiKTeX (which is
+ a Win32 port of kpathsea). For emtexdir, define |HAVE_EMTEXDIR| while
+-compiling. For kpathsea, define |HAVE_LIBKPATHSEA|. If you have a version of
+-kpathsea older than~3.2, define |OLD_KPATHSEA| additionally. For kpathsea
+-older than~3.0, |VERY_OLD_KPATHSEA| must be also set. For MikTeX, define
++compiling. For kpathsea, define |HAVE_LIBKPATHSEA|. For MikTeX, define
+ |HAVE_MIKTEX|. If none of these macros is defined, a simple |fopen()| will
+ be used instead.
+
+ @<Include files@>=
+ #if defined(HAVE_LIBKPATHSEA)
+-#ifdef VERY_OLD_KPATHSEA
+-#include "kpathsea/proginit.h"
+-#include "kpathsea/progname.h"
+-#include "kpathsea/tex-glyph.h"
+-#else
+ #include "kpathsea/kpathsea.h"
+-#endif@#
+
+ #elif defined(HAVE_EMTEXDIR)
+ #include "emtexdir.h"
+@@ -2486,14 +2479,7 @@
+
+ @
+ @<Global variables@>=
+-#if defined(HAVE_LIBKPATHSEA)
+-#ifdef KPSEDLL
+-/* this is kpathsea 3.3 and newer */
+-extern KPSEDLL char *kpathsea_version_string;
+-#else
+-extern DllImport char *kpathsea_version_string;
+-#endif
+-#elif defined(HAVE_EMTEXDIR)
++#if defined(HAVE_EMTEXDIR)
+ char emtex_version_string[] = "emTeXdir";
+ #elif !defined(HAVE_MIKTEX)
+ char no_version_string[] = "no search library";
+@@ -2599,17 +2585,8 @@
+
+ @<Initialize \TeX\ file searching@>=
+ #if defined(HAVE_LIBKPATHSEA)
+-#ifdef OLD_KPATHSEA
+- kpse_set_progname(argv[0]);
+-#else
+ kpse_set_program_name(argv[0], "hbf2gf");
+-#endif@#
+-
+-#ifdef VERY_OLD_KPATHSEA
+- kpse_init_prog("HBF2GF", 300, "cx", true, "cmr10");
+-#else
+ kpse_init_prog("HBF2GF", 300, "cx", "cmr10");@#
+-#endif@#
+
+ #elif defined(HAVE_EMTEXDIR)
+ if(!dir_setup(&cfg_path, "HBFCFG", NULL, EDS_BANG))
+@@ -2643,25 +2620,13 @@
+ #if defined(HAVE_LIBKPATHSEA)
+ char *TeX_search_cfg_file(char *name)
+ {
+-#ifdef OLD_KPATHSEA
+- return kpse_find_file(name, kpse_dvips_config_format, TRUE);
+-#else
+ return kpse_find_file(name, kpse_program_text_format, TRUE);
+-#endif
+ }@#
+
+
+ char *TeX_search_hbf_file(char *name)
+ {
+-#ifdef VERY_OLD_KPATHSEA
+- return kpse_find_file(name, kpse_dvips_header_format, TRUE);
+-#else
+-#ifndef KPSEDLL
+- return kpse_find_file(name, kpse_type1_format, TRUE);
+-#else
+ return kpse_find_file(name, kpse_miscfonts_format, TRUE);
+-#endif
+-#endif
+ }@#
+
+