From a6b655bb1e2ce97eada83d7f88bf3ba4bb0975a8 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 3 Mar 2014 19:09:21 +0000 Subject: - remove index.html, is now part of the website repo - and some general cleanup (installcgi is .PHONY) --- Makefile | 58 +++----- external.png | Bin 165 -> 0 bytes index.css | 48 ------- index.sgml | 438 ----------------------------------------------------------- 4 files changed, 22 insertions(+), 522 deletions(-) delete mode 100644 external.png delete mode 100644 index.css delete mode 100644 index.sgml diff --git a/Makefile b/Makefile index c17e0e74..1599105d 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,17 @@ -.PHONY: clean install installwww -.SUFFIXES: .sgml .html .md5 .h .h.html +.PHONY: clean install installcgi installwww +.SUFFIXES: .md5 .h .h.html .SUFFIXES: .1 .3 .7 .8 .SUFFIXES: .1.html .3.html .7.html .8.html +VERSION = 1.12.3 + +# === USER SETTINGS ==================================================== + # Specify this if you want to hard-code the operating system to appear # in the lower-left hand corner of -mdoc manuals. # # CFLAGS += -DOSNAME="\"OpenBSD 5.4\"" -VERSION = 1.12.3 -VDATE = 31 December 2013 - # IFF your system supports multi-byte functions (setlocale(), wcwidth(), # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a # UCS-4 value) should you define USE_WCHAR. If you define it and your @@ -102,12 +103,9 @@ SRCS = Makefile \ eqn_html.c \ eqn_term.c \ example.style.css \ - external.png \ gmdiff \ html.c \ html.h \ - index.css \ - index.sgml \ lib.c \ lib.in \ libman.h \ @@ -282,7 +280,7 @@ $(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h DEMANDOC_OBJS = demandoc.o $(DEMANDOC_OBJS): config.h -INDEX_MANS = apropos.1.html \ +WWW_MANS = apropos.1.html \ catman.8.html \ demandoc.1.html \ mandoc.1.html \ @@ -297,18 +295,15 @@ INDEX_MANS = apropos.1.html \ preconv.1.html \ roff.7.html \ tbl.7.html \ - mandocdb.8.html - -$(INDEX_MANS): mandoc - -INDEX_OBJS = $(INDEX_MANS) \ + mandocdb.8.html \ man.h.html \ mandoc.h.html \ - mdoc.h.html \ - mdocml.tar.gz \ - mdocml.md5 + mdoc.h.html + +$(WWW_MANS): mandoc -www: index.html +WWW_OBJS = mdocml.tar.gz \ + mdocml.md5 clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) @@ -320,8 +315,7 @@ clean: rm -f demandoc $(DEMANDOC_OBJS) rm -f mandoc $(MANDOC_OBJS) rm -f config.h config.log $(COMPAT_OBJS) - rm -f mdocml.tar.gz - rm -f index.html $(INDEX_OBJS) + rm -f $(WWW_MANS) $(WWW_OBJS) rm -rf *.dSYM install: all @@ -347,16 +341,14 @@ installcgi: all $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR) -installwww: www - mkdir -p $(PREFIX)/snapshots - mkdir -p $(PREFIX)/binaries - $(INSTALL_DATA) index.html external.png index.css $(PREFIX) - $(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX) - $(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX) - $(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots - $(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots - $(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz - $(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5 +installwww: $(WWW_MANS) $(WWW_OBJS) + mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots + $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR) + $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots + $(INSTALL_DATA) mdocml.tar.gz \ + $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz + $(INSTALL_DATA) mdocml.md5 \ + $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).md5 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) @@ -395,8 +387,6 @@ mdocml.tar.gz: $(SRCS) ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) rm -rf .dist/ -index.html: $(INDEX_OBJS) - config.h: configure config.h.pre config.h.post $(TESTSRCS) rm -f config.log CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure @@ -406,7 +396,3 @@ config.h: configure config.h.pre config.h.post $(TESTSRCS) .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 $< >$@ - -.sgml.html: - validate --warn $< - sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@ diff --git a/external.png b/external.png deleted file mode 100644 index 419c06fb..00000000 Binary files a/external.png and /dev/null differ diff --git a/index.css b/index.css deleted file mode 100644 index d98316ea..00000000 --- a/index.css +++ /dev/null @@ -1,48 +0,0 @@ -html { min-width: 40em; - margin-top: 2em; - margin-left: auto; - margin-right: auto; - width: 80%; } - -body { text-align: justify; - font-family: Helvetica,Arial,sans-serif; - line-height: 120%; - font-size: small; } - -p,ul,table { margin-left: 3em; } - -p.head, -p.subhead, -p.foot { margin-left: 0.0em; margin-right: 0.0em; } - -p.news { margin-left: 2.0em; } - -li { margin: 0.25em; } - -h1 { font-size: 110%; } -h2 { font-size: 105%; margin-left: 1.5em } - -p.head { margin-bottom: 0.5em; - border-bottom: 1px solid #dddddd; - padding-bottom: 0.2em; } - -p.subhead { margin-top: 0em; - margin-bottom: 1.75em; } - -p.foot { border-top: 1px solid #dddddd; - color: #666666; - padding-top: 0.2em; - margin-top: 1.75em; } - -span.nm { color: green; } - -span.file { font-style: italic; } - -span.attn { font-weight: bold; } - -span.flag { font-weight: bold; } - -a { text-decoration: none; } - -a.external { background: transparent url(external.png) center right no-repeat; - padding-right: 12px; } diff --git a/index.sgml b/index.sgml deleted file mode 100644 index dad43e00..00000000 --- a/index.sgml +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - mdocml | UNIX manpage compiler - - -

- Puffy - mdocml – UNIX manpage compiler, current version @VERSION@ (@VDATE@) -

-

- Sources: current, - cvsweb - (archives) -

-

- Description -

-

- mdocml is a suite of tools compiling mdoc, the roff macro - package of choice for BSD manual pages, and man, the predominant historical package for - UNIX manuals. - It is small, ISO C, ISC-licensed, and quite fast. -

-

- The tool set features mandoc, - based on the libmandoc validating compiler, - to format output for UNIX terminals (with - support for wide-character locales), XHTML, HTML, PostScript, and PDF. - It also includes preconv, for recoding multibyte manuals; - demandoc, for emitting only text parts of manuals; - mandocdb, for indexing manuals; and - apropos, whatis, and - man.cgi (via catman) for semantic search of manual content. -

-

- mdocml has predominantly been developed on OpenBSD - and is both an OpenBSD - and a BSD.lv project. - We strive to support all interested free operating systems, in particular - DragonFly, - NetBSD, - FreeBSD, - Minix 3, - and GNU/Linux, - as well as all systems running the pkgsrc portable package build system. - All of these projects have helped to make mdocml better, by providing feedback and advice, - bug reports, and patches. -

-

- Disambiguation: mdocml is often referred to by its installed binary, mandoc. -

-

- Sources -

-

- mdocml should build and run on any modern system with - libdb - (this is installed by default on BSD UNIX systems — see the Makefile if you're running Linux). - To build and install into /usr/local/, just run make install. - Be careful: the preconv, apropos, and whatis installed binary names - may be taken by existing utilities. -

-

- Downstream -

-

- Several systems come bundled with mdocml utilities. - If your system does not appear below, the maintainers have not contacted me and it should not be considered - official, so please contact us if you plan on maintaining a downstream version! -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DragonFly BSD - contrib/mdocml (1.12.3 sources) - lib/libmandoc - usr.bin/mandoc (build system) -
FreeBSD 10.0, -CURRENT - contrib/mdocml (1.12.1 sources) - usr.bin/mandoc (build system) -
FreeBSD 9.x, 8.x - ports/textproc/mdocml (1.12.2 port) -
NetBSD - src/external/bsd/mdocml (1.12.1 sources plus patches and build system) -
OpenBSD - src/usr.bin/mandoc (1.12.3 sources under active development and build system) -
pkgsrc - textproc/mdocml (1.12.3 port) -
Minix3 - external/bsd/mdocml (1.10.9 sources and build system) -
Alpine Linux - aports/main/mdocml (1.12.2 port) -
-

- Documentation -

-

- These manuals are generated automatically and refer to the current release. - They are the authoritative documentation for the mdocml system. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
apropos(1) - search the manual page database -
demandoc(1) - emit only text of UNIX manuals -
mandoc(1) - format and display UNIX manuals -
preconv(1) - recode multibyte UNIX manuals -
whatis(1) - search the manual page database -
mandoc(3) - mandoc macro compiler library -
tbl(3) - roff table parser library for mandoc -
eqn(7) - eqn-mandoc language reference -
man(7) - man language reference -
man.cgi(7) - cgi for manpage query and display -
mandoc_char(7) - mandoc special characters -
mdoc(7) - mdoc language reference -
roff(7) - roff-mandoc language reference -
tbl(7) - tbl-mandoc language reference -
catman(8) - update a man.cgi manpage cache -
mandocdb(8) - index UNIX manuals -
-

- Supplementary Information -

- -

- Contact -

-

- Use the mailing lists for bug-reports, patches, questions, etc. Please check the - TODO for known issues - before posting. All lists are subscription-only: send a blank e-mail to the listed address to subscribe. Beyond that, - contact Kristaps at kris...@bsd.lv. Archives are available at Gmane. -

- - - - - - - - - - - - - - - - - -
- disc...@mdocml.bsd.lv - - bug-reports, general questions, and announcements -
- tec...@mdocml.bsd.lv - - patches and system discussions -
- sou...@mdocml.bsd.lv - - source commit messages -
-

- News -

-

- 31-12-2013: version 1.12.3 -

-

- In the mdoc(7) SYNOPSIS, line breaks and hanging indentation - now work correctly for .Fo/.Fa/.Fc and .Fn blocks. - Thanks to Franco Fichtner for doing part of the work. -

-

- The mdoc(7) .Bk macro got some addititonal bugfixes. -

-

- In mdoc(7) macro arguments, double quotes can now be quoted - by doubling them, just like in man(7). - Thanks to Tsugutomo ENAMI for the patch. -

-

- At the end of man(7) macro lines, end-of-sentence spacing - now works. Thanks to Franco Fichtner for the patch. -

-

- For backward compatibility, the man(7) parser now supports the - man-ext .UR/.UE (uniform resource identifier) block macros. -

-

- The man(7) parser now handles closing blocks that are not open - more gracefully. -

-

- The man(7) parser now ignores blank lines right after .SH and .SS. -

-

- In the man(7) formatter, reset indentation when leaving a block, - not just when entering the next one. -

-

- The roff(7) .nr request now supports incrementing and decrementing - number registers and stops parsing the number right before the first non-digit character. -

-

- The roff(7) parser now supports the alternative escape sequence - syntax \C'uXXXX' for Unicode characters. -

-

- The roff(7) parser now parses and ignores the .fam (font family) - and .hw (hyphenation points) requests and the \d and \u escape sequences. -

-

- The roff(7) manual got a new ESCAPE SEQUENCE REFERENCE. -

-

- 05-10-2013: version 1.12.2 -

-

- The mdoc(7) to man(7) converter, - to be called as mandoc -Tman, is now fully functional. -

-

- The mandoc(1) utility now supports the -Ios (default operating system) - input option, and the -Tutf8 output mode now actually works. -

-

- The mandocdb(8) utility no longer truncates existing databases when starting to build new ones, - but only replaces them when the build actually succeeds. -

-

- The man(7) parser now supports the PD macro (paragraph distance), - and (for GNU man-ext compatibility only) EX (example block) and EE (example end). - Plus several bugfixes regarding indentation, line breaks, and vertical spacing, - and regarding RS following TP. -

-

- The roff(7) parser now supports the \f(BI (bold+italic) font escape, - the \z (zero cursor advance) escape and the cc (change control character) - and it (input line trap) requests. - Plus bugfixes regarding the \t (tab) escape, nested escape sequences, and conditional requests. -

-

- In mdoc(7), several bugs were fixed related to UTF-8 output of quoting enclosures, - delimiter handling, list indentation and horizontal and vertical spacing, - formatting of the Lk, %U, and %C macros, - plus some bugfixes related to the handling of syntax errors like badly nested font blocks, - stray Ta macros outside column lists, unterminated It Xo blocks, - and non-text children of Nm blocks. -

-

- In tbl(7), the width of horizontal spans and the vertical spacing around tables was corrected, - and in man(7) files, a crash was fixed that was triggered by some particular unclosed T{ macros. -

-

- For mandoc developers, we now provide a tbl(3) library manual and gmdiff, - a very small, very simplistic groff-versus-mandoc output comparison tool. -

-

- History -

- -

- - Copyright © 2008–2011 - Kristaps Dzonsons, - © 2013 Ingo Schwarze, - $Date: 2013/12/31 17:49:37 $ - -

- - -- cgit v1.2.3-56-ge451