From c106046cbb0cdb590035fcd33f5fc6ce1a3b975c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Laugst=C3=B8l?= Date: Thu, 31 Oct 2013 14:30:13 +0100 Subject: [PATCH 2/5] o Supporting older versions of asciidoc. --- .gitignore | 1 + docs/Makefile | 9 +++++++-- docs/appinternals.txt | 4 ++++ docs/asciidoc.conf | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b6d1d32..4acb46e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ apps.list downloads target +docs/*.xml docs/*.html docs/*.1 docs/*.7 diff --git a/docs/Makefile b/docs/Makefile index f340323..355f0bc 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -3,11 +3,16 @@ TXT=$(wildcard *.txt) MAN=$(shell ls *.txt|xargs -n 1 head -n 1|sed "s,\(.*\)(\([0-9]\)),\1.\2,") HTML=$(patsubst %.txt,%.html,$(TXT)) -all: $(HTML) $(MAN) +all: html man + +html: $(HTML) +man: $(MAN) + +.PHONY: html man %.html: %.txt @echo asciidoc $< - @asciidoc -f asciidoc.conf --backend=html5 $< + @asciidoc -f asciidoc.conf --backend=xhtml11 -aappsh_version=0.2-dev $< %.1: %.txt $(call man,$<) diff --git a/docs/appinternals.txt b/docs/appinternals.txt index ce19923..330d151 100644 --- a/docs/appinternals.txt +++ b/docs/appinternals.txt @@ -5,6 +5,10 @@ NAME ---- appinternals - Appsh internals +SYNOPSIS +-------- +appinternals + DESCRIPTION ----------- diff --git a/docs/asciidoc.conf b/docs/asciidoc.conf index 724524a..57eaf59 100644 --- a/docs/asciidoc.conf +++ b/docs/asciidoc.conf @@ -1,6 +1,31 @@ +# https://github.com/marcelocantos/zeromq2-1/blob/master/doc/asciidoc.conf +# http://lxr.free-electrons.com/source/tools/perf/Documentation/asciidoc.conf + [macros] (?su)[\\]?(?Plinkman):(?P\S*?)\[(?P.*?)\]= +ifdef::doctype-manpage[] +ifdef::backend-docbook[] +[header] +template::[header-declarations] + + + {mantitle} + {manvolnum} + app.sh + + App.sh Manual + + + {manname} + {manpurpose} + +# No ending refentry, asciidoc takes care of that. +endif::backend-docbook[] +endif::doctype-manpage[] + ifdef::backend-docbook[] [linkman-inlinemacro] {0%{target}} @@ -18,3 +43,13 @@ relative-ext=.html {target}{0?({0})} endif::backend-html5[] + +ifdef::backend-xhtml11[] + +[attributes] +relative-ext=.html + +[linkman-inlinemacro] +{target}{0?({0})} + +endif::backend-xhtml11[] -- 1.8.4.rc3