diff --git a/common/Makefile.doc b/common/Makefile.doc index e1c5950a..4750585d 100644 --- a/common/Makefile.doc +++ b/common/Makefile.doc @@ -58,9 +58,9 @@ heading:Version{nbsp}information[version-information]' \ -e '/^[0-9]/d' \ -e '/^ \+\* version /s/.*version \+\([0-9.]\+\).*/section:Version{nbsp}\1[version-\1]\ /' ../../NEWS | \ - ${ASCIIDOC} -f asciidoc.conf -a doctitle=version.html -o version.html - + ${ASCIIDOC} -f $(BASE)/asciidoc.conf -a doctitle=version.html -o version.html - $(FILES): %.html: %.txt $(BASE)/Makefile.doc $(DEPS) @echo "DOC locale/$(LOCALE)/$@" - $(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(DOCLANG) -a doctitle="$$(basename $@)" -o $@ $< + $(ASCIIDOC) -f $(BASE)/asciidoc.conf -a configname=$(NAME) --unsafe -a linkcss -a quirks! -a lang=$(DOCLANG) -a doctitle="$$(basename $@)" -o $@ $< diff --git a/vimperator/locale/en-US/asciidoc.conf b/common/asciidoc.conf similarity index 96% rename from vimperator/locale/en-US/asciidoc.conf rename to common/asciidoc.conf index c23e67d2..ea8020dc 100644 --- a/vimperator/locale/en-US/asciidoc.conf +++ b/common/asciidoc.conf @@ -13,7 +13,7 @@ email=stubenschrott@vimperator.org - + {doctitle} @@ -23,7 +23,6 @@ email=stubenschrott@vimperator.org [replacements] -LOGO=
\[count\]=[count] \[!\]=[!] @@ -36,6 +35,8 @@ LOGO=
subsection)::(?P\S*?)(\[(?P.*?)\])$=# # help:helptext[href] (?su)(?help):(?P\S*?)\[(?P.*?)\]= +# logo:[,] # FIXME: this is a bit silly +(?su)(?logo):(?P\S*?)\[(?P.*?)\]= # FIXME: this logo/donation banner is really ugly. --djk [heading-blockmacro] @@ -79,6 +80,9 @@ LOGO=
{target} +[logo-inlinemacro] +
+ [quotes] ||=key |=tag diff --git a/muttator/locale/en-US/Makefile b/muttator/locale/en-US/Makefile index 627ca99b..065aaf7a 100644 --- a/muttator/locale/en-US/Makefile +++ b/muttator/locale/en-US/Makefile @@ -1,2 +1,3 @@ +NAME = muttator BASE = ../../../common include $(BASE)/Makefile.doc diff --git a/muttator/locale/en-US/asciidoc.conf b/muttator/locale/en-US/asciidoc.conf deleted file mode 100644 index 4b69783d..00000000 --- a/muttator/locale/en-US/asciidoc.conf +++ /dev/null @@ -1,120 +0,0 @@ -[miscellaneous] - -[glossary] -author=Martin Stubenschrott -email=stubenschrott@vimperator.org - -[header] - - - - - - - - - - {doctitle} - - -
- {doctitle} -
- -[replacements] -LOGO=
-\[count\]=[count] -\[!\]=[!] - -[macros] -# heading:Title[tag1,tag2] -(?u)^(?Pheading)::(?P\S*?)(\[(?P.*?)\])$=# -# section:Title[tag1,tag2] -(?u)^(?Psection)::(?P\S*?)(\[(?P.*?)\])$=# -# subsection:Title[tag1,tag2] -(?u)^(?Psubsection)::(?P\S*?)(\[(?P.*?)\])$=# -# help:helptext[href] -(?su)(?help):(?P\S*?)\[(?P.*?)\]= - -# FIXME: this logo/donation banner is really ugly. --djk -[heading-blockmacro] -{outfile@.*(intro|all).html::
} - - - - - -
<{outfile@.*all.html:h2:h1 style="border\: none"}>{target} -{3? {3}} -{2? {2}} -{1? {1}} -
- -# maximum 3 tags for now -[section-blockmacro] - - - - - -
<{outfile@.*all.html:h3:h2}>{target} -{3? {3}} -{2? {2}} -{1? {1}} -
- -[subsection-blockmacro] - - - - - -
<{outfile@.*all.html:h4:h3}>{target} -{3? {3}} -{2? {2}} -{1? {1}} -
- -[help-inlinemacro] -{target} - -[quotes] -||=key -|=tag -[o]=#option -'=option2 -[c]=#command -[m]=#mapping -[a]=#argument -[j]=#jump -# FIXME: this prevents all asciidoc attribute processing -# ^obviously it doesn't? --stepnem -{|}=argument2 -# disable monospaced text as all our text is monospaced and it causes problems for some things -+= -^= - -[tags] -tag=| -key=
|
-option=| -option2='|' -command=| -mapping=| -jump=| -argument=| -# NOTE: in certain contexts the unescaped '#' is stripped. As we're ditching -# asciidoc I won't bother investigating --djk -argument2={|} -argument3=[|] - -[specialwords] -warningwords=WARNING: Warning: IMPORTANT: Important: -infowords=NOTE: Note: - -[warningwords] -{words} - -[infowords] -{words} diff --git a/vimperator/locale/en-US/Makefile b/vimperator/locale/en-US/Makefile index 627ca99b..a828b0c3 100644 --- a/vimperator/locale/en-US/Makefile +++ b/vimperator/locale/en-US/Makefile @@ -1,2 +1,3 @@ +NAME = vimperator BASE = ../../../common include $(BASE)/Makefile.doc diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index 2b62165f..49ef0d96 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -1,4 +1,4 @@ -LOGO +logo:[] +++
+++ *First there was a Navigator, then there was an Explorer. @@ -6,7 +6,7 @@ Later it was time for a Konqueror. Now it's time for an Imperator, the VIMperator :)* +++
+++ -section::Introduction[intro] +heading::Introduction[intro] http://vimperator.org[Vimperator] is a free browser add-on for Firefox, which makes it look and behave like the http://www.vim.org[Vim] diff --git a/xulmus/locale/en-US/Makefile b/xulmus/locale/en-US/Makefile index 627ca99b..831fe739 100644 --- a/xulmus/locale/en-US/Makefile +++ b/xulmus/locale/en-US/Makefile @@ -1,2 +1,3 @@ +NAME = xulmus BASE = ../../../common include $(BASE)/Makefile.doc diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf deleted file mode 100644 index a8e6617e..00000000 --- a/xulmus/locale/en-US/asciidoc.conf +++ /dev/null @@ -1,120 +0,0 @@ -[miscellaneous] - -[glossary] -author=Martin Stubenschrott -email=stubenschrott@vimperator.org - -[header] - - - - - - - - - - {doctitle} - - -
- {doctitle} -
- -[replacements] -LOGO=
-\[count\]=[count] -\[!\]=[!] - -[macros] -# heading:Title[tag1,tag2] -(?u)^(?Pheading)::(?P\S*?)(\[(?P.*?)\])$=# -# section:Title[tag1,tag2] -(?u)^(?Psection)::(?P\S*?)(\[(?P.*?)\])$=# -# subsection:Title[tag1,tag2] -(?u)^(?Psubsection)::(?P\S*?)(\[(?P.*?)\])$=# -# help:helptext[href] -(?su)(?help):(?P\S*?)\[(?P.*?)\]= - -# FIXME: this logo/donation banner is really ugly. --djk -[heading-blockmacro] -{outfile@.*(intro|all).html::
} - - - - - -
<{outfile@.*all.html:h2:h1 style="border\: none"}>{target} -{3? {3}} -{2? {2}} -{1? {1}} -
- -# maximum 3 tags for now -[section-blockmacro] - - - - - -
<{outfile@.*all.html:h3:h2}>{target} -{3? {3}} -{2? {2}} -{1? {1}} -
- -[subsection-blockmacro] - - - - - -
<{outfile@.*all.html:h4:h3}>{target} -{3? {3}} -{2? {2}} -{1? {1}} -
- -[help-inlinemacro] -{target} - -[quotes] -||=key -|=tag -[o]=#option -'=option2 -[c]=#command -[m]=#mapping -[a]=#argument -[j]=#jump -# FIXME: this prevents all asciidoc attribute processing -# ^obviously it doesn't? --stepnem -{|}=argument2 -# disable monospaced text as all our text is monospaced and it causes problems for some things -+= -^= - -[tags] -tag=| -key=
|
-option=| -option2='|' -command=| -mapping=| -jump=| -argument=| -# NOTE: in certain contexts the unescaped '#' is stripped. As we're ditching -# asciidoc I won't bother investigating --djk -argument2={|} -argument3=[|] - -[specialwords] -warningwords=WARNING: Warning: IMPORTANT: Important: -infowords=NOTE: Note: - -[warningwords] -{words} - -[infowords] -{words}