* mdocml: merge rev.
@ 2017-01-27 14:23 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-27 14:23 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.241: parse section number from the content of preformatted pages
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.9
retrieving revision 1.220.2.10
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.9 -r1.220.2.10
--- mandocdb.c
+++ mandocdb.c
@@ -1343,29 +1343,48 @@ static void
parse_cat(struct mpage *mpage, int fd)
{
FILE *stream;
- char *line, *p, *title;
+ struct mlink *mlink;
+ char *line, *p, *title, *sec;
size_t linesz, plen, titlesz;
ssize_t len;
int offs;
- stream = (-1 == fd) ?
- fopen(mpage->mlinks->file, "r") :
- fdopen(fd, "r");
- if (NULL == stream) {
- if (-1 != fd)
+ mlink = mpage->mlinks;
+ stream = fd == -1 ? fopen(mlink->file, "r") : fdopen(fd, "r");
+ if (stream == NULL) {
+ if (fd != -1)
close(fd);
if (warnings)
- say(mpage->mlinks->file, "&fopen");
+ say(mlink->file, "&fopen");
return;
}
line = NULL;
linesz = 0;
- /* Skip to first blank line. */
+ /* Parse the section number from the header line. */
- while (getline(&line, &linesz, stream) != -1)
+ while (getline(&line, &linesz, stream) != -1) {
if (*line == '\n')
+ continue;
+ if ((sec = strchr(line, '(')) == NULL)
+ break;
+ if ((p = strchr(++sec, ')')) == NULL)
+ break;
+ free(mpage->sec);
+ mpage->sec = mandoc_strndup(sec, p - sec);
+ if (warnings && *mlink->dsec != '\0' &&
+ strcasecmp(mpage->sec, mlink->dsec))
+ say(mlink->file,
+ "Section \"%s\" manual in %s directory",
+ mpage->sec, mlink->dsec);
+ break;
+ }
+
+ /* Skip to first blank line. */
+
+ while (line == NULL || *line != '\n')
+ if (getline(&line, &linesz, stream) == -1)
break;
/*
@@ -1411,8 +1430,7 @@ parse_cat(struct mpage *mpage, int fd)
if (NULL == title || '\0' == *title) {
if (warnings)
- say(mpage->mlinks->file,
- "Cannot find NAME section");
+ say(mlink->file, "Cannot find NAME section");
fclose(stream);
free(title);
return;
@@ -1431,8 +1449,7 @@ parse_cat(struct mpage *mpage, int fd)
/* Skip to next word. */ ;
} else {
if (warnings)
- say(mpage->mlinks->file,
- "No dash in title line");
+ say(mlink->file, "No dash in title line");
p = title;
}
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-02-05 22:25 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-02-05 22:25 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.495: add missing file man.options.1
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mdocml/mdocml/Makefile,v
retrieving revision 1.488.2.3
retrieving revision 1.488.2.4
diff -LMakefile -LMakefile -u -p -r1.488.2.3 -r1.488.2.4
--- Makefile
+++ Makefile
@@ -148,6 +148,7 @@ DISTFILES = INSTALL \
man.cgi.8 \
man.conf.5 \
man.h \
+ man.options.1 \
manconf.h \
mandoc.1 \
mandoc.3 \
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-28 23:35 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-28 23:35 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.158: new sentence, new line
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
read.c
Revision Data
-------------
Index: read.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/read.c,v
retrieving revision 1.150.2.5
retrieving revision 1.150.2.6
diff -Lread.c -Lread.c -u -p -r1.150.2.5 -r1.150.2.6
--- read.c
+++ read.c
@@ -179,6 +179,7 @@ static const char * const mandocerrs[MAN
"blank line in fill mode, using .sp",
"tab in filled text",
"whitespace at end of input line",
+ "new sentence, new line",
"bad comment style",
"invalid escape sequence",
"undefined string, using \"\"",
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-27 14:19 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-27 14:19 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.240: default to preformatted, not to man(7)
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.8
retrieving revision 1.220.2.9
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.8 -r1.220.2.9
--- mandocdb.c
+++ mandocdb.c
@@ -1192,6 +1192,7 @@ mpages_merge(struct mparse *mp)
if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) {
mparse_readfd(mp, fd, mlink->file);
close(fd);
+ fd = -1;
mparse_result(mp, &man, &sodest);
}
@@ -1248,16 +1249,28 @@ mpages_merge(struct mparse *mp)
mpage->title = mandoc_strdup(man->meta.title);
} else if (man != NULL && man->macroset == MACROSET_MAN) {
man_validate(man);
- mpage->form = FORM_SRC;
- mpage->sec = mandoc_strdup(man->meta.msec);
- mpage->arch = mandoc_strdup(mlink->arch);
- mpage->title = mandoc_strdup(man->meta.title);
- } else {
+ if (*man->meta.msec != '\0' ||
+ *man->meta.msec != '\0') {
+ mpage->form = FORM_SRC;
+ mpage->sec = mandoc_strdup(man->meta.msec);
+ mpage->arch = mandoc_strdup(mlink->arch);
+ mpage->title = mandoc_strdup(man->meta.title);
+ } else
+ man = NULL;
+ }
+
+ assert(mpage->desc == NULL);
+ if (man == NULL) {
mpage->form = FORM_CAT;
mpage->sec = mandoc_strdup(mlink->dsec);
mpage->arch = mandoc_strdup(mlink->arch);
mpage->title = mandoc_strdup(mlink->name);
- }
+ parse_cat(mpage, fd);
+ } else if (man->macroset == MACROSET_MDOC)
+ parse_mdoc(mpage, &man->meta, man->first);
+ else
+ parse_man(mpage, &man->meta, man->first);
+
putkey(mpage, mpage->sec, TYPE_sec);
if (*mpage->arch != '\0')
putkey(mpage, mpage->arch, TYPE_arch);
@@ -1272,13 +1285,6 @@ mpages_merge(struct mparse *mp)
putkey(mpage, mlink->name, NAME_FILE);
}
- assert(mpage->desc == NULL);
- if (man != NULL && man->macroset == MACROSET_MDOC)
- parse_mdoc(mpage, &man->meta, man->first);
- else if (man != NULL)
- parse_man(mpage, &man->meta, man->first);
- else
- parse_cat(mpage, fd);
if (mpage->desc == NULL)
mpage->desc = mandoc_strdup(mpage->mlinks->name);
@@ -1288,7 +1294,6 @@ mpages_merge(struct mparse *mp)
mlink_check(mpage, mlink);
dbadd(mpage);
- mlink = mpage->mlinks;
nextpage:
ohash_delete(&strings);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-27 13:59 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-27 13:59 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.239: fix base directory detection for makewhatis -t
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.7
retrieving revision 1.220.2.8
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.7 -r1.220.2.8
--- mandocdb.c
+++ mandocdb.c
@@ -908,6 +908,20 @@ filescan(const char *file)
}
/*
+ * In test mode or when the original name is absolute
+ * but outside our tree, guess the base directory.
+ */
+
+ if (op == OP_TEST || (start == buf && *start == '/')) {
+ if (strncmp(buf, "man/", 4) == 0)
+ start = buf + 4;
+ else if ((start = strstr(buf, "/man/")) != NULL)
+ start += 5;
+ else
+ start = buf;
+ }
+
+ /*
* First try to guess our directory structure.
* If we find a separator, try to look for man* or cat*.
* If we find one of these and what's underneath is a directory,
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-12 15:48 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-12 15:48 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.55: gcc 6 fix from Alpine Linux
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
configure
Revision Data
-------------
Index: configure
===================================================================
RCS file: /home/cvs/mdocml/mdocml/configure,v
retrieving revision 1.43.2.7
retrieving revision 1.43.2.8
diff -Lconfigure -Lconfigure -u -p -r1.43.2.7 -r1.43.2.8
--- configure
+++ configure
@@ -147,10 +147,10 @@ ismanual() {
singletest() {
cat 1>&3 << __HEREDOC__
${1}${3}: testing...
-${COMP} ${3} -o test-${1} test-${1}.c
+${COMP} -o test-${1} test-${1}.c ${3}
__HEREDOC__
- if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then
+ if ${COMP} -o "test-${1}" "test-${1}.c" ${3} 1>&3 2>&3; then
echo "${1}${3}: ${CC} succeeded" 1>&3
else
echo "${1}${3}: ${CC} failed with $?" 1>&3
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-11 17:47 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-11 17:47 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.237: completion of NODE_NOSRC work
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.6
retrieving revision 1.220.2.7
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.6 -r1.220.2.7
--- mandocdb.c
+++ mandocdb.c
@@ -274,7 +274,7 @@ static const struct mdoc_handler mdocs[M
{ NULL, 0, 0 }, /* Ac */
{ NULL, 0, 0 }, /* Ao */
{ NULL, 0, 0 }, /* Aq */
- { NULL, TYPE_At, NODE_NOSRC }, /* At */
+ { NULL, TYPE_At, 0 }, /* At */
{ NULL, 0, 0 }, /* Bc */
{ NULL, 0, 0 }, /* Bf */
{ NULL, 0, 0 }, /* Bo */
@@ -325,7 +325,7 @@ static const struct mdoc_handler mdocs[M
{ NULL, 0, 0 }, /* Hf */
{ NULL, 0, 0 }, /* Fr */
{ NULL, 0, 0 }, /* Ud */
- { NULL, TYPE_Lb, 0 }, /* Lb */
+ { NULL, TYPE_Lb, NODE_NOSRC }, /* Lb */
{ NULL, 0, 0 }, /* Lp */
{ NULL, TYPE_Lk, 0 }, /* Lk */
{ NULL, TYPE_Mt, NODE_NOSRC }, /* Mt */
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-10 23:40 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-10 23:40 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.236: NODE_NOSRC and NODE_NOPRT for .Bx and .At
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.5
retrieving revision 1.220.2.6
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.5 -r1.220.2.6
--- mandocdb.c
+++ mandocdb.c
@@ -274,13 +274,13 @@ static const struct mdoc_handler mdocs[M
{ NULL, 0, 0 }, /* Ac */
{ NULL, 0, 0 }, /* Ao */
{ NULL, 0, 0 }, /* Aq */
- { NULL, TYPE_At, 0 }, /* At */
+ { NULL, TYPE_At, NODE_NOSRC }, /* At */
{ NULL, 0, 0 }, /* Bc */
{ NULL, 0, 0 }, /* Bf */
{ NULL, 0, 0 }, /* Bo */
{ NULL, 0, 0 }, /* Bq */
{ NULL, TYPE_Bsx, NODE_NOSRC }, /* Bsx */
- { NULL, TYPE_Bx, 0 }, /* Bx */
+ { NULL, TYPE_Bx, NODE_NOSRC }, /* Bx */
{ NULL, 0, 0 }, /* Db */
{ NULL, 0, 0 }, /* Dc */
{ NULL, 0, 0 }, /* Do */
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-10 22:04 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-10 22:04 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.235: use NODE_NOSRC for .Ux, .Ox, and friends
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.4
retrieving revision 1.220.2.5
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.4 -r1.220.2.5
--- mandocdb.c
+++ mandocdb.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2016 Ed Maste <emaste@freebsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -139,6 +139,7 @@ typedef int (*mdoc_fp)(struct mpage *, c
struct mdoc_handler {
mdoc_fp fp; /* optional handler */
uint64_t mask; /* set unless handler returns 0 */
+ int taboo; /* node flags that must not be set */
};
@@ -190,7 +191,7 @@ static int parse_mdoc_Xr(struct mpage *
static void putkey(const struct mpage *, char *, uint64_t);
static void putkeys(const struct mpage *, char *, size_t, uint64_t);
static void putmdockey(const struct mpage *,
- const struct roff_node *, uint64_t);
+ const struct roff_node *, uint64_t, int);
static int render_string(char **, size_t *);
static void say(const char *, const char *, ...)
__attribute__((__format__ (printf, 2, 3)));
@@ -218,129 +219,129 @@ static sqlite3_stmt *stmts[STMT__MAX]; /
static uint64_t name_mask;
static const struct mdoc_handler mdocs[MDOC_MAX] = {
- { NULL, 0 }, /* Ap */
- { NULL, 0 }, /* Dd */
- { NULL, 0 }, /* Dt */
- { NULL, 0 }, /* Os */
- { parse_mdoc_Sh, TYPE_Sh }, /* Sh */
- { parse_mdoc_head, TYPE_Ss }, /* Ss */
- { NULL, 0 }, /* Pp */
- { NULL, 0 }, /* D1 */
- { NULL, 0 }, /* Dl */
- { NULL, 0 }, /* Bd */
- { NULL, 0 }, /* Ed */
- { NULL, 0 }, /* Bl */
- { NULL, 0 }, /* El */
- { NULL, 0 }, /* It */
- { NULL, 0 }, /* Ad */
- { NULL, TYPE_An }, /* An */
- { NULL, TYPE_Ar }, /* Ar */
- { NULL, TYPE_Cd }, /* Cd */
- { NULL, TYPE_Cm }, /* Cm */
- { NULL, TYPE_Dv }, /* Dv */
- { NULL, TYPE_Er }, /* Er */
- { NULL, TYPE_Ev }, /* Ev */
- { NULL, 0 }, /* Ex */
- { NULL, TYPE_Fa }, /* Fa */
- { parse_mdoc_Fd, 0 }, /* Fd */
- { NULL, TYPE_Fl }, /* Fl */
- { parse_mdoc_Fn, 0 }, /* Fn */
- { NULL, TYPE_Ft }, /* Ft */
- { NULL, TYPE_Ic }, /* Ic */
- { NULL, TYPE_In }, /* In */
- { NULL, TYPE_Li }, /* Li */
- { parse_mdoc_Nd, 0 }, /* Nd */
- { parse_mdoc_Nm, 0 }, /* Nm */
- { NULL, 0 }, /* Op */
- { NULL, 0 }, /* Ot */
- { NULL, TYPE_Pa }, /* Pa */
- { NULL, 0 }, /* Rv */
- { NULL, TYPE_St }, /* St */
- { parse_mdoc_Va, TYPE_Va }, /* Va */
- { parse_mdoc_Va, TYPE_Vt }, /* Vt */
- { parse_mdoc_Xr, 0 }, /* Xr */
- { NULL, 0 }, /* %A */
- { NULL, 0 }, /* %B */
- { NULL, 0 }, /* %D */
- { NULL, 0 }, /* %I */
- { NULL, 0 }, /* %J */
- { NULL, 0 }, /* %N */
- { NULL, 0 }, /* %O */
- { NULL, 0 }, /* %P */
- { NULL, 0 }, /* %R */
- { NULL, 0 }, /* %T */
- { NULL, 0 }, /* %V */
- { NULL, 0 }, /* Ac */
- { NULL, 0 }, /* Ao */
- { NULL, 0 }, /* Aq */
- { NULL, TYPE_At }, /* At */
- { NULL, 0 }, /* Bc */
- { NULL, 0 }, /* Bf */
- { NULL, 0 }, /* Bo */
- { NULL, 0 }, /* Bq */
- { NULL, TYPE_Bsx }, /* Bsx */
- { NULL, TYPE_Bx }, /* Bx */
- { NULL, 0 }, /* Db */
- { NULL, 0 }, /* Dc */
- { NULL, 0 }, /* Do */
- { NULL, 0 }, /* Dq */
- { NULL, 0 }, /* Ec */
- { NULL, 0 }, /* Ef */
- { NULL, TYPE_Em }, /* Em */
- { NULL, 0 }, /* Eo */
- { NULL, TYPE_Fx }, /* Fx */
- { NULL, TYPE_Ms }, /* Ms */
- { NULL, 0 }, /* No */
- { NULL, 0 }, /* Ns */
- { NULL, TYPE_Nx }, /* Nx */
- { NULL, TYPE_Ox }, /* Ox */
- { NULL, 0 }, /* Pc */
- { NULL, 0 }, /* Pf */
- { NULL, 0 }, /* Po */
- { NULL, 0 }, /* Pq */
- { NULL, 0 }, /* Qc */
- { NULL, 0 }, /* Ql */
- { NULL, 0 }, /* Qo */
- { NULL, 0 }, /* Qq */
- { NULL, 0 }, /* Re */
- { NULL, 0 }, /* Rs */
- { NULL, 0 }, /* Sc */
- { NULL, 0 }, /* So */
- { NULL, 0 }, /* Sq */
- { NULL, 0 }, /* Sm */
- { NULL, 0 }, /* Sx */
- { NULL, TYPE_Sy }, /* Sy */
- { NULL, TYPE_Tn }, /* Tn */
- { NULL, 0 }, /* Ux */
- { NULL, 0 }, /* Xc */
- { NULL, 0 }, /* Xo */
- { parse_mdoc_Fo, 0 }, /* Fo */
- { NULL, 0 }, /* Fc */
- { NULL, 0 }, /* Oo */
- { NULL, 0 }, /* Oc */
- { NULL, 0 }, /* Bk */
- { NULL, 0 }, /* Ek */
- { NULL, 0 }, /* Bt */
- { NULL, 0 }, /* Hf */
- { NULL, 0 }, /* Fr */
- { NULL, 0 }, /* Ud */
- { NULL, TYPE_Lb }, /* Lb */
- { NULL, 0 }, /* Lp */
- { NULL, TYPE_Lk }, /* Lk */
- { NULL, TYPE_Mt }, /* Mt */
- { NULL, 0 }, /* Brq */
- { NULL, 0 }, /* Bro */
- { NULL, 0 }, /* Brc */
- { NULL, 0 }, /* %C */
- { NULL, 0 }, /* Es */
- { NULL, 0 }, /* En */
- { NULL, TYPE_Dx }, /* Dx */
- { NULL, 0 }, /* %Q */
- { NULL, 0 }, /* br */
- { NULL, 0 }, /* sp */
- { NULL, 0 }, /* %U */
- { NULL, 0 }, /* Ta */
- { NULL, 0 }, /* ll */
+ { NULL, 0, 0 }, /* Ap */
+ { NULL, 0, NODE_NOPRT }, /* Dd */
+ { NULL, 0, NODE_NOPRT }, /* Dt */
+ { NULL, 0, NODE_NOPRT }, /* Os */
+ { parse_mdoc_Sh, TYPE_Sh, 0 }, /* Sh */
+ { parse_mdoc_head, TYPE_Ss, 0 }, /* Ss */
+ { NULL, 0, 0 }, /* Pp */
+ { NULL, 0, 0 }, /* D1 */
+ { NULL, 0, 0 }, /* Dl */
+ { NULL, 0, 0 }, /* Bd */
+ { NULL, 0, 0 }, /* Ed */
+ { NULL, 0, 0 }, /* Bl */
+ { NULL, 0, 0 }, /* El */
+ { NULL, 0, 0 }, /* It */
+ { NULL, 0, 0 }, /* Ad */
+ { NULL, TYPE_An, 0 }, /* An */
+ { NULL, TYPE_Ar, 0 }, /* Ar */
+ { NULL, TYPE_Cd, 0 }, /* Cd */
+ { NULL, TYPE_Cm, 0 }, /* Cm */
+ { NULL, TYPE_Dv, 0 }, /* Dv */
+ { NULL, TYPE_Er, 0 }, /* Er */
+ { NULL, TYPE_Ev, 0 }, /* Ev */
+ { NULL, 0, 0 }, /* Ex */
+ { NULL, TYPE_Fa, 0 }, /* Fa */
+ { parse_mdoc_Fd, 0, 0 }, /* Fd */
+ { NULL, TYPE_Fl, 0 }, /* Fl */
+ { parse_mdoc_Fn, 0, 0 }, /* Fn */
+ { NULL, TYPE_Ft, 0 }, /* Ft */
+ { NULL, TYPE_Ic, 0 }, /* Ic */
+ { NULL, TYPE_In, 0 }, /* In */
+ { NULL, TYPE_Li, 0 }, /* Li */
+ { parse_mdoc_Nd, 0, 0 }, /* Nd */
+ { parse_mdoc_Nm, 0, 0 }, /* Nm */
+ { NULL, 0, 0 }, /* Op */
+ { NULL, 0, 0 }, /* Ot */
+ { NULL, TYPE_Pa, NODE_NOSRC }, /* Pa */
+ { NULL, 0, 0 }, /* Rv */
+ { NULL, TYPE_St, 0 }, /* St */
+ { parse_mdoc_Va, TYPE_Va, 0 }, /* Va */
+ { parse_mdoc_Va, TYPE_Vt, 0 }, /* Vt */
+ { parse_mdoc_Xr, 0, 0 }, /* Xr */
+ { NULL, 0, 0 }, /* %A */
+ { NULL, 0, 0 }, /* %B */
+ { NULL, 0, 0 }, /* %D */
+ { NULL, 0, 0 }, /* %I */
+ { NULL, 0, 0 }, /* %J */
+ { NULL, 0, 0 }, /* %N */
+ { NULL, 0, 0 }, /* %O */
+ { NULL, 0, 0 }, /* %P */
+ { NULL, 0, 0 }, /* %R */
+ { NULL, 0, 0 }, /* %T */
+ { NULL, 0, 0 }, /* %V */
+ { NULL, 0, 0 }, /* Ac */
+ { NULL, 0, 0 }, /* Ao */
+ { NULL, 0, 0 }, /* Aq */
+ { NULL, TYPE_At, 0 }, /* At */
+ { NULL, 0, 0 }, /* Bc */
+ { NULL, 0, 0 }, /* Bf */
+ { NULL, 0, 0 }, /* Bo */
+ { NULL, 0, 0 }, /* Bq */
+ { NULL, TYPE_Bsx, NODE_NOSRC }, /* Bsx */
+ { NULL, TYPE_Bx, 0 }, /* Bx */
+ { NULL, 0, 0 }, /* Db */
+ { NULL, 0, 0 }, /* Dc */
+ { NULL, 0, 0 }, /* Do */
+ { NULL, 0, 0 }, /* Dq */
+ { NULL, 0, 0 }, /* Ec */
+ { NULL, 0, 0 }, /* Ef */
+ { NULL, TYPE_Em, 0 }, /* Em */
+ { NULL, 0, 0 }, /* Eo */
+ { NULL, TYPE_Fx, NODE_NOSRC }, /* Fx */
+ { NULL, TYPE_Ms, 0 }, /* Ms */
+ { NULL, 0, 0 }, /* No */
+ { NULL, 0, 0 }, /* Ns */
+ { NULL, TYPE_Nx, NODE_NOSRC }, /* Nx */
+ { NULL, TYPE_Ox, NODE_NOSRC }, /* Ox */
+ { NULL, 0, 0 }, /* Pc */
+ { NULL, 0, 0 }, /* Pf */
+ { NULL, 0, 0 }, /* Po */
+ { NULL, 0, 0 }, /* Pq */
+ { NULL, 0, 0 }, /* Qc */
+ { NULL, 0, 0 }, /* Ql */
+ { NULL, 0, 0 }, /* Qo */
+ { NULL, 0, 0 }, /* Qq */
+ { NULL, 0, 0 }, /* Re */
+ { NULL, 0, 0 }, /* Rs */
+ { NULL, 0, 0 }, /* Sc */
+ { NULL, 0, 0 }, /* So */
+ { NULL, 0, 0 }, /* Sq */
+ { NULL, 0, 0 }, /* Sm */
+ { NULL, 0, 0 }, /* Sx */
+ { NULL, TYPE_Sy, 0 }, /* Sy */
+ { NULL, TYPE_Tn, 0 }, /* Tn */
+ { NULL, 0, NODE_NOSRC }, /* Ux */
+ { NULL, 0, 0 }, /* Xc */
+ { NULL, 0, 0 }, /* Xo */
+ { parse_mdoc_Fo, 0, 0 }, /* Fo */
+ { NULL, 0, 0 }, /* Fc */
+ { NULL, 0, 0 }, /* Oo */
+ { NULL, 0, 0 }, /* Oc */
+ { NULL, 0, 0 }, /* Bk */
+ { NULL, 0, 0 }, /* Ek */
+ { NULL, 0, 0 }, /* Bt */
+ { NULL, 0, 0 }, /* Hf */
+ { NULL, 0, 0 }, /* Fr */
+ { NULL, 0, 0 }, /* Ud */
+ { NULL, TYPE_Lb, 0 }, /* Lb */
+ { NULL, 0, 0 }, /* Lp */
+ { NULL, TYPE_Lk, 0 }, /* Lk */
+ { NULL, TYPE_Mt, NODE_NOSRC }, /* Mt */
+ { NULL, 0, 0 }, /* Brq */
+ { NULL, 0, 0 }, /* Bro */
+ { NULL, 0, 0 }, /* Brc */
+ { NULL, 0, 0 }, /* %C */
+ { NULL, 0, 0 }, /* Es */
+ { NULL, 0, 0 }, /* En */
+ { NULL, TYPE_Dx, NODE_NOSRC }, /* Dx */
+ { NULL, 0, 0 }, /* %Q */
+ { NULL, 0, 0 }, /* br */
+ { NULL, 0, 0 }, /* sp */
+ { NULL, 0, 0 }, /* %U */
+ { NULL, 0, 0 }, /* Ta */
+ { NULL, 0, 0 }, /* ll */
};
@@ -1456,12 +1457,14 @@ putkey(const struct mpage *mpage, char *
*/
static void
putmdockey(const struct mpage *mpage,
- const struct roff_node *n, uint64_t m)
+ const struct roff_node *n, uint64_t m, int taboo)
{
for ( ; NULL != n; n = n->next) {
+ if (n->flags & taboo)
+ continue;
if (NULL != n->child)
- putmdockey(mpage, n->child, m);
+ putmdockey(mpage, n->child, m, taboo);
if (n->type == ROFFT_TEXT)
putkey(mpage, n->string, m);
}
@@ -1599,6 +1602,8 @@ parse_mdoc(struct mpage *mpage, const st
assert(NULL != n);
for (n = n->child; NULL != n; n = n->next) {
+ if (n->flags & mdocs[n->tok].taboo)
+ continue;
switch (n->type) {
case ROFFT_ELEM:
case ROFFT_BLOCK:
@@ -1610,7 +1615,7 @@ parse_mdoc(struct mpage *mpage, const st
break;
if (mdocs[n->tok].mask)
putmdockey(mpage, n->child,
- mdocs[n->tok].mask);
+ mdocs[n->tok].mask, mdocs[n->tok].taboo);
break;
default:
assert(n->type != ROFFT_ROOT);
@@ -1778,12 +1783,12 @@ parse_mdoc_Nm(struct mpage *mpage, const
{
if (SEC_NAME == n->sec)
- putmdockey(mpage, n->child, NAME_TITLE);
+ putmdockey(mpage, n->child, NAME_TITLE, 0);
else if (n->sec == SEC_SYNOPSIS && n->type == ROFFT_HEAD) {
if (n->child == NULL)
putkey(mpage, meta->name, NAME_SYN);
else
- putmdockey(mpage, n->child, NAME_SYN);
+ putmdockey(mpage, n->child, NAME_SYN, 0);
}
if ( ! (mpage->name_head_done ||
n->child == NULL || n->child->string == NULL ||
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-09 17:57 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-09 17:57 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.279: make "cat foo.mdoc | man -l" work
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
main.c
Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.273.2.3
retrieving revision 1.273.2.4
diff -Lmain.c -Lmain.c -u -p -r1.273.2.3 -r1.273.2.4
--- main.c
+++ main.c
@@ -551,10 +551,10 @@ out:
/* Stop here until moved to the foreground. */
- tc_pgid = tcgetpgrp(STDIN_FILENO);
+ tc_pgid = tcgetpgrp(tag_files->ofd);
if (tc_pgid != man_pgid) {
if (tc_pgid == pager_pid) {
- (void)tcsetpgrp(STDIN_FILENO,
+ (void)tcsetpgrp(tag_files->ofd,
man_pgid);
if (signum == SIGTTIN)
continue;
@@ -567,7 +567,7 @@ out:
/* Once in the foreground, activate the pager. */
if (pager_pid) {
- (void)tcsetpgrp(STDIN_FILENO, pager_pid);
+ (void)tcsetpgrp(tag_files->ofd, pager_pid);
kill(pager_pid, SIGCONT);
} else
pager_pid = spawn_pager(tag_files);
@@ -1097,7 +1097,7 @@ spawn_pager(struct tag_files *tag_files)
break;
default:
(void)setpgid(pager_pid, 0);
- (void)tcsetpgrp(STDIN_FILENO, pager_pid);
+ (void)tcsetpgrp(tag_files->ofd, pager_pid);
#if HAVE_PLEDGE
if (pledge("stdio rpath tmppath tty proc", NULL) == -1)
err((int)MANDOCLEVEL_SYSERR, "pledge");
@@ -1115,7 +1115,7 @@ spawn_pager(struct tag_files *tag_files)
/* Do not start the pager before controlling the terminal. */
- while (tcgetpgrp(STDIN_FILENO) != getpid())
+ while (tcgetpgrp(STDOUT_FILENO) != getpid())
nanosleep(&timeout, NULL);
execvp(argv[0], argv);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-09 2:28 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-09 2:28 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.278: call new function mparse_updaterc()
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
main.c
Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.273.2.2
retrieving revision 1.273.2.3
diff -Lmain.c -Lmain.c -u -p -r1.273.2.2 -r1.273.2.3
--- main.c
+++ main.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2012, 2014-2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -802,6 +802,7 @@ parse(struct curparse *curp, int fd, con
break;
}
}
+ mparse_updaterc(curp->mp, &rc);
}
static void
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-09 2:26 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-09 2:26 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.157: new function mparse_updaterc()
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
read.c
Revision Data
-------------
Index: read.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/read.c,v
retrieving revision 1.150.2.4
retrieving revision 1.150.2.5
diff -Lread.c -Lread.c -u -p -r1.150.2.4 -r1.150.2.5
--- read.c
+++ read.c
@@ -873,6 +873,13 @@ mparse_result(struct mparse *curp, struc
}
void
+mparse_updaterc(struct mparse *curp, enum mandoclevel *rc)
+{
+ if (curp->file_status > *rc)
+ *rc = curp->file_status;
+}
+
+void
mandoc_vmsg(enum mandocerr t, struct mparse *m,
int ln, int pos, const char *fmt, ...)
{
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2017-01-09 2:22 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2017-01-09 2:22 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.154: improve message "whitespace at end of input line"
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
read.c
Revision Data
-------------
Index: read.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/read.c,v
retrieving revision 1.150.2.2
retrieving revision 1.150.2.3
diff -Lread.c -Lread.c -u -p -r1.150.2.2 -r1.150.2.3
--- read.c
+++ read.c
@@ -317,6 +317,7 @@ mparse_buf_r(struct mparse *curp, struct
const char *save_file;
char *cp;
size_t pos; /* byte number in the ln buffer */
+ size_t j; /* auxiliary byte number in the blk buffer */
enum rofferr rr;
int of;
int lnn; /* line number in the real file */
@@ -422,6 +423,7 @@ mparse_buf_r(struct mparse *curp, struct
}
if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) {
+ j = i;
i += 2;
/* Comment, skip to end of line */
for (; i < blk.sz; ++i) {
@@ -432,7 +434,7 @@ mparse_buf_r(struct mparse *curp, struct
mandoc_msg(
MANDOCERR_SPACE_EOL,
curp, curp->line,
- pos, NULL);
+ pos + i-1 - j, NULL);
++i;
++lnn;
break;
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2016-11-10 12:52 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2016-11-10 12:52 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.153: warn about trailing whitespace at the end of comments
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
read.c
Revision Data
-------------
Index: read.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/read.c,v
retrieving revision 1.150.2.1
retrieving revision 1.150.2.2
diff -Lread.c -Lread.c -u -p -r1.150.2.1 -r1.150.2.2
--- read.c
+++ read.c
@@ -425,11 +425,17 @@ mparse_buf_r(struct mparse *curp, struct
i += 2;
/* Comment, skip to end of line */
for (; i < blk.sz; ++i) {
- if ('\n' == blk.buf[i]) {
- ++i;
- ++lnn;
- break;
- }
+ if (blk.buf[i] != '\n')
+ continue;
+ if (blk.buf[i - 1] == ' ' ||
+ blk.buf[i - 1] == '\t')
+ mandoc_msg(
+ MANDOCERR_SPACE_EOL,
+ curp, curp->line,
+ pos, NULL);
+ ++i;
+ ++lnn;
+ break;
}
/* Backout trailing whitespaces */
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2016-10-20 17:52 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2016-10-20 17:52 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.46: work around the lack of EFTYPE
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
configure
Revision Data
-------------
Index: configure
===================================================================
RCS file: /home/cvs/mdocml/mdocml/configure,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -Lconfigure -Lconfigure -u -p -r1.43.2.4 -r1.43.2.5
--- configure
+++ configure
@@ -51,6 +51,7 @@ BUILD_DB=1
BUILD_CGI=0
HAVE_DIRENT_NAMLEN=
+HAVE_EFTYPE=
HAVE_ERR=
HAVE_FTS=
HAVE_GETLINE=
@@ -202,6 +203,7 @@ get_locale() {
# --- library functions ---
runtest dirent-namlen DIRENT_NAMLEN || true
+runtest EFTYPE EFTYPE || true
runtest err ERR || true
runtest fts FTS || true
runtest getline GETLINE || true
@@ -352,6 +354,7 @@ echo "#define MANPATH_DEFAULT \"${MANPAT
[ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
[ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""
[ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
+[ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
[ ${HAVE_PATH_MAX} -eq 0 ] && echo "#define PATH_MAX 4096"
cat << __HEREDOC__
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2016-10-20 17:40 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2016-10-20 17:40 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.233: 0x%llu is a bad idea, make that 0x%llx
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.1
retrieving revision 1.220.2.2
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.1 -r1.220.2.2
--- mandocdb.c
+++ mandocdb.c
@@ -1819,7 +1819,7 @@ putkeys(const struct mpage *mpage, char
name_mask &= ~NAME_FIRST;
if (debug > 1)
say(mpage->mlinks->file,
- "Adding name %*s, bits=0x%llu", (int)sz, cp, v);
+ "Adding name %*s, bits=0x%llx", (int)sz, cp, v);
} else {
htab = &strings;
if (debug > 1)
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: merge rev.
@ 2016-10-20 17:36 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2016-10-20 17:36 UTC (permalink / raw)
To: source
Log Message:
-----------
merge rev. 1.226: fix a typo that prevented names from .Dt
from getting priority over names from .Sh NAME
Tags:
----
VERSION_1_13
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220
retrieving revision 1.220.2.1
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220 -r1.220.2.1
--- mandocdb.c
+++ mandocdb.c
@@ -1771,7 +1771,7 @@ parse_mdoc_Nm(struct mpage *mpage, const
if ( ! (mpage->name_head_done ||
n->child == NULL || n->child->string == NULL ||
strcasecmp(n->child->string, meta->title))) {
- putkey(mpage, n->child->string, ROFFT_HEAD);
+ putkey(mpage, n->child->string, NAME_HEAD);
mpage->name_head_done = 1;
}
return 0;
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: Merge rev.
@ 2013-09-18 2:24 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2013-09-18 2:24 UTC (permalink / raw)
To: source
Log Message:
-----------
Merge rev. 1.400:
Stop producing xhtml/pdf/etc for webpage.
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.395.2.1
retrieving revision 1.395.2.2
diff -LMakefile -LMakefile -u -p -r1.395.2.1 -r1.395.2.2
--- Makefile
+++ Makefile
@@ -1,11 +1,7 @@
.PHONY: clean install installwww
.SUFFIXES: .sgml .html .md5 .h .h.html
.SUFFIXES: .1 .3 .7 .8
-.SUFFIXES: .1.txt .3.txt .7.txt .8.txt
-.SUFFIXES: .1.pdf .3.pdf .7.pdf .8.pdf
-.SUFFIXES: .1.ps .3.ps .7.ps .8.ps
.SUFFIXES: .1.html .3.html .7.html .8.html
-.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml .8.xhtml
# Specify this if you want to hard-code the operating system to appear
# in the lower-left hand corner of -mdoc manuals.
@@ -272,80 +268,20 @@ DEMANDOC_OBJS = demandoc.o
$(DEMANDOC_OBJS): config.h
INDEX_MANS = apropos.1.html \
- apropos.1.xhtml \
- apropos.1.ps \
- apropos.1.pdf \
- apropos.1.txt \
catman.8.html \
- catman.8.xhtml \
- catman.8.ps \
- catman.8.pdf \
- catman.8.txt \
demandoc.1.html \
- demandoc.1.xhtml \
- demandoc.1.ps \
- demandoc.1.pdf \
- demandoc.1.txt \
mandoc.1.html \
- mandoc.1.xhtml \
- mandoc.1.ps \
- mandoc.1.pdf \
- mandoc.1.txt \
whatis.1.html \
- whatis.1.xhtml \
- whatis.1.ps \
- whatis.1.pdf \
- whatis.1.txt \
mandoc.3.html \
- mandoc.3.xhtml \
- mandoc.3.ps \
- mandoc.3.pdf \
- mandoc.3.txt \
eqn.7.html \
- eqn.7.xhtml \
- eqn.7.ps \
- eqn.7.pdf \
- eqn.7.txt \
man.7.html \
- man.7.xhtml \
- man.7.ps \
- man.7.pdf \
- man.7.txt \
man.cgi.7.html \
- man.cgi.7.xhtml \
- man.cgi.7.ps \
- man.cgi.7.pdf \
- man.cgi.7.txt \
mandoc_char.7.html \
- mandoc_char.7.xhtml \
- mandoc_char.7.ps \
- mandoc_char.7.pdf \
- mandoc_char.7.txt \
mdoc.7.html \
- mdoc.7.xhtml \
- mdoc.7.ps \
- mdoc.7.pdf \
- mdoc.7.txt \
preconv.1.html \
- preconv.1.xhtml \
- preconv.1.ps \
- preconv.1.pdf \
- preconv.1.txt \
roff.7.html \
- roff.7.xhtml \
- roff.7.ps \
- roff.7.pdf \
- roff.7.txt \
tbl.7.html \
- tbl.7.xhtml \
- tbl.7.ps \
- tbl.7.pdf \
- tbl.7.txt \
- mandocdb.8.html \
- mandocdb.8.xhtml \
- mandocdb.8.ps \
- mandocdb.8.pdf \
- mandocdb.8.txt
+ mandocdb.8.html
$(INDEX_MANS): mandoc
@@ -479,20 +415,8 @@ config.h: config.h.pre config.h.post
.h.h.html:
highlight -I $< >$@
-.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
- ./mandoc -Tascii -Wall,stop $< | col -b >$@
-
.1.1.html .3.3.html .7.7.html .8.8.html:
./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
-
-.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
- ./mandoc -Tps -Wall,stop $< >$@
-
-.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml:
- ./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
-
-.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
- ./mandoc -Tpdf -Wall,stop $< >$@
.sgml.html:
validate --warn $<
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: Merge rev.
@ 2013-09-18 1:55 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2013-09-18 1:55 UTC (permalink / raw)
To: source
Log Message:
-----------
Merge rev. 1.158:
Stop producing xhtml/pdf/etc for webpage.
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
index.sgml
Revision Data
-------------
Index: index.sgml
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/index.sgml,v
retrieving revision 1.154
retrieving revision 1.154.2.1
diff -Lindex.sgml -Lindex.sgml -u -p -r1.154 -r1.154.2.1
--- index.sgml
+++ index.sgml
@@ -122,150 +122,90 @@
<TD VALIGN="top"><A HREF="apropos.1.html">apropos(1)</A></TD>
<TD VALIGN="top">
search the manual page database
- (<A HREF="apropos.1.txt">text</A> |
- <A HREF="apropos.1.xhtml">xhtml</A> |
- <A HREF="apropos.1.pdf">pdf</A> |
- <A HREF="apropos.1.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="demandoc.1.html">demandoc(1)</A></TD>
<TD VALIGN="top">
emit only text of UNIX manuals
- (<A HREF="demandoc.1.txt">text</A> |
- <A HREF="demandoc.1.xhtml">xhtml</A> |
- <A HREF="demandoc.1.pdf">pdf</A> |
- <A HREF="demandoc.1.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="mandoc.1.html">mandoc(1)</A></TD>
<TD VALIGN="top">
format and display UNIX manuals
- (<A HREF="mandoc.1.txt">text</A> |
- <A HREF="mandoc.1.xhtml">xhtml</A> |
- <A HREF="mandoc.1.pdf">pdf</A> |
- <A HREF="mandoc.1.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="preconv.1.html">preconv(1)</A></TD>
<TD VALIGN="top">
recode multibyte UNIX manuals
- (<A HREF="preconv.1.txt">text</A> |
- <A HREF="preconv.1.xhtml">xhtml</A> |
- <A HREF="preconv.1.pdf">pdf</A> |
- <A HREF="preconv.1.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="whatis.1.html">whatis(1)</A></TD>
<TD VALIGN="top">
search the manual page database
- (<A HREF="whatis.1.txt">text</A> |
- <A HREF="whatis.1.xhtml">xhtml</A> |
- <A HREF="whatis.1.pdf">pdf</A> |
- <A HREF="whatis.1.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="mandoc.3.html">mandoc(3)</A></TD>
<TD VALIGN="top">
mandoc macro compiler library
- (<A HREF="mandoc.3.txt">text</A> |
- <A HREF="mandoc.3.xhtml">xhtml</A> |
- <A HREF="mandoc.3.pdf">pdf</A> |
- <A HREF="mandoc.3.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="man.7.html">man(7)</A></TD>
<TD VALIGN="top">
man language reference
- (<A HREF="man.7.txt">text</A> |
- <A HREF="man.7.xhtml">xhtml</A> |
- <A HREF="man.7.pdf">pdf</A> |
- <A HREF="man.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="man.cgi.7.html">man.cgi(7)</A></TD>
<TD VALIGN="top">
cgi for manpage query and display
- (<A HREF="man.cgi.7.txt">text</A> |
- <A HREF="man.cgi.7.xhtml">xhtml</A> |
- <A HREF="man.cgi.7.pdf">pdf</A> |
- <A HREF="man.cgi.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="eqn.7.html">eqn(7)</A></TD>
<TD VALIGN="top">
eqn-mandoc language reference
- (<A HREF="eqn.7.txt">text</A> |
- <A HREF="eqn.7.xhtml">xhtml</A> |
- <A HREF="eqn.7.pdf">pdf</A> |
- <A HREF="eqn.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="mandoc_char.7.html">mandoc_char(7)</A></TD>
<TD VALIGN="top">
mandoc special characters
- (<A HREF="mandoc_char.7.txt">text</A> |
- <A HREF="mandoc_char.7.xhtml">xhtml</A> |
- <A HREF="mandoc_char.7.pdf">pdf</A> |
- <A HREF="mandoc_char.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="mdoc.7.html">mdoc(7)</A></TD>
<TD VALIGN="top">
mdoc language reference
- (<A HREF="mdoc.7.txt">text</A> |
- <A HREF="mdoc.7.xhtml">xhtml</A> |
- <A HREF="mdoc.7.pdf">pdf</A> |
- <A HREF="mdoc.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="roff.7.html">roff(7)</A></TD>
<TD VALIGN="top">
roff-mandoc language reference
- (<A HREF="roff.7.txt">text</A> |
- <A HREF="roff.7.xhtml">xhtml</A> |
- <A HREF="roff.7.pdf">pdf</A> |
- <A HREF="roff.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="tbl.7.html">tbl(7)</A></TD>
<TD VALIGN="top">
tbl-mandoc language reference
- (<A HREF="tbl.7.txt">text</A> |
- <A HREF="tbl.7.xhtml">xhtml</A> |
- <A HREF="tbl.7.pdf">pdf</A> |
- <A HREF="tbl.7.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="catman.8.html">catman(8)</A></TD>
<TD VALIGN="top">
update a man.cgi manpage cache
- (<A HREF="catman.8.txt">text</A> |
- <A HREF="catman.8.xhtml">xhtml</A> |
- <A HREF="catman.8.pdf">pdf</A> |
- <A HREF="catman.8.ps">ps</A>)
</TD>
</TR>
<TR>
<TD VALIGN="top"><A HREF="mandocdb.8.html">mandocdb(8)</A></TD>
<TD VALIGN="top">
index UNIX manuals
- (<A HREF="mandocdb.8.txt">text</A> |
- <A HREF="mandocdb.8.xhtml">xhtml</A> |
- <A HREF="mandocdb.8.pdf">pdf</A> |
- <A HREF="mandocdb.8.ps">ps</A>)
</TD>
</TR>
</TBODY>
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: Merge rev.
@ 2013-09-17 20:42 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2013-09-17 20:42 UTC (permalink / raw)
To: source
Log Message:
-----------
Merge rev. 1.21:
For citing the names and email addresses of authors,
consistently use the style ".An name Aq Mt email".
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
apropos.1
Revision Data
-------------
Index: apropos.1
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/apropos.1,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -Lapropos.1 -Lapropos.1 -u -p -r1.16.2.1 -r1.16.2.2
--- apropos.1
+++ apropos.1
@@ -308,5 +308,4 @@ as variable names in the library categor
The
.Nm
utility was written by
-.An Kristaps Dzonsons ,
-.Mt kristaps@bsd.lv .
+.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv .
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
* mdocml: Merge rev.
@ 2013-09-17 20:39 schwarze
0 siblings, 0 replies; 21+ messages in thread
From: schwarze @ 2013-09-17 20:39 UTC (permalink / raw)
To: source
Log Message:
-----------
Merge rev. 1.20:
Revert the argument names in the SYNOPSIS back to the usual ones.
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
apropos.1
Revision Data
-------------
Index: apropos.1
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/apropos.1,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -Lapropos.1 -Lapropos.1 -u -p -r1.16 -r1.16.2.1
--- apropos.1
+++ apropos.1
@@ -23,8 +23,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl C Ar file
-.Op Fl M Ar manpath
-.Op Fl m Ar manpath
+.Op Fl M Ar path
+.Op Fl m Ar path
.Op Fl S Ar arch
.Op Fl s Ar section
.Ar expression ...
@@ -58,13 +58,13 @@ Specify an alternative configuration
in
.Xr man.conf 5
format.
-.It Fl M Ar manpath
+.It Fl M Ar path
Use the colon-separated path instead of the default list of paths
searched for
.Xr mandocdb 8
databases.
Invalid paths, or paths without manual databases, are ignored.
-.It Fl m Ar manpath
+.It Fl m Ar path
Prepend the colon-separated paths to the list of paths searched
for
.Xr mandocdb 8
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2017-02-05 22:25 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-27 14:23 mdocml: merge rev schwarze
-- strict thread matches above, loose matches on Subject: below --
2017-02-05 22:25 schwarze
2017-01-28 23:35 schwarze
2017-01-27 14:19 schwarze
2017-01-27 13:59 schwarze
2017-01-12 15:48 schwarze
2017-01-11 17:47 schwarze
2017-01-10 23:40 schwarze
2017-01-10 22:04 schwarze
2017-01-09 17:57 schwarze
2017-01-09 2:28 schwarze
2017-01-09 2:26 schwarze
2017-01-09 2:22 schwarze
2016-11-10 12:52 schwarze
2016-10-20 17:52 schwarze
2016-10-20 17:40 schwarze
2016-10-20 17:36 schwarze
2013-09-18 2:24 mdocml: Merge rev schwarze
2013-09-18 1:55 schwarze
2013-09-17 20:42 schwarze
2013-09-17 20:39 schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).