diff options
| author | John Keeping <john@keeping.me.uk> | 2018-06-16 13:11:09 +0100 |
|---|---|---|
| committer | John Keeping <john@keeping.me.uk> | 2018-06-16 14:06:03 +0100 |
| commit | 48f175083ae9ee03aa5ed7cddfbf74edf6d75774 (patch) | |
| tree | 700136d8739def1eed90bc69d768e8aa2ec4a641 | |
| parent | doc: use consistent id's when generating html files (diff) | |
| download | cgit-pink-48f175083ae9ee03aa5ed7cddfbf74edf6d75774.tar.gz cgit-pink-48f175083ae9ee03aa5ed7cddfbf74edf6d75774.zip | |
Makefile: drive asciidoc directly for HTML output
This is mostly taken from Git's doc/Makefile, although simplified for our use. The output now uses Asciidoc's default CSS which I think looks a bit nicer than the Docbook formatting; as a result of this we no longer need our custom .css file. A side effect of this change is that temporary files generated from the HTML output no longer conflict with the manpage output format (because any temporary HTML output files use names derived from the output filename which includes .html). Signed-off-by: John Keeping <john@keeping.me.uk>
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | cgit-doc.css | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile index 687069f..70f32a4 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,12 @@ DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) +ASCIIDOC = asciidoc +ASCIIDOC_EXTRA = +ASCIIDOC_HTML = xhtml11 +ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) +TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) + # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) # do not support the 'size specifiers' introduced by C99, namely ll, hh, # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). @@ -134,7 +140,8 @@ doc-pdf: $(DOC_PDF) a2x -f manpage $< $(DOC_HTML): %.html : %.txt - a2x -f xhtml --stylesheet=cgit-doc.css --xsltproc-opts="--param generate.consistent.ids 1" $< + $(TXT_TO_HTML) -o $@+ $< && \ + mv $@+ $@ $(DOC_PDF): %.pdf : %.txt a2x -f pdf cgitrc.5.txt diff --git a/cgit-doc.css b/cgit-doc.css deleted file mode 100644 index 5a399b6..0000000 --- a/cgit-doc.css +++ /dev/null @@ -1,3 +0,0 @@ -div.variablelist dt { - margin-top: 1em; -} |