Module: xenomai-2.6
Branch: master
Commit: 4c7b1e766afbadff4fd7afe82230ec5afff0acaa
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=4c7b1e766afbadff4fd7afe82230ec5afff0acaa
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Mon Aug 26 20:54:56 2013 +0200
doc: adapt to more recent version of asciidoc
---
doc/asciidoc/Makefile.am | 11 +++++++----
doc/asciidoc/Makefile.in | 15 +++++++++------
doc/asciidoc/asciidoc.rules | 4 ++--
doc/asciidoc/plaintext_postproc.awk | 27 +++++++++++++++++++++++----
4 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/doc/asciidoc/Makefile.am b/doc/asciidoc/Makefile.am
index fb56934..9c160e4 100644
--- a/doc/asciidoc/Makefile.am
+++ b/doc/asciidoc/Makefile.am
@@ -31,20 +31,23 @@ TXT_DOCS = \
all-local: $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS)
-asciidoc-icons asciidoc-icons/callouts:
+asciidoc-icons asciidoc-icons/callouts: FORCE
@$(RM) -R asciidoc-icons
@cp -a /usr/share/asciidoc/icons asciidoc-icons
-asciidoc-css:
+asciidoc-css: FORCE
@$(mkdir_p) $@
+ @cp -a /usr/share/asciidoc/stylesheets/asciidoc.css $@
@cp -a /usr/share/asciidoc/stylesheets/xhtml11.css $@
@cp -a /usr/share/asciidoc/stylesheets/xhtml11-quirks.css $@
-asciidoc-js:
+asciidoc-js: FORCE
@$(mkdir_p) $@
- @cp -a /usr/share/asciidoc/javascripts/asciidoc-xhtml11.js $@
+ @cp -a /usr/share/asciidoc/javascripts/asciidoc.js $@
@cp -a /usr/share/asciidoc/javascripts/toc.js $@
+.PHONY: FORCE
+
endif
include $(top_srcdir)/doc/asciidoc/asciidoc.rules
diff --git a/doc/asciidoc/Makefile.in b/doc/asciidoc/Makefile.in
index 3f6f84b..9fdb397 100644
--- a/doc/asciidoc/Makefile.in
+++ b/doc/asciidoc/Makefile.in
@@ -492,19 +492,22 @@ uninstall-am: uninstall-local
@CONFIG_XENO_ASCIIDOC_TRUE@all-local: $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS)
-@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-icons asciidoc-icons/callouts:
+@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-icons asciidoc-icons/callouts: FORCE
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(RM) -R asciidoc-icons
@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /usr/share/asciidoc/icons asciidoc-icons
-@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-css:
+@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-css: FORCE
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(mkdir_p) $@
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/stylesheets/asciidoc.css $@
@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/stylesheets/xhtml11.css $@
@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/stylesheets/xhtml11-quirks.css $@
-@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-js:
+@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-js: FORCE
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(mkdir_p) $@
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/javascripts/asciidoc-xhtml11.js $@
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/javascripts/asciidoc.js $@
@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /usr/share/asciidoc/javascripts/toc.js $@
+
+@CONFIG_XENO_ASCIIDOC_TRUE@.PHONY: FORCE
@CONFIG_XENO_ASCIIDOC_FALSE@$(man1_MANS): %.1: $(MAN_DOCSDIR)/%.1
@CONFIG_XENO_ASCIIDOC_FALSE@ @cp $< $@
@@ -521,9 +524,9 @@ uninstall-am: uninstall-local
@CONFIG_XENO_ASCIIDOC_TRUE@$(tmpdir)/%.txt: %.adoc Makefile
$(top_srcdir)/doc/asciidoc/plaintext.conf
$(top_srcdir)/doc/asciidoc/plaintext.xsl
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(mkdir_p) $(tmpdir)
@CONFIG_XENO_ASCIIDOC_TRUE@ $(ASCIIDOC) --backend docbook -f
$(top_srcdir)/doc/asciidoc/plaintext.conf \
-@CONFIG_XENO_ASCIIDOC_TRUE@ --doctype article $(ASCIIDOC_TXT_OPTS) \
+@CONFIG_XENO_ASCIIDOC_TRUE@ --doctype book $(ASCIIDOC_TXT_OPTS) \
@CONFIG_XENO_ASCIIDOC_TRUE@ --out-file $(tmpdir)/$*.xml $<
-@CONFIG_XENO_ASCIIDOC_TRUE@ xsltproc --stringparam toc.section.depth 3
--nonet \
+@CONFIG_XENO_ASCIIDOC_TRUE@ xsltproc --stringparam toc.section.depth 4
--nonet \
@CONFIG_XENO_ASCIIDOC_TRUE@ --output $(tmpdir)/$*.html
$(top_srcdir)/doc/asciidoc/plaintext.xsl \
@CONFIG_XENO_ASCIIDOC_TRUE@ $(tmpdir)/$*.xml
@CONFIG_XENO_ASCIIDOC_TRUE@ w3m -cols 80 -dump -T text/html -no-graph
$(tmpdir)/$*.html > $@
diff --git a/doc/asciidoc/asciidoc.rules b/doc/asciidoc/asciidoc.rules
index 54a0c59..4df63c6 100644
--- a/doc/asciidoc/asciidoc.rules
+++ b/doc/asciidoc/asciidoc.rules
@@ -30,9 +30,9 @@ tmpdir=adoc_plaintext
$(tmpdir)/%.txt: %.adoc Makefile $(top_srcdir)/doc/asciidoc/plaintext.conf
$(top_srcdir)/doc/asciidoc/plaintext.xsl
@$(mkdir_p) $(tmpdir)
$(ASCIIDOC) --backend docbook -f
$(top_srcdir)/doc/asciidoc/plaintext.conf \
- --doctype article $(ASCIIDOC_TXT_OPTS) \
+ --doctype book $(ASCIIDOC_TXT_OPTS) \
--out-file $(tmpdir)/$*.xml $<
- xsltproc --stringparam toc.section.depth 3 --nonet \
+ xsltproc --stringparam toc.section.depth 4 --nonet \
--output $(tmpdir)/$*.html
$(top_srcdir)/doc/asciidoc/plaintext.xsl \
$(tmpdir)/$*.xml
w3m -cols 80 -dump -T text/html -no-graph $(tmpdir)/$*.html > $@
diff --git a/doc/asciidoc/plaintext_postproc.awk
b/doc/asciidoc/plaintext_postproc.awk
index 6de8c6c..cf7e3b7 100644
--- a/doc/asciidoc/plaintext_postproc.awk
+++ b/doc/asciidoc/plaintext_postproc.awk
@@ -8,14 +8,27 @@ BEGIN {
next
}
-in_toc && /^([ \t]*[0-9]\.|$)/ {
- print $0
+/List of Tables/ {
+ in_toc=0
+ in_lot=1
next
}
-in_toc {
+(in_toc || in_lot) && /^([ \t]*[0-9]\.|$)/ {
+ if (in_toc)
+ print $0
+ next
+}
+
+(in_toc || in_lot) && /^[ \t]*$/ {
+ if (in_toc)
+ print $0
+ next
+}
+
+in_lot {
printf
"-------------------------------------------------------------------------------\n\n"
- in_toc=0
+ in_lot=0
}
$0 ~ link_re {
@@ -38,6 +51,12 @@ unfinished_url {
next
}
+/^Chapter [0-9]\./ {
+ sub(/^Chapter /,"", $0)
+ title=$0
+ next
+}
+
/^[0-9]\.[0-9.]*/ {
title=$0
next
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
