* mdocml: Retire support for CSRG supplementary document titles.
@ 2014-11-28 18:36 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2014-11-28 18:36 UTC (permalink / raw)
To: source
Log Message:
-----------
Retire support for CSRG supplementary document titles. These are
long obsolete and were never written in mdoc(7) in the first place.
Removes 100 lines from source files.
Modified Files:
--------------
mdocml:
Makefile
libmdoc.h
mdoc.7
mdoc_validate.c
Removed Files:
-------------
mdocml:
vol.c
vol.in
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mdocml/mdocml/Makefile,v
retrieving revision 1.446
retrieving revision 1.447
diff -LMakefile -LMakefile -u -p -r1.446 -r1.447
--- Makefile
+++ Makefile
@@ -92,7 +92,6 @@ SRCS = att.c \
term_ascii.c \
term_ps.c \
tree.c \
- vol.c \
$(TESTSRCS)
DISTFILES = INSTALL \
@@ -150,7 +149,6 @@ DISTFILES = INSTALL \
tbl.3 \
tbl.7 \
term.h \
- vol.in \
$(SRCS)
LIBMAN_OBJS = man.o \
@@ -165,8 +163,7 @@ LIBMDOC_OBJS = att.o \
mdoc_hash.o \
mdoc_macro.o \
mdoc_validate.o \
- st.o \
- vol.o
+ st.o
LIBROFF_OBJS = eqn.o \
roff.o \
--- vol.in
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $Id: vol.in,v 1.6 2010/06/19 20:46:28 kristaps Exp $ */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file defines volume titles for .Dt.
- *
- * Be sure to escape strings.
- */
-
-LINE("USD", "User\'s Supplementary Documents")
-LINE("PS1", "Programmer\'s Supplementary Documents")
-LINE("AMD", "Ancestral Manual Documents")
-LINE("SMM", "System Manager\'s Manual")
-LINE("URM", "User\'s Reference Manual")
-LINE("PRM", "Programmer\'s Manual")
-LINE("KM", "Kernel Manual")
-LINE("IND", "Manual Master Index")
-LINE("MMI", "Manual Master Index")
-LINE("LOCAL", "Local Manual")
-LINE("LOC", "Local Manual")
-LINE("CON", "Contributed Software Manual")
Index: mdoc_validate.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_validate.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.261 -r1.262
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -2280,19 +2280,9 @@ post_dt(POST_ARGS)
mdoc->meta.msec = mandoc_strdup(nn->string);
}
- if (NULL == (nn = nn->next))
- goto out;
+ /* Handle an optional architecture */
- /*
- * If the third argument is a volume name, format is,
- * otherwise assume it's an architecture.
- */
-
- cp = mdoc_a2vol(nn->string);
- if (cp) {
- free(mdoc->meta.vol);
- mdoc->meta.vol = mandoc_strdup(cp);
- } else {
+ if ((nn = nn->next) != NULL) {
for (p = nn->string; *p; p++)
*p = tolower((unsigned char)*p);
mdoc->meta.arch = mandoc_strdup(nn->string);
Index: libmdoc.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/libmdoc.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -Llibmdoc.h -Llibmdoc.h -u -p -r1.92 -r1.93
--- libmdoc.h
+++ libmdoc.h
@@ -125,7 +125,6 @@ const char *mdoc_a2att(const char *);
const char *mdoc_a2lib(const char *);
const char *mdoc_a2st(const char *);
const char *mdoc_a2arch(const char *);
-const char *mdoc_a2vol(const char *);
void mdoc_valid_pre(struct mdoc *, struct mdoc_node *);
void mdoc_valid_post(struct mdoc *);
enum margverr mdoc_argv(struct mdoc *, int, enum mdoct,
--- vol.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id: vol.c,v 1.11 2014/08/10 23:54:41 schwarze Exp $ */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include "config.h"
-
-#include <sys/types.h>
-
-#include <string.h>
-
-#include "mdoc.h"
-#include "libmdoc.h"
-
-#define LINE(x, y) \
- if (0 == strcmp(p, x)) return(y);
-
-const char *
-mdoc_a2vol(const char *p)
-{
-
-#include "vol.in"
-
- return(NULL);
-}
Index: mdoc.7
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc.7,v
retrieving revision 1.243
retrieving revision 1.244
diff -Lmdoc.7 -Lmdoc.7 -u -p -r1.243 -r1.244
--- mdoc.7
+++ mdoc.7
@@ -433,7 +433,7 @@ in the alphabetical
.Ss Document preamble and NAME section macros
.Bl -column "Brq, Bro, Brc" description
.It Sx \&Dd Ta document date: Cm $\&Mdocdate$ | Ar month day , year
-.It Sx \&Dt Ta document title: Ar TITLE section Op Ar volume | arch
+.It Sx \&Dt Ta document title: Ar TITLE section Op Ar arch
.It Sx \&Os Ta operating system version: Op Ar system Op Ar version
.It Sx \&Nm Ta document name (one argument)
.It Sx \&Nd Ta document description (one line)
@@ -1299,7 +1299,7 @@ Its syntax is as follows:
.Pf \. Sx \&Dt
.Ar TITLE
.Ar section
-.Op Ar volume | arch
+.Op Ar arch
.Ed
.Pp
Its arguments are as follows:
@@ -1348,35 +1348,6 @@ or
.Pq paper .
It should correspond to the manual's filename suffix and defaults to
the empty string if unspecified.
-.It Ar volume
-This overrides the volume inferred from
-.Ar section .
-This field is optional, and if specified, must be one of
-.Cm USD
-.Pq users' supplementary documents ,
-.Cm PS1
-.Pq programmers' supplementary documents ,
-.Cm AMD
-.Pq administrators' supplementary documents ,
-.Cm SMM
-.Pq system managers' manuals ,
-.Cm URM
-.Pq users' reference manuals ,
-.Cm PRM
-.Pq programmers' reference manuals ,
-.Cm KM
-.Pq kernel manuals ,
-.Cm IND
-.Pq master index ,
-.Cm MMI
-.Pq master index ,
-.Cm LOCAL
-.Pq local manuals ,
-.Cm LOC
-.Pq local manuals ,
-or
-.Cm CON
-.Pq contributed manuals .
.It Ar arch
This specifies the machine architecture a manual page applies to,
where relevant, for example
@@ -1390,7 +1361,6 @@ The list of valid architectures varies b
.Pp
Examples:
.Dl \&.Dt FOO 1
-.Dl \&.Dt FOO 4 KM
.Dl \&.Dt FOO 9 i386
.Pp
See also
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-28 18:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-28 18:36 mdocml: Retire support for CSRG supplementary document titles 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).