=================================================================== RCS file: /cvs/texi2mdoc/extern.h,v retrieving revision 1.6 retrieving revision 1.12 diff -u -p -r1.6 -r1.12 --- texi2mdoc/extern.h 2015/02/23 11:56:39 1.6 +++ texi2mdoc/extern.h 2015/02/24 20:06:32 1.12 @@ -1,4 +1,4 @@ -/* $Id: extern.h,v 1.6 2015/02/23 11:56:39 kristaps Exp $ */ +/* $Id: extern.h,v 1.12 2015/02/24 20:06:32 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -23,9 +23,13 @@ * different story. */ enum texicmd { + TEXICMD_A4PAPER, + TEXICMD_AA, + TEXICMD_AASMALL, TEXICMD_ACRONYM, TEXICMD_ACUTE, - TEXICMD_A4PAPER, + TEXICMD_AE, + TEXICMD_AESMALL, TEXICMD_ANCHOR, TEXICMD_APPENDIX, TEXICMD_APPENDIXSEC, @@ -39,6 +43,8 @@ enum texicmd { TEXICMD_BANG, TEXICMD_BULLET, TEXICMD_BYE, + TEXICMD_CARTOUCHE, + TEXICMD_CEDILLA, TEXICMD_CENTER, TEXICMD_CHAPTER, TEXICMD_CINDEX, @@ -48,6 +54,7 @@ enum texicmd { TEXICMD_CODE, TEXICMD_COLON, TEXICMD_COLUMNFRACTIONS, + TEXICMD_COMMA, TEXICMD_COMMAND, TEXICMD_COMMENT, TEXICMD_COMMENT_LONG, @@ -66,6 +73,8 @@ enum texicmd { TEXICMD_DEFTYPEFNX, TEXICMD_DEFTYPEFUN, TEXICMD_DEFTYPEFUNX, + TEXICMD_DEFTYPEMETHOD, + TEXICMD_DEFTYPEMETHODX, TEXICMD_DEFTYPEVAR, TEXICMD_DEFTYPEVARX, TEXICMD_DEFTYPEVR, @@ -78,28 +87,38 @@ enum texicmd { TEXICMD_DEFVRX, TEXICMD_DETAILMENU, TEXICMD_DFN, + TEXICMD_DH, + TEXICMD_DHSMALL, TEXICMD_DIRCATEGORY, TEXICMD_DIRENTRY, TEXICMD_DISPLAY, TEXICMD_DMN, + TEXICMD_DOCUMENTDESCRPITION, + TEXICMD_DOCUMENTENCODING, + TEXICMD_DOTACCENT, + TEXICMD_DOTLESS, TEXICMD_DOTS, TEXICMD_EMAIL, TEXICMD_EMPH, TEXICMD_END, + TEXICMD_ENDDOTS, TEXICMD_ENUMERATE, TEXICMD_ENV, TEXICMD_EQUIV, TEXICMD_ERROR, TEXICMD_EXAMPLE, + TEXICMD_EXCLAMDOWN, TEXICMD_EXDENT, TEXICMD_EXPANSION, TEXICMD_FILE, TEXICMD_FINALOUT, TEXICMD_FINDEX, + TEXICMD_FOOTNOTE, TEXICMD_FTABLE, TEXICMD_FORMAT, TEXICMD_GRAVE, TEXICMD_GROUP, + TEXICMD_H, TEXICMD_HEADING, TEXICMD_HEADINGS, TEXICMD_HEADITEM, @@ -124,7 +143,7 @@ enum texicmd { TEXICMD_IMAGE, TEXICMD_INCLUDE, TEXICMD_INDENTBLOCK, - TEXICMD_USER_INDEX, + TEXICMD_INFOREF, TEXICMD_INSERTCOPYING, TEXICMD_ITEM, TEXICMD_ITEMIZE, @@ -132,9 +151,12 @@ enum texicmd { TEXICMD_KBD, TEXICMD_KEY, TEXICMD_KINDEX, + TEXICMD_L, TEXICMD_LATEX, TEXICMD_LOWERSECTIONS, + TEXICMD_LSMALL, TEXICMD_MACRO, + TEXICMD_MACRON, TEXICMD_MATH, TEXICMD_MENU, TEXICMD_MINUS, @@ -143,30 +165,41 @@ enum texicmd { TEXICMD_NEWLINE, TEXICMD_NODE, TEXICMD_NOINDENT, + TEXICMD_O, + TEXICMD_OE, + TEXICMD_OESMALL, + TEXICMD_OGONEK, TEXICMD_OPTION, - TEXICMD_PXREF, - TEXICMD_QUESTIONMARK, - TEXICMD_QUOTATION, + TEXICMD_ORDF, + TEXICMD_ORDM, + TEXICMD_OSMALL, TEXICMD_PAGE, TEXICMD_PARINDENT, TEXICMD_PERIOD, TEXICMD_PINDEX, TEXICMD_PRINTINDEX, + TEXICMD_PXREF, + TEXICMD_QUESTIONDOWN, + TEXICMD_QUESTIONMARK, + TEXICMD_QUOTATION, TEXICMD_R, TEXICMD_RAISESECTIONS, TEXICMD_REF, TEXICMD_REFILL, TEXICMD_RESULT, + TEXICMD_RINGACCENT, TEXICMD_SAMP, TEXICMD_SANSSERIF, TEXICMD_SC, TEXICMD_SECTION, TEXICMD_SET, TEXICMD_SETCHAPNEWPAGE, + TEXICMD_SETCONTENTSAFTER, TEXICMD_SETFILENAME, TEXICMD_SETTITLE, TEXICMD_SHORTCONTENTS, TEXICMD_SLANTED, + TEXICMD_SLASH, TEXICMD_SP, TEXICMD_SPACE, TEXICMD_SMALLBOOK, @@ -176,6 +209,7 @@ enum texicmd { TEXICMD_SMALLINDENTBLOCK, TEXICMD_SQUIGGLE_LEFT, TEXICMD_SQUIGGLE_RIGHT, + TEXICMD_SS, TEXICMD_STRONG, TEXICMD_SUBHEADING, TEXICMD_SUBSECTION, @@ -191,12 +225,19 @@ enum texicmd { TEXICMD_TABLE, TEXICMD_TEX, TEXICMD_TEXSYM, + TEXICMD_TH, + TEXICMD_THSMALL, + TEXICMD_TIE, + TEXICMD_TIEACCENT, TEXICMD_TILDE, TEXICMD_TINDEX, TEXICMD_TITLE, TEXICMD_TITLEFONT, TEXICMD_TITLEPAGE, TEXICMD_TOP, + TEXICMD_U, + TEXICMD_UBARACCENT, + TEXICMD_UDOTACCENT, TEXICMD_UMLAUT, TEXICMD_UNNUMBERED, TEXICMD_UNNUMBEREDSEC, @@ -204,8 +245,11 @@ enum texicmd { TEXICMD_UNNUMBEREDSUBSUBSEC, TEXICMD_UREF, TEXICMD_URL, + TEXICMD_USER_INDEX, + TEXICMD_V, TEXICMD_VALUE, TEXICMD_VAR, + TEXICMD_VERB, TEXICMD_VERBATIM, TEXICMD_VERBATIMINCLUDE, TEXICMD_VINDEX, @@ -216,15 +260,21 @@ enum texicmd { TEXICMD__MAX }; +enum texisrc { + TEXISRC_FILE, + TEXISRC_STDIN +}; + /* * The file currently being parsed. * This keeps track of our location within that file. */ struct texifile { + enum texisrc type; /* type of file */ const char *name; /* name of the file */ size_t line; /* current line (from zero) */ size_t col; /* current column in line (from zero) */ - char *map; /* mmap'd file */ + char *map; /* mmap'd file OR allocated buffer */ size_t mapsz; /* size of mmap */ }; @@ -245,6 +295,10 @@ struct texitok { size_t len; /* strlen(tok) */ }; +/* + * These values instruct us on whether a list (or table) of some type is + * currently being parsed. + */ enum texilist { TEXILIST_NONE = 0, TEXILIST_ITEM, @@ -252,16 +306,24 @@ enum texilist { TEXILIST_TABLE }; +/* + * Hold values assigned with @set and retrieved with @value. + * These values can contain arbitrary Texinfo. + */ struct texivalue { - char *key; - char *value; + char *key; /* the nil-terminated value name */ + char *value; /* the nil-terminated value */ }; +/* + * Macros are (possibly-recursive) Texinfo sequences created with @macro + * and filled in by arguments when invoked. + */ struct teximacro { - char *key; - char *value; - char **args; - size_t argsz; + char *key; /* nil-terminated macro name */ + char *value; /* nil-terminated value */ + char **args; /* array of argument names (or NULL) */ + size_t argsz; /* array size */ }; /* @@ -283,8 +345,8 @@ struct texi { size_t indexsz; /* entries in indexs */ struct texivalue *vals; /* @value entries */ size_t valsz; /* entries in vals */ - struct teximacro *macros; - size_t macrosz; + struct teximacro *macros; /* @macro entries */ + size_t macrosz; /* entries in macros */ /* * The following control what we output to the screen. * The complexity is required to accomodate for mdoc(7). @@ -312,6 +374,7 @@ char **argparse(struct texi *, const char *, size_t, int parsearg(struct texi *, const char *, size_t, size_t *, size_t); void parsebracket(struct texi *, const char *, size_t, size_t *); +void parsestdin(struct texi *); void parsefile(struct texi *, const char *, int); int parselinearg(struct texi *, const char *, size_t, size_t *); void parseeof(struct texi *, const char *, size_t); @@ -334,6 +397,7 @@ void teximacro(struct texi *, const char *); void teximacroclose(struct texi *); void teximacroopen(struct texi *, const char *); void texipunctuate(struct texi *, const char *, size_t, size_t *); +void texiputbuf(struct texi *p, const char *, size_t, size_t); void texiputchar(struct texi *p, char); void texiputchars(struct texi *, const char *); void texivspace(struct texi *);