===================================================================
RCS file: /cvs/texi2mdoc/extern.h,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- texi2mdoc/extern.h	2015/02/23 15:09:09	1.10
+++ texi2mdoc/extern.h	2015/02/24 20:34:43	1.13
@@ -1,4 +1,4 @@
-/*	$Id: extern.h,v 1.10 2015/02/23 15:09:09 kristaps Exp $ */
+/*	$Id: extern.h,v 1.13 2015/02/24 20:34:43 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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,
@@ -83,10 +87,16 @@ 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,
@@ -96,7 +106,9 @@ enum	texicmd {
 	TEXICMD_ENV,
 	TEXICMD_EQUIV,
 	TEXICMD_ERROR,
+	TEXICMD_EURO,
 	TEXICMD_EXAMPLE,
+	TEXICMD_EXCLAMDOWN,
 	TEXICMD_EXDENT,
 	TEXICMD_EXPANSION,
 	TEXICMD_FILE,
@@ -105,8 +117,16 @@ enum	texicmd {
 	TEXICMD_FOOTNOTE,
 	TEXICMD_FTABLE,
 	TEXICMD_FORMAT,
+	TEXICMD_GEQ,
 	TEXICMD_GRAVE,
 	TEXICMD_GROUP,
+	TEXICMD_GUILLEMETLEFT,
+	TEXICMD_GUILLEMETRIGHT,
+	TEXICMD_GUILLEMOTLEFT,
+	TEXICMD_GUILLEMOTRIGHT,
+	TEXICMD_GUILSINGLLEFT,
+	TEXICMD_GUILSINGLRIGHT,
+	TEXICMD_H,
 	TEXICMD_HEADING,
 	TEXICMD_HEADINGS,
 	TEXICMD_HEADITEM,
@@ -139,9 +159,13 @@ enum	texicmd {
 	TEXICMD_KBD,
 	TEXICMD_KEY,
 	TEXICMD_KINDEX,
+	TEXICMD_L,
 	TEXICMD_LATEX,
+	TEXICMD_LEQ,
 	TEXICMD_LOWERSECTIONS,
+	TEXICMD_LSMALL,
 	TEXICMD_MACRO,
+	TEXICMD_MACRON,
 	TEXICMD_MATH,
 	TEXICMD_MENU,
 	TEXICMD_MINUS,
@@ -150,20 +174,37 @@ 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_POUNDS,
 	TEXICMD_PRINTINDEX,
+	TEXICMD_PXREF,
+	TEXICMD_QUESTIONDOWN,
+	TEXICMD_QUESTIONMARK,
+	TEXICMD_QUOTATION,
+	TEXICMD_QUOTEDBLBASE,
+	TEXICMD_QUOTEDBLLEFT,
+	TEXICMD_QUOTEDBLRIGHT,
+	TEXICMD_QUOTESINGLBASE,
+	TEXICMD_QUOTELEFT,
+	TEXICMD_QUOTERIGHT,
 	TEXICMD_R,
 	TEXICMD_RAISESECTIONS,
 	TEXICMD_REF,
 	TEXICMD_REFILL,
+	TEXICMD_REGISTEREDSYMBOL,
 	TEXICMD_RESULT,
+	TEXICMD_RINGACCENT,
 	TEXICMD_SAMP,
 	TEXICMD_SANSSERIF,
 	TEXICMD_SC,
@@ -201,13 +242,20 @@ enum	texicmd {
 	TEXICMD_TABLE,
 	TEXICMD_TEX,
 	TEXICMD_TEXSYM,
+	TEXICMD_TEXTDEGREE,
+	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,
@@ -216,6 +264,7 @@ enum	texicmd {
 	TEXICMD_UREF,
 	TEXICMD_URL,
 	TEXICMD_USER_INDEX,
+	TEXICMD_V,
 	TEXICMD_VALUE,
 	TEXICMD_VAR,
 	TEXICMD_VERB,
@@ -229,15 +278,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 */
 };
 
@@ -258,6 +313,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,
@@ -265,16 +324,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 */
 };
 
 /*
@@ -296,8 +363,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).
@@ -325,6 +392,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);