===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.56
retrieving revision 1.59
diff -u -p -r1.56 -r1.59
--- texi2mdoc/main.c	2015/03/01 13:39:51	1.56
+++ texi2mdoc/main.c	2015/03/03 15:04:24	1.59
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.56 2015/03/01 13:39:51 kristaps Exp $ */
+/*	$Id: main.c,v 1.59 2015/03/03 15:04:24 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -94,7 +94,8 @@ static	const struct texitok __texitoks[TEXICMD__MAX] =
 	{ dosymbol, "*", 1 }, /* TEXICMD_ASTERISK */
 	{ dosymbol, "@", 1 }, /* TEXICMD_AT */
 	{ doignline, "author", 6 }, /* TEXICMD_AUTHOR */
-	{ doinline, "b", 1 }, /* TEXICMD_BOLD */
+	{ doinline, "b", 1 }, /* TEXICMD_B */
+	{ dosymbol, "\\", 1 }, /* TEXICMD_BACKSLASH */
 	{ dosymbol, "!", 1 }, /* TEXICMD_BANG */
 	{ dosymbol, "bullet", 6 }, /* TEXICMD_BULLET */
 	{ dobye, "bye", 3 }, /* TEXICMD_BYE */
@@ -268,7 +269,7 @@ static	const struct texitok __texitoks[TEXICMD__MAX] =
 	{ doaccent, "ringaccent", 10 }, /* TEXICMD_RINGACCENT */
 	{ doinline, "samp", 4 }, /* TEXICMD_SAMP */
 	{ doinline, "sansserif", 9 }, /* TEXICMD_SANSSERIF */
-	{ dobracket, "sc", 2 }, /* TEXICMD_SC */
+	{ doinline, "sc", 2 }, /* TEXICMD_SC */
 	{ dosection, "section", 7 }, /* TEXICMD_SECTION */
 	{ dovalue, "set", 3 }, /* TEXICMD_SET */
 	{ doignline, "setchapternewpage", 17 }, /* TEXICMD_SETCHAPNEWPAGE */
@@ -725,13 +726,30 @@ doinline(struct texi *p, enum texicmd cmd, size_t *pos
 	}
 
 	if (NULL == macro || p->literal || TEXILIST_TABLE == p->list) {
+		if (TEXICMD_SC == cmd)
+			p->uppercase++;
 		parsebracket(p, pos, 0);
+		if (TEXICMD_SC == cmd)
+			p->uppercase--;
 		return;
 	}
 
+	/* 
+	 * If we haven't seen any whitespace, then we don't want the
+	 * subsequent macro to insert any whitespace. 
+	 */
+	if (p->outmacro && 0 == p->seenws) {
+		teximacroopen(p, "Ns");
+		teximacroclose(p);
+	}
+
 	teximacroopen(p, macro);
 	p->seenws = 0;
+	if (TEXICMD_SC == cmd)
+		p->uppercase++;
 	parsebracket(p, pos, 0);
+	if (TEXICMD_SC == cmd)
+		p->uppercase--;
 	texipunctuate(p, pos);
 	teximacroclose(p);
 }
@@ -942,6 +960,8 @@ static void
 dodisplay(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
+	advanceeoln(p, pos, 1);
+
 	switch (cmd) {
 	case (TEXICMD_FORMAT):
 	case (TEXICMD_SMALLFORMAT):
@@ -953,8 +973,6 @@ dodisplay(struct texi *p, enum texicmd cmd, size_t *po
 	}
 
 	p->seenvs = 1;
-	/* FIXME: ignore and parseeoln. */
-	advanceeoln(p, pos, 1);
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "Ed");
 }
@@ -963,9 +981,9 @@ static void
 doexample(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
-	teximacro(p, "Bd -literal -offset indent");
-	/* FIXME: ignore and parseeoln. */
 	advanceeoln(p, pos, 1);
+
+	teximacro(p, "Bd -literal -offset indent");
 	p->literal++;
 	parseto(p, pos, texitoks[cmd].tok);
 	p->literal--;
@@ -983,22 +1001,27 @@ dobye(struct texi *p, enum texicmd cmd, size_t *pos)
 static void
 dotitle(struct texi *p, enum texicmd cmd, size_t *pos)
 {
-	size_t	 start, end;
+	size_t	 start;
 
 	while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
 		advance(p, pos);
-	start = end = *pos;
-	while (end < BUFSZ(p) && '\n' != BUF(p)[end])
-		end++;
-	if (end < BUFSZ(p))
-		end++;
-	advanceeoln(p, pos, 1);
+
+	/* We want to suck down the entire line, inclusive \n. */
+	start = *pos;
+	while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) {
+		if ('@' == BUF(p)[*pos])
+			advance(p, pos);
+		advance(p, pos);
+	}
+	if (*pos < BUFSZ(p))
+		advance(p, pos);
+
+	/* Copy this into a buffer. */
 	free(p->subtitle);
-	p->subtitle = malloc(end - start + 1);
-	if (NULL == p->subtitle)
+	if (NULL == (p->subtitle = malloc(*pos - start + 1)))
 		texiabort(p, NULL);
-	memcpy(p->subtitle, &BUF(p)[start], end - start);
-	p->subtitle[end - start] = '\0';
+	memcpy(p->subtitle, &BUF(p)[start], *pos - start);
+	p->subtitle[*pos - start] = '\0';
 }
 
 static void
@@ -1191,6 +1214,9 @@ dosymbol(struct texi *p, enum texicmd cmd, size_t *pos
 	case (TEXICMD_AT):
 		texiputchar(p, '@');
 		break;
+	case (TEXICMD_BACKSLASH):
+		texiputchar(p, '\\');
+		break;
 	case (TEXICMD_BANG):
 		texiputchar(p, '!');
 		break;
@@ -1604,12 +1630,11 @@ static void
 dosp(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
+	advanceeoln(p, pos, 1);
 	if (p->literal)
 		texiputchar(p, '\n');
 	else
 		texivspace(p);
-	/* FIXME: ignore and parseeoln. */
-	advanceeoln(p, pos, 1);
 }
 
 static void
@@ -1681,7 +1706,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t 
 
 	/* Make sure we don't print anything when scanning. */
 	p->ign++;
-	if ('@' == BUF(p)[*pos]) {
+	if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) {
 		/* 
 		 * Look for @columnfractions.
 		 * We ignore these, but we do use the number of
@@ -1733,10 +1758,10 @@ dotable(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 	enum texilist	sv = p->list;
 
+	advanceeoln(p, pos, 1);
+
 	p->list = TEXILIST_ITEM;
 	teximacro(p, "Bl -tag -width Ds");
-	/* FIXME: ignore and parseeoln. */
-	advanceeoln(p, pos, 1);
 	p->seenvs = 1;
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
@@ -1764,12 +1789,12 @@ doenumerate(struct texi *p, enum texicmd cmd, size_t *
 {
 	enum texilist	 sv = p->list;
 
+	advanceeoln(p, pos, 1);
+
 	p->list = TEXILIST_NOITEM;
 	teximacro(p, "Bl -enum");
 	p->seenvs = 1;
-	/* FIXME: ignore and parseeoln. */
-	advanceeoln(p, pos, 1);
-	parseto(p, pos, "enumerate");
+	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
 	p->list = sv;
 }
@@ -1779,12 +1804,12 @@ doitemize(struct texi *p, enum texicmd cmd, size_t *po
 {
 	enum texilist	sv = p->list;
 
+	advanceeoln(p, pos, 1);
+
 	p->list = TEXILIST_NOITEM;
 	teximacro(p, "Bl -bullet");
 	p->seenvs = 1;
-	/* FIXME: ignore and parseeoln. */
-	advanceeoln(p, pos, 1);
-	parseto(p, pos, "itemize");
+	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
 	p->list = sv;
 }
@@ -1802,8 +1827,7 @@ static void
 doignline(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
-	/* FIXME: ignore and parseeoln. */
-	advanceeoln(p,  pos, 1);
+	advanceeoln(p, pos, 1);
 }
 
 /*