X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/538cf67d91d0af2833be725427797184338469ab..c358bf5b78279b66e43d78f51baeb0d3a255b88b:/halibut.h

diff --git a/halibut.h b/halibut.h
index bd9cc69..5a6c8fd 100644
--- a/halibut.h
+++ b/halibut.h
@@ -177,14 +177,15 @@ enum {
     attr_First  = 0x0001,	       /* the first of a series */
     attr_Last   = 0x0002,	       /* the last of a series */
     attr_Always	= 0x0003,	       /* any other part of a series */
-    attr_mask   = 0x0003,
+    attr_mask   = 0x0003
 };
 /* aux values for quote-type words */
 enum {
     quote_Open  = 0x0010,
     quote_Close = 0x0020,
-    quote_mask  = 0x0030,
+    quote_mask  = 0x0030
 };
+#define isvis(x) ( ( (x) >= word_Normal && (x) <= word_LowerXref ) )
 #define isattr(x) ( ( (x) > word_Normal && (x) < word_WhiteSpace ) || \
                     ( (x) > word_WhiteSpace && (x) < word_internal_endattrs ) )
 #define sameattr(x,y) ( (((x)-(y)) & 3) == 0 )
@@ -243,6 +244,16 @@ enum {
     err_text_codeline,		       /* \c line too long in text backend */
     err_htmlver,		       /* unrecognised HTML version keyword */
     err_charset,		       /* unrecognised character set name */
+    err_nofont, 		       /* unrecognised font name */
+    err_afmeof, 		       /* eof in AFM file */
+    err_afmkey, 		       /* missing expected keyword in AFM */
+    err_afmvers,		       /* unsupported AFM version */
+    err_afmval, 		       /* missing value(s) for AFM key */
+    err_pfeof,			       /* eof in Type 1 font file */
+    err_pfhead,			       /* bad Type 1 header line */
+    err_pfbad,			       /* otherwise invalide Type 1 font */
+    err_pfnoafm,		       /* Type 1 font but no AFM */
+    err_chmnames,		       /* need both or neither of hhp+chm */
     err_whatever                       /* random error of another type */
 };
 
@@ -264,7 +275,7 @@ void sfree(void *p);
 void free_word_list(word *w);
 void free_para_list(paragraph *p);
 word *dup_word_list(word *w);
-char *dupstr(char *s);
+char *dupstr(char const *s);
 
 #define snew(type) ( (type *) smalloc (sizeof (type)) )
 #define snewn(number, type) ( (type *) smalloc ((number) * sizeof (type)) )
@@ -325,7 +336,7 @@ void licence(void);
 /*
  * version.c
  */
-const char *const version;
+extern const char *const version;
 
 /*
  * misc.c
@@ -356,6 +367,7 @@ void rdadds(rdstring *rs, wchar_t const *p);
 wchar_t *rdtrim(rdstring *rs);
 void rdaddc(rdstringc *rs, char c);
 void rdaddsc(rdstringc *rs, char const *p);
+void rdaddsn(rdstringc *rc, char const *p, int len);
 char *rdtrimc(rdstringc *rs);
 
 int compare_wordlists(word *a, word *b);
@@ -381,6 +393,22 @@ paragraph *cmdline_cfg_simple(char *string, ...);
 paragraph *read_input(input *in, indexdata *idx);
 
 /*
+ * in_afm.c
+ */
+void read_afm_file(input *in);
+
+/*
+ * in_pf.c
+ */
+void read_pfa_file(input *in);
+void read_pfb_file(input *in);
+
+/*
+ * in_sfnt.c
+ */
+void read_sfnt_file(input *in);
+
+/*
  * keywords.c
  */
 struct keywordlist_Tag {