~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for PFB files. This seems to have caused me to completely
[sgt/halibut]
/
paper.h
diff --git
a/paper.h
b/paper.h
index
03b0f1b
..
29d6407
100644
(file)
--- a/
paper.h
+++ b/
paper.h
@@
-12,8
+12,14
@@
#define UNITS_PER_PT 1000
#define FUNITS_PER_PT 1000.0
#define UNITS_PER_PT 1000
#define FUNITS_PER_PT 1000.0
+/* Glyphs are represented by integer indicies into a table of names. */
+typedef unsigned short glyph;
+#define NOGLYPH 0xFFFF
+
typedef struct document_Tag document;
typedef struct document_Tag document;
+typedef struct glyph_width_Tag glyph_width;
typedef struct kern_pair_Tag kern_pair;
typedef struct kern_pair_Tag kern_pair;
+typedef struct ligature_Tag ligature;
typedef struct font_info_Tag font_info;
typedef struct font_data_Tag font_data;
typedef struct font_encoding_Tag font_encoding;
typedef struct font_info_Tag font_info;
typedef struct font_data_Tag font_data;
typedef struct font_encoding_Tag font_encoding;
@@
-41,16
+47,32
@@
struct document_Tag {
};
/*
};
/*
+ * This data structure represents the normal width of a single glyph
+ * in a font.
+ */
+struct glyph_width_Tag {
+ glyph glyph;
+ int width;
+};
+
+/*
* This data structure represents a kerning pair within a font.
*/
struct kern_pair_Tag {
* This data structure represents a kerning pair within a font.
*/
struct kern_pair_Tag {
- /* Glyph indices
, in font_data.glyphs
. */
-
unsigned short
left, right;
+ /* Glyph indices. */
+
glyph
left, right;
/* Kern amount, in internal units. */
int kern;
};
/*
/* Kern amount, in internal units. */
int kern;
};
/*
+ * ... and this one represents a ligature.
+ */
+struct ligature_Tag {
+ glyph left, right, lig;
+};
+
+/*
* This data structure holds static information about a font that doesn't
* depend on the particular document. It gets generated when the font's
* metrics are read in.
* This data structure holds static information about a font that doesn't
* depend on the particular document. It gets generated when the font's
* metrics are read in.
@@
-65,24
+87,15
@@
struct font_info_Tag {
*/
const char *name;
/*
*/
const char *name;
/*
- *
The file containing this
font, if any.
+ *
Pointer to data about the file containing the
font, if any.
*/
*/
- FILE *fp;
- /*
- * An array of pointers to the available glyph names, and their
- * corresponding character widths. These two arrays have
- * parallel indices.
- */
- int nglyphs;
- const char *const *glyphs;
- const int *widths;
- /*
- * Glyph indices sorted into glyph-name order, for name-to-index
- * mapping.
- */
- unsigned short *glyphsbyname;
+ void *fontfile;
+ /* A tree of glyph_widths */
+ tree234 *widths;
/* A tree of kern_pairs */
tree234 *kerns;
/* A tree of kern_pairs */
tree234 *kerns;
+ /* ... and one of ligatures */
+ tree234 *ligs;
/*
* For reasonably speedy lookup, we set up a 65536-element
* table representing the Unicode BMP (I can conveniently
/*
* For reasonably speedy lookup, we set up a 65536-element
* table representing the Unicode BMP (I can conveniently
@@
-90,7
+103,7
@@
struct font_info_Tag {
* know that no glyph in the Adobe Glyph List falls outside
* it), whose elements are indices into the above two arrays.
*/
* know that no glyph in the Adobe Glyph List falls outside
* it), whose elements are indices into the above two arrays.
*/
-
unsigned short
bmp[65536];
+
glyph
bmp[65536];
/*
* Various bits of metadata needed for the /FontDescriptor dictionary
* in PDF.
/*
* Various bits of metadata needed for the /FontDescriptor dictionary
* in PDF.
@@
-113,12
+126,12
@@
struct font_data_Tag {
font_info const *info;
/*
* At some point I'm going to divide the font into sub-fonts
font_info const *info;
/*
* At some point I'm going to divide the font into sub-fonts
- * with largely non-overlapping encoding vectors. This
array
+ * with largely non-overlapping encoding vectors. This
tree
* will track which glyphs go into which subfonts. Also here I
* keep track of the latest subfont of any given font, so I can
* go back and extend its encoding.
*/
* will track which glyphs go into which subfonts. Also here I
* keep track of the latest subfont of any given font, so I can
* go back and extend its encoding.
*/
-
subfont_map_entry
*subfont_map;
+
tree234
*subfont_map;
font_encoding *latest_subfont;
/*
* The font list to which this font belongs.
font_encoding *latest_subfont;
/*
* The font list to which this font belongs.
@@
-141,8
+154,7
@@
struct font_encoding_Tag {
char *name; /* used by client backends */
font_data *font; /* the parent font structure */
char *name; /* used by client backends */
font_data *font; /* the parent font structure */
- const char *vector[256]; /* the actual encoding vector */
- int indices[256]; /* indices back into main font struct */
+ glyph vector[256]; /* the actual encoding vector */
wchar_t to_unicode[256]; /* PDF will want to know this */
int free_pos; /* space left to extend encoding */
};
wchar_t to_unicode[256]; /* PDF will want to know this */
int free_pos; /* space left to extend encoding */
};
@@
-208,6
+220,11
@@
struct para_data_Tag {
JUST, LEFT, RIGHT
} justification;
/*
JUST, LEFT, RIGHT
} justification;
/*
+ * Sometimes (in code paragraphs) we want to override the flags
+ * passed to render_string().
+ */
+ unsigned extraflags;
+ /*
* For constructing the page outline.
*/
int outline_level; /* 0=title 1=C 2=H 3=S 4=S2... */
* For constructing the page outline.
*/
int outline_level; /* 0=title 1=C 2=H 3=S 4=S2... */
@@
-357,15
+374,17
@@
struct outline_element_Tag {
/*
* Functions exported from bk_paper.c
*/
/*
* Functions exported from bk_paper.c
*/
+int width_cmp(void *, void *); /* use when setting up widths */
int kern_cmp(void *, void *); /* use when setting up kern_pairs */
int kern_cmp(void *, void *); /* use when setting up kern_pairs */
-void font_index_glyphs(font_info *fi);
-int find_glyph(font_info *fi, char const *name);
-
+int lig_cmp(void *, void *); /* use when setting up ligatures */
+int find_width(font_data *, glyph);
/*
* Functions and data exported from psdata.c.
*/
/*
* Functions and data exported from psdata.c.
*/
-wchar_t ps_glyph_to_unicode(char const *glyph);
+glyph glyph_intern(char const *);
+char const *glyph_extern(glyph);
+wchar_t ps_glyph_to_unicode(glyph);
extern const char *const ps_std_glyphs[];
void init_std_fonts(void);
const int *ps_std_font_widths(char const *fontname);
extern const char *const ps_std_glyphs[];
void init_std_fonts(void);
const int *ps_std_font_widths(char const *fontname);
@@
-376,4
+395,11
@@
const kern_pair *ps_std_font_kerns(char const *fontname);
*/
char *pdf_outline_convert(wchar_t *s, int *len);
*/
char *pdf_outline_convert(wchar_t *s, int *len);
+/*
+ * Backend functions exported by in_pf.c
+ */
+void pf_part1(font_info *fi, char **bufp, size_t *lenp);
+void pf_part2(font_info *fi, char **bufp, size_t *lenp);
+void pf_writeps(font_info const *fi, FILE *ofp);
+
#endif
#endif