===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- texi2mdoc/main.c	2015/02/28 13:16:44	1.54
+++ texi2mdoc/main.c	2015/03/01 00:25:07	1.55
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.54 2015/02/28 13:16:44 kristaps Exp $ */
+/*	$Id: main.c,v 1.55 2015/03/01 00:25:07 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "extern.h"
@@ -1553,9 +1552,11 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po
 	int		 sec;
 
 	switch (cmd) {
+	case (TEXICMD_TOP):
+		sec = 0;
+		break;
 	case (TEXICMD_APPENDIX):
 	case (TEXICMD_CHAPTER):
-	case (TEXICMD_TOP):
 	case (TEXICMD_UNNUMBERED):
 		sec = sectioner(p, 0);
 		break;
@@ -1574,6 +1575,11 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po
 	else if (p->literal)
 		texierr(p, "\"%s\" in a literal scope!?", sects[sec]);
 
+	if (0 == sec && NULL != p->chapters) {
+		teximdocclose(p, 0);
+		teximdocopen(p);
+	}
+
 	teximacroopen(p, sects[sec]);
 	parseeoln(p, pos);
 	teximacroclose(p);
@@ -1581,6 +1587,18 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po
 }
 
 static void
+dotop(struct texi *p, enum texicmd cmd, size_t *pos)
+{
+
+	if (--p->ign)
+		texierr(p, "@top command while ignoring");
+
+	if (NULL == p->chapters)
+		teximdocopen(p);
+	dosection(p, cmd, pos);
+}
+
+static void
 dosp(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
@@ -1593,51 +1611,6 @@ dosp(struct texi *p, enum texicmd cmd, size_t *pos)
 }
 
 static void
-dotop(struct texi *p, enum texicmd cmd, size_t *pos)
-{
-	const char	*cp;
-	time_t		 t;
-	char		 date[32];
-
-	if (--p->ign)
-		texierr(p, "@top command while ignoring");
-
-	/*
-	 * Here we print our standard mdoc(7) prologue.
-	 * We use the title set with @settitle for the `Nd' description
-	 * and the source document filename (the first one as invoked on
-	 * the command line) for the title.
-	 * The date is set to the current date.
-	 */
-	t = time(NULL);
-	strftime(date, sizeof(date), "%F", localtime(&t));
-
-	teximacroopen(p, "Dd");
-	texiputchars(p, date);
-	teximacroclose(p);
-	teximacroopen(p, "Dt");
-	for (cp = p->title; '\0' != *cp; cp++)
-		texiputchar(p, toupper((unsigned int)*cp));
-	texiputchars(p, " 7");
-	teximacroclose(p);
-	teximacro(p, "Os");
-	teximacro(p, "Sh NAME");
-	teximacroopen(p, "Nm");
-	for (cp = p->title; '\0' != *cp; cp++)
-		texiputchar(p, *cp);
-	teximacroclose(p);
-	teximacroopen(p, "Nd");
-	if (NULL != p->subtitle)
-		for (cp = p->subtitle; '\0' != *cp; cp++)
-			texiputchar(p, *cp);
-	else
-		texiputchars(p, "Unknown description");
-	teximacroclose(p);
-	p->seenvs = 1;
-	dosection(p, cmd, pos);
-}
-
-static void
 doitem(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
@@ -1885,10 +1858,14 @@ main(int argc, char *argv[])
 
 	memset(&texi, 0, sizeof(struct texi));
 	texi.ign = 1;
+	texi.outfile = stdout;
 	Idir = NULL;
 
-	while (-1 != (c = getopt(argc, argv, "I:"))) 
+	while (-1 != (c = getopt(argc, argv, "C:I:"))) 
 		switch (c) {
+		case ('C'):
+			texi.chapters = optarg;
+			break;
 		case ('I'):
 			Idir = optarg;
 			break;
@@ -1924,6 +1901,6 @@ main(int argc, char *argv[])
 	texiexit(&texi);
 	return(EXIT_FAILURE);
 usage:
-	fprintf(stderr, "usage: %s [-Idirs] [file]\n", progname);
+	fprintf(stderr, "usage: %s [-Cdir] [-Idirs] [file]\n", progname);
 	return(EXIT_FAILURE);
 }