===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -p -r1.8 -r1.10
--- texi2mdoc/main.c	2015/02/18 12:03:21	1.8
+++ texi2mdoc/main.c	2015/02/18 15:30:31	1.10
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.8 2015/02/18 12:03:21 kristaps Exp $ */
+/*	$Id: main.c,v 1.10 2015/02/18 15:30:31 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 /*
@@ -135,6 +136,7 @@ enum	texicmd {
 	TEXICMD_UREF,
 	TEXICMD_URL,
 	TEXICMD_VAR,
+	TEXICMD_VSKIP,
 	TEXICMD_W,
 	TEXICMD_XREF,
 	TEXICMD__MAX
@@ -190,6 +192,8 @@ struct	texi {
 	int		  seenws; /* ws has been seen (and ignored) */
 	int		  ign; /* if >0, don't print anything */
 	int		  literal; /* if >0, literal context */
+	char		 *title; /* title of document */
+	char		 *subtitle; /* subtitle of document */
 };
 
 /* FIXME: FIND A BETTER WAY. */
@@ -200,6 +204,8 @@ struct	texi {
 /* Texi disregards spaces and tabs. */
 #define	isws(_x) \
 	(' ' == (_x) || '\t' == (_x))
+#define	ismspace(_x) \
+	(isws((_x)) || '\n' == (_x))
 
 static	void doblock(struct texi *, enum texicmd, const char *, size_t, size_t *);
 static	void dobracket(struct texi *, enum texicmd, const char *, size_t, size_t *);
@@ -232,6 +238,7 @@ static	void dosection(struct texi *, enum texicmd, con
 static	void dosp(struct texi *, enum texicmd, const char *, size_t, size_t *);
 static	void dosubsection(struct texi *, enum texicmd, const char *, size_t, size_t *);
 static	void dosymbol(struct texi *, enum texicmd, const char *, size_t, size_t *);
+static	void dotitle(struct texi *, enum texicmd, const char *, size_t, size_t *);
 
 static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doignargn, "acronym", 7 }, /* TEXICMD_ACRONYM */
@@ -312,7 +319,7 @@ 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 */
+	{ dotitle, "settitle", 8 }, /* TEXICMD_SETTITLE */
 	{ dosp, "sp", 2 }, /* TEXICMD_SP */
 	{ dosymbol, " ", 1 }, /* TEXICMD_SPACE */
 	{ doexample, "smallexample", 12 }, /* TEXICMD_SMALLEXAMPLE */
@@ -334,6 +341,7 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ dolink, "uref", 4 }, /* TEXICMD_UREF */
 	{ dolink, "url", 3 }, /* TEXICMD_URL */
 	{ doliteral, "var", 3 }, /* TEXICMD_VAR */
+	{ dosp, "vskip", 5 }, /* TEXICMD_VSKIP */
 	{ dobracket, "w", 1 }, /* TEXICMD_W */
 	{ dolink, "xref", 4 }, /* TEXICMD_XREF */
 };
@@ -369,7 +377,10 @@ texiexit(struct texi *p)
 
 	for (i = 0; i < p->dirsz; i++)
 		free(p->dirs[i]);
+
 	free(p->dirs);
+	free(p->subtitle);
+	free(p->title);
 }
 
 /*
@@ -534,7 +545,7 @@ advancenext(struct texi *p, const char *buf, size_t sz
 {
 	
 	if (p->literal) {
-		while (*pos < sz && isspace(buf[*pos])) {
+		while (*pos < sz && ismspace(buf[*pos])) {
 			if (*pos && '\n' == buf[*pos] && 
 				'\\' == buf[*pos - 1])
 				texiputchar(p, 'e');
@@ -544,7 +555,7 @@ advancenext(struct texi *p, const char *buf, size_t sz
 		return(*pos);
 	} 
 
-	while (*pos < sz && isspace(buf[*pos])) {
+	while (*pos < sz && ismspace(buf[*pos])) {
 		p->seenws = 1;
 		/* 
 		 * If it looks like we've printed a double-line, then
@@ -606,7 +617,7 @@ texiword(struct texi *p, const char *buf, 
 
 	p->seenws = 0;
 
-	while (*pos < sz && ! isspace(buf[*pos])) {
+	while (*pos < sz && ! ismspace(buf[*pos])) {
 		switch (buf[*pos]) {
 		case ('@'):
 		case ('}'):
@@ -644,12 +655,15 @@ texicmd(struct texi *p, const char *buf, 
 
 	assert('@' == buf[pos]);
 
-	if (++pos >= sz)
+	if ((*end = pos) == sz)
 		return(TEXICMD__MAX);
+	else if ((*end = ++pos) == sz)
+		return(TEXICMD__MAX);
 
 	/* Alphabetic commands are special. */
 	if ( ! isalpha(buf[pos])) {
-		*end = pos + 1;
+		if ((*end = pos + 1) == sz)
+			return(TEXICMD__MAX);
 		for (i = 0; i < TEXICMD__MAX; i++) {
 			if (1 != texitoks[i].len)
 				continue;
@@ -660,7 +674,7 @@ texicmd(struct texi *p, const char *buf, 
 		return(TEXICMD__MAX);
 	}
 
-	for (*end = pos; *end < sz && ! isspace(buf[*end]); (*end)++)
+	for (*end = pos; *end < sz && ! ismspace(buf[*end]); (*end)++)
 		if ((*end > pos && ('@' == buf[*end] || 
 			  '{' == buf[*end] || '}' == buf[*end])))
 			break;
@@ -692,7 +706,7 @@ parsearg(struct texi *p, const char *buf, 
 	size_t		 end;
 	enum texicmd	 cmd;
 
-	while (*pos < sz && isspace(buf[*pos]))
+	while (*pos < sz && ismspace(buf[*pos]))
 		advance(p, buf, pos);
 	if (*pos == sz || (0 == num && '{' != buf[*pos]))
 		return(0);
@@ -739,7 +753,7 @@ parsebracket(struct texi *p, const char *buf, size_t s
 	size_t		 end;
 	enum texicmd	 cmd;
 
-	while (*pos < sz && isspace(buf[*pos]))
+	while (*pos < sz && ismspace(buf[*pos]))
 		advance(p, buf, pos);
 
 	if (*pos == sz || '{' != buf[*pos])
@@ -1066,7 +1080,7 @@ doinline(struct texi *p, const char *buf, 
 	parsebracket(p, buf, sz, pos);
 	if (*pos < sz - 1 && 
 		 ismpunct(buf[*pos]) && 
-		 isspace(buf[*pos + 1])) {
+		 ismspace(buf[*pos + 1])) {
 		texiputchar(p, ' ');
 		texiputchar(p, buf[*pos]);
 		advance(p, buf, pos);
@@ -1228,6 +1242,23 @@ dobye(struct texi *p, enum texicmd cmd, 
 }
 
 static void
+dotitle(struct texi *p, enum texicmd cmd, 
+	const char *buf, size_t sz, size_t *pos)
+{
+	size_t	 start, end;
+
+	while (*pos < sz && isws(buf[*pos]))
+		advance(p, buf, pos);
+	start = end = *pos;
+	while (end < sz && '\n' != buf[end])
+		end++;
+	free(p->subtitle);
+	p->subtitle = malloc(end - start + 1);
+	memcpy(p->subtitle, &buf[start], end - start);
+	p->subtitle[end - start] = '\0';
+}
+
+static void
 dosymbol(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
@@ -1365,7 +1396,7 @@ dolink(struct texi *p, enum texicmd cmd, 
 
 	if (*pos < sz - 1 && 
 		 ismpunct(buf[*pos]) && 
-		 isspace(buf[*pos + 1])) {
+		 ismspace(buf[*pos + 1])) {
 		texiputchar(p, ' ');
 		texiputchar(p, buf[*pos]);
 		advance(p, buf, pos);
@@ -1442,15 +1473,31 @@ static void
 dotop(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
+	const char	*cp;
+	time_t		 t;
+	char		 date[32];
 
+	t = time(NULL);
+	strftime(date, sizeof(date), "%F", localtime(&t));
+
 	p->ign--;
 	advanceeoln(p, buf, sz, pos, 1);
-	teximacro(p, "Dd $Mdocdate: February 18 2015 $");
-	teximacro(p, "Dt SOMETHING 7");
+	teximacroopen(p, "Dd");
+	texiputchars(p, date);
+	teximacroclose(p);
+	teximacroopen(p, "Dt");
+	for (cp = p->title; '\0' != *cp; cp++)
+		texiputchar(p, toupper(*cp));
+	teximacroclose(p);
 	teximacro(p, "Os");
 	teximacro(p, "Sh NAME");
-	teximacro(p, "Nm Something");
-	teximacro(p, "Nd Something");
+	teximacroopen(p, "Nm");
+	texiputchars(p, p->title);
+	teximacroclose(p);
+	teximacroopen(p, "Nd");
+	texiputchars(p, NULL != p->subtitle ?
+		p->subtitle : "Unknown description");
+	teximacroclose(p);
 }
 
 static void
@@ -1479,7 +1526,7 @@ doitem(struct texi *p, enum texicmd cmd, 
 
 	if (TEXILIST_ITEM == p->list)
 		teximacroclose(p);
-	else
+	else if (p->outcol > 0)
 		texiputchar(p, '\n');
 }
 
@@ -1592,7 +1639,7 @@ main(int argc, char *argv[])
 	struct texi	 texi;
 	int		 c;
 	char		*path, *dir;
-	const char	*progname, *Idir;
+	const char	*progname, *Idir, *cp;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -1600,7 +1647,9 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
+	memset(&texi, 0, sizeof(struct texi));
 	Idir = NULL;
+
 	while (-1 != (c = getopt(argc, argv, "I:"))) 
 		switch (c) {
 		case ('I'):
@@ -1624,7 +1673,17 @@ main(int argc, char *argv[])
 	}
 	free(path);
 
-	memset(&texi, 0, sizeof(struct texi));
+	if (NULL != (cp = strrchr(argv[0], '/'))) 
+		texi.title = strdup(cp + 1);
+	else
+		texi.title = strdup(argv[0]);
+
+	if (NULL == texi.title) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	} else if (NULL != (path = strchr(texi.title, '.')))
+		*path = '\0';
+
 	texi.ign = 1;
 	texi.dirs = parsedirs(dir, Idir, &texi.dirsz);
 	parsefile(&texi, argv[0]);