Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1269ff11abfb6677b24c24900eaf690b29e2f996
commit 1269ff11abfb6677b24c24900eaf690b29e2f996
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Mon Oct 6 19:45:55 2008 +0200
docs: add a custom config for merged documents to avoid sed hacks
diff --git a/docs/Makefile b/docs/Makefile
index b2e36d7..b8f8dac 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -45,16 +45,12 @@ GENERATED_SOURCES = packages.txt manual.txt user.txt
devel.txt po images $(DYNAM
LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //')
MERGE = : > $(2); \
- for i in `cat $(1) |grep link:.*html |sed
's/.*:\(.*\).html\[.*/\1.txt/'`; \
+ for i in header.txt `cat $(1) |grep link:.*html |sed
's/.*:\(.*\).html\[.*/\1.txt/'`; \
do \
[ "$$i" = "$(2)" ] && continue; \
- cat $$i >> $(2); \
+ echo "include::$$i[]" >> $(2); \
echo >> $(2); \
- done; \
- sed -i 's/^\(=\+ \)/=\1/' $(2); \
- sed -i '/^\^\{2,\}$$/s/\^/+/g' $(2); \
- sed -i '/^~\{2,\}$$/s/~/^/g' $(2); \
- sed -i '1i include::header.txt[]\n' $(2)
+ done
I18NBUILD = po4a -k 0 po4a.cfg; \
for i in $(LANGS); \
@@ -103,19 +99,22 @@ images:
ln -s /etc/asciidoc/images ./
%.html: %.txt
- asciidoc -a toc -a numbered -a sectids -a lang=$(shell basename
`pwd`|sed 's/docs//') $(basename $@).txt
+ if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then
CONF="--conf-file=merge.conf"; fi; \
+ asciidoc $$CONF -a toc -a numbered -a sectids -a lang=$(shell basename
`pwd`|sed 's/docs//') $^
-%.text: %.html
- lynx -dump $(basename $@).html > $@
+%.text: %.txt
+ if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then
CONF="--conf-file=merge.conf"; fi; \
+ a2x --asciidoc-opts="$$CONF" -a toc -a numbered -a sectids -f text -a
lang=$(shell basename `pwd`|sed 's/docs//') $^
%.pdf: %.txt
- a2x -a toc -a numbered -a sectids -f pdf -a lang=$(shell basename
`pwd`|sed 's/docs//') $^
+ if [[ "(manual.txt|user.txt|devel.txt)" =~ "$^" ]]; then
CONF="--conf-file=merge.conf"; fi; \
+ a2x --asciidoc-opts="$$CONF" -a toc -a numbered -a sectids -f pdf -a
lang=$(shell basename `pwd`|sed 's/docs//') $^
%.txt: %.txt.in
- sed 's/@VERSION@/$(VERSION)/' $(basename $@).txt.in > $@
+ sed 's/@VERSION@/$(VERSION)/' $^ > $@
index.html: index.txt header.txt
- asciidoc -a numbered -a sectids -a lang=$(shell basename `pwd`|sed
's/docs//') $(basename $@).txt
+ asciidoc -a numbered -a sectids -a lang=$(shell basename `pwd`|sed
's/docs//') $^
manual.txt: $(MANUAL_SOURCES) $(DYNAMIC_SOURCES)
$(call MERGE,index.txt,manual.txt)
diff --git a/docs/header.txt.in b/docs/header.txt.in
index 404da36..b3bf8b6 100644
--- a/docs/header.txt.in
+++ b/docs/header.txt.in
@@ -1,4 +1,4 @@
-= Frugalware @VERSION@ Documentation
+_ Frugalware @VERSION@ Documentation
--------------------------------------------------------------------------
Copyright (C) 2003-2008 The Frugalware Developer Team.
diff --git a/docs/merge.conf b/docs/merge.conf
new file mode 100644
index 0000000..859764d
--- /dev/null
+++ b/docs/merge.conf
@@ -0,0 +1,9 @@
+[titles]
+underlines="__","==","--","~~","^^"
+# Single-line title patterns.
+sect0=^_ +(?P<title>[\S].*?)( +_)?$
+sect1=^= +(?P<title>[\S].*?)( +=)?$
+sect2=^== +(?P<title>[\S].*?)( +==)?$
+sect3=^=== +(?P<title>[\S].*?)( +===)?$
+sect4=^==== +(?P<title>[\S].*?)( +====)?$
+blocktitle=^\.(?P<title>([^.\s].*)|(\.[^.\s].*))$
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
