~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly bless in the documentation, and fix in the man backend,
[sgt/halibut]
/
halibut.h
diff --git
a/halibut.h
b/halibut.h
index
69953b6
..
f76d059
100644
(file)
--- a/
halibut.h
+++ b/
halibut.h
@@
-221,10
+221,12
@@
enum {
err_explbr, /* expected `{' after command */
err_commenteof, /* EOF inside braced comment */
err_kwexprbr, /* expected `}' after cross-ref */
err_explbr, /* expected `{' after command */
err_commenteof, /* EOF inside braced comment */
err_kwexprbr, /* expected `}' after cross-ref */
+ err_codequote, /* \q within \c is not supported */
err_missingrbrace, /* unclosed braces at end of para */
err_missingrbrace2, /* unclosed braces at end of file */
err_nestedstyles, /* unable to nest text styles */
err_nestedindex, /* unable to nest `\i' thingys */
err_missingrbrace, /* unclosed braces at end of para */
err_missingrbrace2, /* unclosed braces at end of file */
err_nestedstyles, /* unable to nest text styles */
err_nestedindex, /* unable to nest `\i' thingys */
+ err_indexcase, /* two \i differing only in case */
err_nosuchkw, /* unresolved cross-reference */
err_multiBR, /* multiple \BRs on same keyword */
err_nosuchidxtag, /* \IM on unknown index tag (warning) */
err_nosuchkw, /* unresolved cross-reference */
err_multiBR, /* multiple \BRs on same keyword */
err_nosuchidxtag, /* \IM on unknown index tag (warning) */
@@
-237,6
+239,9
@@
enum {
err_sectmarkerinblock, /* section marker appeared in block */
err_infodirentry, /* \cfg{info-dir-entry} missing param */
err_infonodechar, /* colon/comma in node name in info */
err_sectmarkerinblock, /* section marker appeared in block */
err_infodirentry, /* \cfg{info-dir-entry} missing param */
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_whatever /* random error of another type */
};
err_whatever /* random error of another type */
};
@@
-260,9
+265,10
@@
void free_para_list(paragraph *p);
word *dup_word_list(word *w);
char *dupstr(char *s);
word *dup_word_list(word *w);
char *dupstr(char *s);
-#define mknew(type) ( (type *) smalloc (sizeof (type)) )
-#define mknewa(type, number) ( (type *) smalloc ((number) * sizeof (type)) )
-#define resize(array, len) ( srealloc ((array), (len) * sizeof (*(array))) )
+#define snew(type) ( (type *) smalloc (sizeof (type)) )
+#define snewn(number, type) ( (type *) smalloc ((number) * sizeof (type)) )
+#define sresize(array, number, type) \
+ ( (type *) srealloc ((array), (number) * sizeof (type)) )
#define lenof(array) ( sizeof(array) / sizeof(*(array)) )
/*
#define lenof(array) ( sizeof(array) / sizeof(*(array)) )
/*
@@
-281,16
+287,26
@@
wchar_t *ufroma_locale_dup(char const *s);
int ustrlen(wchar_t const *s);
wchar_t *uadv(wchar_t *s);
wchar_t *ustrcpy(wchar_t *dest, wchar_t const *source);
int ustrlen(wchar_t const *s);
wchar_t *uadv(wchar_t *s);
wchar_t *ustrcpy(wchar_t *dest, wchar_t const *source);
+wchar_t *ustrncpy(wchar_t *dest, wchar_t const *source, int n);
wchar_t utolower(wchar_t);
int uisalpha(wchar_t);
int ustrcmp(wchar_t *lhs, wchar_t *rhs);
wchar_t utolower(wchar_t);
int uisalpha(wchar_t);
int ustrcmp(wchar_t *lhs, wchar_t *rhs);
-int ustricmp(wchar_t *lhs, wchar_t *rhs);
-int utoi(wchar_t *);
-int utob(wchar_t *);
+int ustricmp(wchar_t const *lhs, wchar_t const *rhs);
+int ustrnicmp(wchar_t const *lhs, wchar_t const *rhs, int maxlen);
+int utoi(wchar_t const *);
+double utof(wchar_t const *);
+int utob(wchar_t const *);
int uisdigit(wchar_t);
wchar_t *ustrlow(wchar_t *s);
int uisdigit(wchar_t);
wchar_t *ustrlow(wchar_t *s);
-wchar_t *ustrftime(
wchar_t *fmt,
struct tm *timespec);
+wchar_t *ustrftime(
const wchar_t *wfmt, const
struct tm *timespec);
int cvt_ok(int charset, const wchar_t *s);
int cvt_ok(int charset, const wchar_t *s);
+int charset_from_ustr(filepos *fpos, const wchar_t *name);
+
+/*
+ * wcwidth.c
+ */
+int strwid(char const *s, int charset);
+int ustrwid(wchar_t const *s, int charset);
/*
* help.c
/*
* help.c
@@
-342,7
+358,7
@@
char *rdtrimc(rdstringc *rs);
int compare_wordlists(word *a, word *b);
int compare_wordlists(word *a, word *b);
-void mark_attr_ends(
paragraph *sourceform
);
+void mark_attr_ends(
word *words
);
typedef struct tagWrappedLine wrappedline;
struct tagWrappedLine {
typedef struct tagWrappedLine wrappedline;
struct tagWrappedLine {
@@
-454,10
+470,10
@@
void text_backend(paragraph *, keywordlist *, indexdata *, void *);
paragraph *text_config_filename(char *filename);
/*
paragraph *text_config_filename(char *filename);
/*
- * bk_
x
html.c
+ * bk_html.c
*/
*/
-void
x
html_backend(paragraph *, keywordlist *, indexdata *, void *);
-paragraph *
x
html_config_filename(char *filename);
+void html_backend(paragraph *, keywordlist *, indexdata *, void *);
+paragraph *html_config_filename(char *filename);
/*
* bk_whlp.c
/*
* bk_whlp.c