===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- texi2mdoc/main.c	2015/02/17 20:27:44	1.4
+++ texi2mdoc/main.c	2015/02/18 11:01:56	1.5
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.4 2015/02/17 20:27:44 kristaps Exp $ */
+/*	$Id: main.c,v 1.5 2015/02/18 11:01:56 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -44,6 +44,7 @@ enum	texicmd {
 	TEXICMD_AUTHOR,
 	TEXICMD_BANG,
 	TEXICMD_BYE,
+	TEXICMD_CENTER,
 	TEXICMD_CHAPTER,
 	TEXICMD_CINDEX,
 	TEXICMD_CITE,
@@ -87,6 +88,7 @@ enum	texicmd {
 	TEXICMD_IFSET,
 	TEXICMD_IMAGE,
 	TEXICMD_INCLUDE,
+	TEXICMD_INSERTCOPYING,
 	TEXICMD_ITEM,
 	TEXICMD_ITEMIZE,
 	TEXICMD_KBD,
@@ -172,15 +174,16 @@ enum	texilist {
  * This keeps any necessary information handy.
  */
 struct	texi {
-	struct texifile  files[64];
-	size_t		 filepos;
-	size_t		 outcol; /* column of output */
-	int		 outmacro; /* whether output is in line macro */
-	int		 seenws; /* whitespace has been ignored */
-	int		 ign; /* don't print anything */
-	int		 literal;
-	char		*dir; /* texi directory */
-	enum texilist	 list;
+	struct texifile   files[64]; /* stack of open files */
+	size_t		  filepos; /* number of open files */
+	size_t		  outcol; /* column in output line */
+	char		**dirs; /* texi directories */
+	size_t		  dirsz; /* number of texi directories */
+	enum texilist	  list;
+	int		  outmacro; /* whether output is in line macro */
+	int		  seenws; /* whitespace has been ignored */
+	int		  ign; /* don't print anything */
+	int		  literal;
 };
 
 /* FIXME: don't use this crap. */
@@ -233,6 +236,7 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doignline, "author", 6 }, /* TEXICMD_AUTHOR */
 	{ dosymbol, "!", 1 }, /* TEXICMD_BANG */
 	{ dobye, "bye", 3 }, /* TEXICMD_BYE */
+	{ doignline, "center", 5 }, /* TEXICMD_CENTER */
 	{ dochapter, "chapter", 7 }, /* TEXICMD_CHAPTER */
 	{ doignline, "cindex", 6 }, /* TEXICMD_CINDEX */
 	{ doliteral, "code", 4 }, /* TEXICMD_CODE */
@@ -276,6 +280,7 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doignblock, "ifset", 5 }, /* TEXICMD_IFSET */
 	{ doignbracket, "image", 5 }, /* TEXICMD_IMAGE */
 	{ doinclude, "include", 7 }, /* TEXICMD_INCLUDE */
+	{ doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */
 	{ doitem, "item", 4 }, /* TEXICMD_ITEM */
 	{ doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */
 	{ doliteral, "kbd", 3 }, /* TEXICMD_KBD */
@@ -296,10 +301,10 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doignline, "set", 3 }, /* TEXICMD_SET */
 	{ doignline, "setchapternewpage", 17 }, /* TEXICMD_SETCHAPNEWPAGE */
 	{ doignline, "setfilename", 11 }, /* TEXICMD_SETFILENAME */
+	{ doignline, "settitle", 8 }, /* TEXICMD_SETTITLE */
 	{ dosp, "sp", 2 }, /* TEXICMD_SP */
 	{ dosymbol, " ", 1 }, /* TEXICMD_SPACE */
 	{ doexample, "smallexample", 12 }, /* TEXICMD_SMALLEXAMPLE */
-	{ doignline, "settitle", 8 }, /* TEXICMD_SETTITLE */
 	{ dosymbol, "{", 1 }, /* TEXICMD_SQUIGGLE_LEFT */
 	{ dosymbol, "}", 1 }, /* TEXICMD_SQUIGGLE_RIGHT */
 	{ dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */
@@ -340,12 +345,17 @@ texifilepop(struct texi *p)
 static void
 texiexit(struct texi *p)
 {
+	size_t	 i;
 
-	while (p->filepos > 0)
-		texifilepop(p);
-	free(p->dir);
 	if (p->outcol)
 		putchar('\n');
+
+	while (p->filepos > 0)
+		texifilepop(p);
+
+	for (i = 0; i < p->dirsz; i++)
+		free(p->dirs[i]);
+	free(p->dirs);
 }
 
 /*
@@ -435,10 +445,8 @@ static void
 teximacroclose(struct texi *p)
 {
 
-	p->outmacro--;
-	if (p->ign)
-		return;
-	texiputchar(p, '\n');
+	if (0 == --p->outmacro)
+		texiputchar(p, '\n');
 }
 
 /*
@@ -448,15 +456,17 @@ teximacroclose(struct texi *p)
 static void
 teximacroopen(struct texi *p, const char *s)
 {
-	int	 rc;
 
-	p->outmacro++;
-	if (p->ign)
-		return;
-	if (p->outcol)
+	if (p->outcol && 0 == p->outmacro)
 		texiputchar(p, '\n');
-	if (EOF != (rc = fputs(s, stdout)))
-		p->outcol += rc;
+	if (0 == p->outmacro)
+		texiputchar(p, '.');
+	else
+		texiputchar(p, ' ');
+	texiputchars(p, s);
+	texiputchar(p, ' ');
+	p->outmacro++;
+	p->seenws = 0;
 }
 
 /*
@@ -472,13 +482,12 @@ teximacro(struct texi *p, const char *s)
 	else if (p->literal)
 		texierr(p, "\"%s\" in a literal scope!?", s);
 
-	if (p->ign)
-		return;
 	if (p->outcol)
 		texiputchar(p, '\n');
-	puts(s);
-	p->outcol = 0;
-	p->seenws = 0;
+
+	texiputchar(p, '.');
+	texiputchars(p, s);
+	texiputchar(p, '\n');
 }
 
 /*
@@ -508,6 +517,9 @@ advancenext(struct texi *p, const char *buf, size_t sz
 	
 	if (p->literal) {
 		while (*pos < sz && isspace(buf[*pos])) {
+			if (*pos && '\n' == buf[*pos] && 
+				'\\' == buf[*pos - 1])
+				texiputchar(p, 'e');
 			texiputchar(p, buf[*pos]);
 			advance(p, buf, pos);
 		}
@@ -521,8 +533,9 @@ advancenext(struct texi *p, const char *buf, size_t sz
 		 * output a paragraph.
 		 * FIXME: this is stupid.
 		 */
-		if (*pos && '\n' == buf[*pos] && '\n' == buf[*pos - 1])
-			teximacro(p, ".Pp");
+		if (*pos && '\n' == buf[*pos] && 
+			'\n' == buf[*pos - 1])
+			teximacro(p, "Pp");
 		advance(p, buf, pos);
 	}
 	return(*pos);
@@ -895,15 +908,15 @@ dodeftypevar(struct texi *p, enum texicmd cmd, 
 		return;
 	}
 
-	teximacro(p, ".Pp");
+	teximacro(p, "Pp");
 	if (TEXICMD_DEFTYPEVR == cmd) {
 		parsebracket(p, buf, sz, pos);
 		texiputchars(p, ":\n");
 	}
-	teximacroopen(p, ".Vt ");
+	teximacroopen(p, "Vt");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacro(p, ".Pp");
+	teximacro(p, "Pp");
 	parseto(p, buf, sz, pos, blk);
 }
 
@@ -913,19 +926,14 @@ dodeftypefun(struct texi *p, enum texicmd cmd, 
 {
 	const char	*blk;
 
+	blk = NULL;
 	switch (cmd) {
 	case (TEXICMD_DEFTYPEFN):
-		blk = "deftypefn";
-		break;
 	case (TEXICMD_DEFTYPEFUN):
-		blk = "deftypefun";
+		blk = texitoks[cmd].tok;
 		break;
-	case (TEXICMD_DEFTYPEFNX):
-	case (TEXICMD_DEFTYPEFUNX):
-		blk = NULL;
-		break;
 	default:
-		abort();
+		break;
 	}
 
 	if (p->ign) {
@@ -937,7 +945,7 @@ dodeftypefun(struct texi *p, enum texicmd cmd, 
 	switch (cmd) {
 	case (TEXICMD_DEFTYPEFN):
 	case (TEXICMD_DEFTYPEFUN):
-		teximacro(p, ".Pp");
+		teximacro(p, "Pp");
 		break;
 	default:
 		break;
@@ -947,16 +955,16 @@ dodeftypefun(struct texi *p, enum texicmd cmd, 
 		parsebracket(p, buf, sz, pos);
 		texiputchars(p, ":\n");
 	}
-	teximacroopen(p, ".Ft ");
+	teximacroopen(p, "Ft");
 	parsesingle(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacroopen(p, ".Fn ");
+	teximacroopen(p, "Fn");
 	parsesingle(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacroopen(p, ".Li ");
+	teximacroopen(p, "Li");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacro(p, ".Pp");
+	teximacro(p, "Pp");
 	if (NULL != blk)
 		parseto(p, buf, sz, pos, blk);
 }
@@ -965,47 +973,9 @@ static void
 doignblock(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
-	const char	*blk;
 	
-	switch (cmd) {
-	case (TEXICMD_COPYING):
-		blk = "copying";
-		break;
-	case (TEXICMD_DETAILMENU):
-		blk = "detailmenu";
-		break;
-	case (TEXICMD_DIRENTRY):
-		blk = "direntry";
-		break;
-	case (TEXICMD_IFCLEAR):
-		blk = "ifclear";
-		break;
-	case (TEXICMD_IFHTML):
-		blk = "ifhtml";
-		break;
-	case (TEXICMD_IFINFO):
-		blk = "ifinfo";
-		break;
-	case (TEXICMD_IFSET):
-		blk = "ifset";
-		break;
-	case (TEXICMD_IFTEX):
-		blk = "iftex";
-		break;
-	case (TEXICMD_MENU):
-		blk = "menu";
-		break;
-	case (TEXICMD_TEX):
-		blk = "tex";
-		break;
-	case (TEXICMD_TITLEPAGE):
-		blk = "titlepage";
-		break;
-	default:
-		abort();
-	}
 	p->ign++;
-	parseto(p, buf, sz, pos, blk);
+	parseto(p, buf, sz, pos, texitoks[cmd].tok);
 	p->ign--;
 }
 
@@ -1013,36 +983,16 @@ static void
 doblock(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
-	const char	*blk;
-
-	switch (cmd) {
-	case (TEXICMD_GROUP):
-		blk = "group";
-		break;
-	case (TEXICMD_IFNOTTEX):
-		blk = "ifnottex";
-		break;
-	default:
-		abort();
-	}
 	
-	parseto(p, buf, sz, pos, blk);
+	parseto(p, buf, sz, pos, texitoks[cmd].tok);
 }
 
 static void
 doinline(struct texi *p, const char *buf, 
 	size_t sz, size_t *pos, const char *macro)
 {
-	int	 open = 0;
 
-	if (0 == p->outmacro) {
-		open = 1;
-		teximacroopen(p, ".");
-	} else
-		texiputchar(p, ' ');
-
-	texiputchars(p, macro);
-	texiputchar(p, ' ');
+	teximacroopen(p, macro);
 	p->seenws = 0;
 	parsebracket(p, buf, sz, pos);
 	if (*pos < sz - 1 && 
@@ -1052,8 +1002,7 @@ doinline(struct texi *p, const char *buf, 
 		texiputchar(p, buf[*pos]);
 		advance(p, buf, pos);
 	}
-	if (open)
-		teximacroclose(p);
+	teximacroclose(p);
 }
 
 static void
@@ -1086,15 +1035,22 @@ doinclude(struct texi *p, enum texicmd cmd, 
 	if (strstr(fname, "../") || strstr(fname, "/.."))
 		texierr(p, "insecure path");
 
-	/* Append filename to original name's directory. */
-	rc = snprintf(path, sizeof(path), "%s/%s", p->dir, fname);
-	if (rc < 0) 
-		texierr(p, "couldn't format filename");
-	else if ((size_t)rc >= sizeof(path))
-		texierr(p, "path too long");
+	for (i = 0; i < p->dirsz; i++) {
+		rc = snprintf(path, sizeof(path), 
+			"%s/%s", p->dirs[i], fname);
+		texiwarn(p, "trying: %s", path);
+		if (rc < 0) 
+			texierr(p, "couldn't format path");
+		else if ((size_t)rc >= sizeof(path))
+			texierr(p, "path too long");
+		else if (-1 == access(path, R_OK))
+			continue;
 
-	/* Pump through to parser. */
-	parsefile(p, path);
+		parsefile(p, path);
+		return;
+	}
+
+	texierr(p, "couldn't find %s in includes", fname);
 }
 
 static void
@@ -1172,10 +1128,10 @@ dodisplay(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
 
-	teximacro(p, ".Bd -display");
+	teximacro(p, "Bd -display -offset indent");
 	advanceeoln(p, buf, sz, pos, 1);
 	parseto(p, buf, sz, pos, "display");
-	teximacro(p, ".Ed");
+	teximacro(p, "Ed");
 }
 
 static void
@@ -1186,12 +1142,12 @@ doexample(struct texi *p, enum texicmd cmd, 
 
 	blk = TEXICMD_EXAMPLE == cmd ?  "example" : "smallexample";
 
-	teximacro(p, ".Bd -literal");
+	teximacro(p, "Bd -literal -offset indent");
 	advanceeoln(p, buf, sz, pos, 1);
 	p->literal++;
 	parseto(p, buf, sz, pos, blk);
 	p->literal--;
-	teximacro(p, ".Ed");
+	teximacro(p, "Ed");
 }
 
 static void
@@ -1251,10 +1207,12 @@ dosymbol(struct texi *p, enum texicmd cmd, 
 	case (TEXICMD_HYPHEN):
 		break;
 	default:
+		texiwarn(p, "sym: %d", cmd);
 		abort();
 	}
 
-	doignbracket(p, cmd, buf, sz, pos);
+	if (texitoks[cmd].len > 1)
+		doignbracket(p, cmd, buf, sz, pos);
 }
 
 static void
@@ -1262,9 +1220,9 @@ doquotation(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
 	
-	teximacro(p, ".Qo");
+	teximacro(p, "Qo");
 	parseto(p, buf, sz, pos, "quotation");
-	teximacro(p, ".Qc");
+	teximacro(p, "Qc");
 }
 
 /* FIXME */
@@ -1308,26 +1266,17 @@ static void
 doarg1(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
-	int	 open = 0;
 
 	if (*pos == sz || '{' != buf[*pos])
 		return;
 	advance(p, buf, pos);
 	switch (cmd) {
 	case (TEXICMD_EMAIL):
-		if ( ! p->outmacro) {
-			open = 1;
-			teximacroopen(p, ".");
-		}
-		texiputchars(p, "Lk ");
+		teximacroopen(p, "Mt");
 		break;
 	case (TEXICMD_UREF):
 	case (TEXICMD_URL):
-		if ( ! p->outmacro) {
-			open = 1;
-			teximacroopen(p, ".");
-		}
-		texiputchars(p, "Mt ");
+		teximacroopen(p, "Lk");
 		break;
 	default:
 		break;
@@ -1348,8 +1297,15 @@ doarg1(struct texi *p, enum texicmd cmd, 
 		texiputchar(p, buf[*pos]);
 		advance(p, buf, pos);
 	}
-	if (open)
+	switch (cmd) {
+	case (TEXICMD_EMAIL):
+	case (TEXICMD_UREF):
+	case (TEXICMD_URL):
 		teximacroclose(p);
+		break;
+	default:
+		break;
+	}
 }
 
 static void
@@ -1357,9 +1313,11 @@ dosubsection(struct texi *p, enum texicmd cmd, 
 		const char *buf, size_t sz, size_t *pos)
 {
 
-	teximacro(p, ".Pp");
+	teximacro(p, "Pp");
+	teximacroopen(p, "Em");
 	parseeoln(p, buf, sz, pos);
-	teximacro(p, ".Pp");
+	teximacroclose(p);
+	teximacro(p, "Pp");
 }
 
 static void
@@ -1372,7 +1330,7 @@ dosection(struct texi *p, enum texicmd cmd, 
 	else if (p->literal)
 		texierr(p, "subsection in a literal scope!?");
 
-	teximacroopen(p, ".Ss ");
+	teximacroopen(p, "Ss");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
 }
@@ -1382,7 +1340,7 @@ dosp(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
 
-	teximacro(p, ".Pp");
+	teximacro(p, "Pp");
 	advanceeoln(p, buf, sz, pos, 1);
 }
 
@@ -1396,7 +1354,7 @@ dochapter(struct texi *p, enum texicmd cmd, 
 	else if (p->literal)
 		texierr(p, "section in a literal scope!?");
 
-	teximacroopen(p, ".Sh ");
+	teximacroopen(p, "Sh");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
 }
@@ -1408,12 +1366,12 @@ dotop(struct texi *p, enum texicmd cmd, 
 
 	p->ign--;
 	advanceeoln(p, buf, sz, pos, 1);
-	teximacro(p, ".Dd $Mdocdate: February 17 2015 $");
-	teximacro(p, ".Dt SOMETHING 7");
-	teximacro(p, ".Os");
-	teximacro(p, ".Sh NAME");
-	teximacro(p, ".Nm Something");
-	teximacro(p, ".Nd Something");
+	teximacro(p, "Dd $Mdocdate: February 18 2015 $");
+	teximacro(p, "Dt SOMETHING 7");
+	teximacro(p, "Os");
+	teximacro(p, "Sh NAME");
+	teximacro(p, "Nm Something");
+	teximacro(p, "Nd Something");
 }
 
 static void
@@ -1428,13 +1386,13 @@ doitem(struct texi *p, enum texicmd cmd, 
 
 	switch (p->list) {
 	case (TEXILIST_ITEM):
-		teximacroopen(p, ".It");
+		teximacroopen(p, "It");
 		break;
 	case (TEXILIST_NOITEM):
-		teximacro(p, ".It");
+		teximacro(p, "It");
 		break;
 	default:
-		teximacro(p, ".Pp");
+		teximacro(p, "Pp");
 		break;
 	}
 
@@ -1453,9 +1411,9 @@ dotable(struct texi *p, enum texicmd cmd, 
 	enum texilist	sv = p->list;
 
 	p->list = TEXILIST_ITEM;
-	teximacro(p, ".Bl -tag -width Ds");
+	teximacro(p, "Bl -tag -width Ds");
 	parseto(p, buf, sz, pos, "table");
-	teximacro(p, ".El");
+	teximacro(p, "El");
 	p->list = sv;
 }
 
@@ -1466,9 +1424,9 @@ doenumerate(struct texi *p, enum texicmd cmd, 
 	enum texilist	 sv = p->list;
 
 	p->list = TEXILIST_NOITEM;
-	teximacro(p, ".Bl -enum");
+	teximacro(p, "Bl -enum");
 	parseto(p, buf, sz, pos, "enumerate");
-	teximacro(p, ".El");
+	teximacro(p, "El");
 	p->list = sv;
 }
 
@@ -1479,9 +1437,9 @@ doitemize(struct texi *p, enum texicmd cmd, 
 	enum texilist	sv = p->list;
 
 	p->list = TEXILIST_ITEM;
-	teximacro(p, ".Bl -bullet");
+	teximacro(p, "Bl -bullet");
 	parseto(p, buf, sz, pos, "itemize");
-	teximacro(p, ".El");
+	teximacro(p, "El");
 	p->list = sv;
 }
 
@@ -1503,13 +1461,53 @@ doignline(struct texi *p, enum texicmd cmd, 
 	advanceeoln(p, buf, sz, pos, 1);
 }
 
+static char **
+parsedirs(const char *base, const char *cp, size_t *sz)
+{
+	char	   	 *tok, *str, *tofree;
+	const char 	 *cpp;
+	size_t	    	  i;
+	char		**dirs;
+
+	*sz = NULL != (cpp = cp) ? 2 : 1;
+	if (*sz > 1)
+		for ( ; NULL != (cpp = strchr(cpp, ':')); (*sz)++)
+			cpp++;
+
+	dirs = calloc(*sz, sizeof(char *));
+	if (NULL == dirs) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	} else if (NULL == (dirs[0] = strdup(base))) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	} 
+
+	if (NULL == cp)
+		return(dirs);
+	
+	if (NULL == (tofree = tok = str = strdup(cp))) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	}
+
+	for (i = 1; NULL != (tok = strsep(&str, ":")); i++) 
+		if (NULL == (dirs[i] = strdup(tok))) {
+			perror(NULL);
+			exit(EXIT_FAILURE);
+		}
+
+	free(tofree);
+	return(dirs);
+}
+
 int
 main(int argc, char *argv[])
 {
 	struct texi	 texi;
 	int		 c;
 	char		*path, *dir;
-	const char	*progname;
+	const char	*progname, *Idir;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -1517,8 +1515,12 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
-	while (-1 != (c = getopt(argc, argv, ""))) 
+	Idir = NULL;
+	while (-1 != (c = getopt(argc, argv, "I:"))) 
 		switch (c) {
+		case ('I'):
+			Idir = optarg;
+			break;
 		default:
 			goto usage;
 		}
@@ -1539,8 +1541,9 @@ main(int argc, char *argv[])
 
 	memset(&texi, 0, sizeof(struct texi));
 	texi.ign = 1;
-	texi.dir = strdup(dir);
+	texi.dirs = parsedirs(dir, Idir, &texi.dirsz);
 	parsefile(&texi, argv[0]);
+	/* We shouldn't get here. */
 	texiexit(&texi);
 	return(EXIT_FAILURE);
 usage: