summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea/tex-glyph.h
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-16 15:13:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-16 15:13:07 +0000
commite967e0cc978d647040ac5616d389e9007d593464 (patch)
tree1f33ce27a77473b2e90b549d42399b73d4123497 /Build/source/texk/kpathsea/tex-glyph.h
parent49f1fb6887627cdb7cf524aaef9b92108c894381 (diff)
new reentrant kpathsea API (from Taco)
git-svn-id: svn://tug.org/texlive/trunk@12401 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea/tex-glyph.h')
-rw-r--r--Build/source/texk/kpathsea/tex-glyph.h27
1 files changed, 19 insertions, 8 deletions
diff --git a/Build/source/texk/kpathsea/tex-glyph.h b/Build/source/texk/kpathsea/tex-glyph.h
index c573ae0c302..5ee80276790 100644
--- a/Build/source/texk/kpathsea/tex-glyph.h
+++ b/Build/source/texk/kpathsea/tex-glyph.h
@@ -56,16 +56,11 @@ typedef struct
for kpse_fallback_name. Then fail. Return either the filename
found, or NULL. Also return information about the file found in
*GLYPH_FILE. */
-extern KPSEDLL string kpse_find_glyph P4H(const_string font_name, unsigned dpi,
+extern KPSEDLL string kpathsea_find_glyph (kpathsea kpse,
+ const_string font_name, unsigned dpi,
kpse_file_format_type format,
kpse_glyph_file_type *glyph_file);
-/* Look for a specific format only. */
-#define kpse_find_pk(font_name, dpi, glyph_file) \
- kpse_find_glyph (font_name, dpi, kpse_pk_format, glyph_file)
-#define kpse_find_gf(font_name, dpi, glyph_file) \
- kpse_find_glyph (font_name, dpi, kpse_gf_format, glyph_file)
-
/* Defines how far away a pixel file can be found from its stated size.
The DVI standard says any resolution within 0.2% of the stated size
@@ -73,6 +68,22 @@ extern KPSEDLL string kpse_find_glyph P4H(const_string font_name, unsigned dpi,
#define KPSE_BITMAP_TOLERANCE(r) ((r) / 500.0 + 1)
/* Check whether DPI1 is within KPSE_BITMAP_TOLERANCE of DPI2. */
-extern KPSEDLL boolean kpse_bitmap_tolerance P2H(double dpi1, double dpi2);
+extern KPSEDLL boolean kpathsea_bitmap_tolerance (kpathsea kpse,
+ double dpi1, double dpi2);
+
+
+#if defined (KPSE_COMPAT_API)
+extern KPSEDLL string kpse_find_glyph (const_string font_name, unsigned dpi,
+ kpse_file_format_type format,
+ kpse_glyph_file_type *glyph_file);
+
+/* Look for a specific format only. */
+#define kpse_find_pk(font_name, dpi, glyph_file) \
+ kpse_find_glyph (font_name, dpi, kpse_pk_format, glyph_file)
+#define kpse_find_gf(font_name, dpi, glyph_file) \
+ kpse_find_glyph (font_name, dpi, kpse_gf_format, glyph_file)
+
+extern KPSEDLL boolean kpse_bitmap_tolerance (double dpi1, double dpi2);
+#endif
#endif /* not KPATHSEA_TEX_GLYPH_H */