~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
About time I fixed this: allow for some people's md5sum utilities
[sgt/halibut]
/
halibut.h
diff --git
a/halibut.h
b/halibut.h
index
f76d059
..
d109ade
100644
(file)
--- a/
halibut.h
+++ b/
halibut.h
@@
-35,7
+35,6
@@
typedef struct paragraph_Tag paragraph;
typedef struct word_Tag word;
typedef struct keywordlist_Tag keywordlist;
typedef struct keyword_Tag keyword;
typedef struct word_Tag word;
typedef struct keywordlist_Tag keywordlist;
typedef struct keyword_Tag keyword;
-typedef struct userstyle_Tag userstyle;
typedef struct numberstate_Tag numberstate;
typedef struct indexdata_Tag indexdata;
typedef struct indextag_Tag indextag;
typedef struct numberstate_Tag numberstate;
typedef struct indexdata_Tag indexdata;
typedef struct indextag_Tag indextag;
@@
-178,13
+177,13
@@
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_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,
};
/* aux values for quote-type words */
enum {
quote_Open = 0x0010,
quote_Close = 0x0020,
- quote_mask = 0x0030
,
+ quote_mask = 0x0030
};
#define isattr(x) ( ( (x) > word_Normal && (x) < word_WhiteSpace ) || \
( (x) > word_WhiteSpace && (x) < word_internal_endattrs ) )
};
#define isattr(x) ( ( (x) > word_Normal && (x) < word_WhiteSpace ) || \
( (x) > word_WhiteSpace && (x) < word_internal_endattrs ) )
@@
-206,6
+205,8
@@
enum {
err_nomemory, /* out of memory */
err_optnoarg, /* option `-%s' requires an argument */
err_nosuchopt, /* unrecognised option `-%s' */
err_nomemory, /* out of memory */
err_optnoarg, /* option `-%s' requires an argument */
err_nosuchopt, /* unrecognised option `-%s' */
+ err_cmdcharset, /* unrecognised charset %s (cmdline) */
+ err_futileopt, /* futile option `-%s'%s */
err_noinput, /* no input files */
err_cantopen, /* unable to open input file `%s' */
err_nodata, /* no data in input files */
err_noinput, /* no input files */
err_cantopen, /* unable to open input file `%s' */
err_nodata, /* no data in input files */
@@
-237,11
+238,16
@@
enum {
err_multikw, /* keyword clash in sections */
err_misplacedlcont, /* \lcont not after a list item */
err_sectmarkerinblock, /* section marker appeared in block */
err_multikw, /* keyword clash in sections */
err_misplacedlcont, /* \lcont not after a list item */
err_sectmarkerinblock, /* section marker appeared in block */
- err_
infodirentry, /* \cfg{info-dir-entry} missing param
*/
+ err_
cfginsufarg, /* \cfg{%s} insufficient args (<%d)
*/
err_infonodechar, /* colon/comma in node name in info */
err_text_codeline, /* \c line too long in text backend */
err_htmlver, /* unrecognised HTML version keyword */
err_charset, /* unrecognised character set name */
err_infonodechar, /* colon/comma in node name in info */
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_whatever /* random error of another type */
};
err_whatever /* random error of another type */
};
@@
-314,6
+320,7
@@
int ustrwid(wchar_t const *s, int charset);
void help(void);
void usage(void);
void showversion(void);
void help(void);
void usage(void);
void showversion(void);
+void listcharsets(void);
/*
* licence.c
/*
* licence.c
@@
-323,7
+330,7
@@
void licence(void);
/*
* version.c
*/
/*
* version.c
*/
-const char *const version;
+
extern
const char *const version;
/*
* misc.c
/*
* misc.c
@@
-379,6
+386,16
@@
paragraph *cmdline_cfg_simple(char *string, ...);
paragraph *read_input(input *in, indexdata *idx);
/*
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);
+
+/*
* keywords.c
*/
struct keywordlist_Tag {
* keywords.c
*/
struct keywordlist_Tag {
@@
-458,12
+475,6
@@
void number_free(numberstate *);
void gen_citations(paragraph *, keywordlist *);
/*
void gen_citations(paragraph *, keywordlist *);
/*
- * style.c
- */
-struct userstyle_Tag {
-};
-
-/*
* bk_text.c
*/
void text_backend(paragraph *, keywordlist *, indexdata *, void *);
* bk_text.c
*/
void text_backend(paragraph *, keywordlist *, indexdata *, void *);