summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/font/luatexfont.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font/luatexfont.h')
-rw-r--r--Build/source/texk/web2c/luatexdir/font/luatexfont.h80
1 files changed, 37 insertions, 43 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/luatexfont.h b/Build/source/texk/web2c/luatexdir/font/luatexfont.h
index 987517266ed..fa2d2ac6c6d 100644
--- a/Build/source/texk/web2c/luatexdir/font/luatexfont.h
+++ b/Build/source/texk/web2c/luatexdir/font/luatexfont.h
@@ -1,6 +1,6 @@
/* luatexfont.h --- General font definitions
- Copyright 2008 Taco Hoekwater <taco@luatex.org>
+ Copyright 2008-2010 Taco Hoekwater <taco@luatex.org>
This file is part of LuaTeX.
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
-/* $Id: luatexfont.h 2332 2009-04-18 17:17:56Z hhenkel $ */
+/* $Id: luatexfont.h 3433 2010-02-20 10:03:04Z hhenkel $ */
#ifndef LUATEXFONT_H
# define LUATEXFONT_H
@@ -83,19 +83,18 @@ typedef struct {
} intparm;
typedef struct {
- integer fe_objnum; /* object number */
+ int fe_objnum; /* object number */
char *name; /* encoding file name */
char **glyph_names; /* array of glyph names */
struct avl_table *tx_tree; /* tree of encoding positions marked as used by TeX */
} fe_entry;
typedef struct fd_entry_ {
- integer fd_objnum; /* object number of the font descriptor object */
+ int fd_objnum; /* object number of the font descriptor object */
char *fontname; /* /FontName (without subset tag) */
char *subset_tag; /* 6-character subset tag */
boolean ff_found;
- integer ff_objnum; /* object number of the font program stream */
- integer fn_objnum; /* font name object number (embedded PDF) */
+ int ff_objnum; /* object number of the font program stream */
boolean all_glyphs; /* embed all glyphs? */
boolean write_ttf_glyph_names;
intparm font_dim[FONT_KEYS_NUM];
@@ -107,16 +106,16 @@ typedef struct fd_entry_ {
} fd_entry;
typedef struct fo_entry_ {
- integer fo_objnum; /* object number of the font dictionary */
- internalfontnumber tex_font; /* needed only for \pdffontattr{} */
+ int fo_objnum; /* object number of the font dictionary */
+ internal_font_number tex_font; /* needed only for \pdffontattr{} */
fm_entry *fm; /* pointer to font map structure for this font dictionary */
fd_entry *fd; /* pointer to /FontDescriptor object structure */
fe_entry *fe; /* pointer to encoding structure */
- integer cw_objnum; /* object number of the font program object */
- integer first_char; /* first character used in this font */
- integer last_char; /* last character used in this font */
+ int cw_objnum; /* object number of the font program object */
+ int first_char; /* first character used in this font */
+ int last_char; /* last character used in this font */
struct avl_table *tx_tree; /* tree of non-reencoded TeX characters marked as used */
- integer tounicode_objnum; /* object number of ToUnicode */
+ int tounicode_objnum; /* object number of ToUnicode */
} fo_entry;
typedef struct {
@@ -132,7 +131,7 @@ typedef struct glw_entry_ { /* subset glyphs for inclusion in CID-based font
} glw_entry;
typedef struct {
- integer charcode, cwidth, cheight, xoff, yoff, xescape, rastersize;
+ int charcode, cwidth, cheight, xoff, yoff, xescape, rastersize;
halfword *raster;
} chardesc;
@@ -141,41 +140,38 @@ typedef struct {
# include "texfont.h"
/* tounicode.c */
-integer write_cid_tounicode(fo_entry * fo, internalfontnumber f);
+int write_cid_tounicode(PDF, fo_entry *, internal_font_number);
void glyph_unicode_free(void);
void def_tounicode(str_number, str_number);
-integer write_tounicode(char **, char *);
+int write_tounicode(PDF, char **, char *);
/* vfpacket.c */
-void replace_packet_fonts(internal_font_number f, integer * old_fontid,
- integer * new_fontid, int count);
-integer *packet_local_fonts(internal_font_number f, integer * num);
+void replace_packet_fonts(internal_font_number f, int *old_fontid,
+ int *new_fontid, int count);
+int *packet_local_fonts(internal_font_number f, int *num);
-/* writeccf.c */
-void writetype1w(fd_entry * fd);
+/* writecff.c */
+void writetype1w(PDF pdf, fd_entry * fd);
/* writetype0.c */
-void writetype0(fd_entry * fd);
+void writetype0(PDF pdf, fd_entry * fd);
/* writefont.c */
-void do_pdf_font(integer, internalfontnumber);
-fd_entry *lookup_fd_entry(char *, integer, integer);
+void do_pdf_font(PDF, internal_font_number);
+fd_entry *lookup_fd_entry(char *);
fd_entry *new_fd_entry(void);
-void write_fontstuff(void);
-integer get_fd_objnum(fd_entry * fd);
-integer get_fn_objnum(fd_entry * fd);
-void embed_whole_font(fd_entry * fd);
+void write_fontstuff(PDF);
void register_fd_entry(fd_entry * fd);
/* writet1.c */
boolean t1_subset(char *, char *, unsigned char *);
char **load_enc_file(char *);
-void writet1(fd_entry *);
+void writet1(PDF, fd_entry *);
void t1_free(void);
-extern integer t1_length1, t1_length2, t1_length3;
+extern int t1_length1, t1_length2, t1_length3;
/* writetype2.c */
-void writetype2(fd_entry * fd);
+void writetype2(PDF, fd_entry *);
extern unsigned long cidtogid_obj;
pdf_obj *pdf_new_stream(void);
void pdf_add_stream(pdf_obj * stream, unsigned char *buf, long len);
@@ -188,37 +184,35 @@ boolean handle_subfont_fm(fm_entry *, int);
/* writeenc.c */
fe_entry *get_fe_entry(char *);
void enc_free(void);
-void write_fontencodings(void);
+void write_fontencodings(PDF pdf);
/* writettf.c */
-void writettf(fd_entry *);
-void writeotf(fd_entry *);
+void writettf(PDF, fd_entry *);
+void writeotf(PDF, fd_entry *);
void ttf_free(void);
-extern integer ttf_length;
+extern int ttf_length;
/* pkin.c */
int readchar(boolean, chardesc *);
/* macnames.c */
-extern const char notdef[];
+extern char notdef[];
/* vfovf.c */
void vf_expand_local_fonts(internal_font_number f);
internal_font_number letter_space_font(halfword u, internal_font_number f,
- integer e);
-internal_font_number auto_expand_font(internal_font_number f, integer e);
-str_number expand_font_name(internal_font_number f, integer e);
-void pdf_check_vf_cur_val(void);
+ int e);
+internal_font_number auto_expand_font(internal_font_number f, int e);
+void pdf_check_vf(internal_font_number f);
internal_font_number copy_font_info(internal_font_number f);
/* writet3.c */
extern FILE *t3_file;
-void writet3(int, internalfontnumber);
-scaled get_pk_char_width(internalfontnumber, scaled);
+void writet3(PDF, internal_font_number);
extern unsigned char *t3_buffer;
-extern integer t3_size;
-extern integer t3_curbyte;
+extern int t3_size;
+extern int t3_curbyte;
# define t3_read_file() readbinfile(t3_file, &t3_buffer, &t3_size)
# define t3_close() xfclose(t3_file, cur_file_name)