summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik/dvi-init.h
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-08 06:34:46 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-08 06:34:46 +0000
commit7e0f3484d8cd6eca4abe80d057391d14face5606 (patch)
tree92570fc98a476ecbf696c2ef16d046412d405995 /Build/source/texk/xdvik/dvi-init.h
parent824f7b0903de8ad7f6ee3d7656005e4c59155e06 (diff)
xdvik 22.86
git-svn-id: svn://tug.org/texlive/trunk@29732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik/dvi-init.h')
-rw-r--r--Build/source/texk/xdvik/dvi-init.h32
1 files changed, 22 insertions, 10 deletions
diff --git a/Build/source/texk/xdvik/dvi-init.h b/Build/source/texk/xdvik/dvi-init.h
index 01aabf48a0b..c762382c3fe 100644
--- a/Build/source/texk/xdvik/dvi-init.h
+++ b/Build/source/texk/xdvik/dvi-init.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990-2004 Paul Vojta and the xdvik development team
+ * Copyright (c) 1990-2013 Paul Vojta and the xdvik development team
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -27,6 +27,11 @@
#include "xdvi-config.h"
#include "xdvi.h"
+#if FREETYPE
+# include <ft2build.h>
+# include FT_FREETYPE_H
+#endif
+
typedef enum {
NO_ERROR = 0,
WRONG_DVI_VERSION,
@@ -74,7 +79,7 @@ struct bitmap {
/*
* Per-character information.
- * There is one of these for each character in a font (raster fonts only).
+ * There is one of these for each character in a font (non-virtual fonts only).
* All fields are filled in at font definition time,
* except for the bitmap, which is "faulted in"
* when the character is first referenced.
@@ -139,14 +144,14 @@ struct font {
float fsize; /* size information (dots per inch) */
int magstepval; /* magstep number * two, or NOMAGSTP */
FILE *file; /* open font file or NULL */
- char *filename; /* name of font file */
+ const char *filename; /* name of font file */
long checksum; /* checksum */
unsigned short timestamp; /* for LRU management of fonts */
ubyte flags; /* flags byte (see values below) */
wide_ubyte maxchar; /* largest character code */
double dimconv; /* size conversion factor */
set_char_proc set_char_p; /* proc used to set char */
- /* these fields are used by (loaded) raster fonts */
+ /* these fields are used by (loaded) non-virtual fonts */
read_char_proc read_char; /* function to read bitmap */
struct glyph *glyph;
/* these fields are used by (loaded) virtual fonts */
@@ -154,9 +159,13 @@ struct font {
struct tn *vf_chain; /* ditto, if TeXnumber >= VFTABLELEN */
struct font *first_font; /* first font defined */
struct macro *macro;
- /* These were added for t1 use */
- int t1id;
- double pixsize; /* scaled size of font in pixels */
+#if FREETYPE
+ /* these fields are used by (loaded) FreeType fonts */
+ struct ftfont *ft; /* master record for font (all sizes) */
+ double pixsize; /* scaled size of the font in pixels */
+ FT_Size size;
+ struct font *next_size; /* next font from same face */
+#endif
};
struct tn {
@@ -173,8 +182,7 @@ extern void full_reset_colors(void);
#endif
extern void realloc_font(struct font *, wide_ubyte);
extern void realloc_virtual_font(struct font *, wide_ubyte);
-extern Boolean load_font(struct font *,
- Boolean use_t1lib
+extern Boolean load_font(struct font *
#if DELAYED_MKTEXPK
, Boolean load_font_now
#endif
@@ -186,7 +194,7 @@ extern struct font *define_font(
Boolean initialize_fonts,
#else
Boolean load_font_now,
-#endif
+#endif
FILE *,
wide_ubyte,
struct font *,
@@ -206,6 +214,10 @@ extern void read_PK_index(struct font *, wide_bool);
extern void read_GF_index(struct font *, wide_bool);
extern unsigned long read_VF_index(struct font *, wide_bool);
+#if FREETYPE
+extern Boolean load_ft_font(struct font *fontp);
+#endif
+
extern Boolean set_paper_type(const char *arg);
extern Boolean find_postamble(FILE *fp, dviErrFlagT *errflag);