1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-31 12:35:45 +01:00

Fix help file validation errors.

This commit is contained in:
Doug Kearns
2009-08-27 14:34:35 +10:00
parent 130ea15a4c
commit cf4bdb2969
15 changed files with 44 additions and 36 deletions

View File

@@ -2,17 +2,17 @@
#### configuration #### configuration
ASCIIDOC = asciidoc ASCIIDOC = asciidoc
AWK = awk AWK = awk
LOCALE = $(shell basename `pwd`) LOCALE = $(shell basename `pwd`)
DOCLANG = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z][a-z]$$/) ? $$1 : "en" }') DOCLANG = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z][a-z]$$/) ? $$1 : "en" }')
SRC_FILES = $(wildcard *.txt) SRC_FILES = $(wildcard *.txt)
FILES = $(SRC_FILES:%.txt=%.html) FILES = $(SRC_FILES:%.txt=%.html)
DEPS = $(wildcard asciidoc.conf lang-$(DOCLANG).conf) DEPS = $(wildcard lang-$(DOCLANG).conf) ${BASE}/asciidoc.conf $(BASE)/Makefile.doc
DOC_FILES = $(FILES) version.html DOC_FILES = $(FILES) version.html
.SILENT: .SILENT:
@@ -50,7 +50,9 @@ check-asciidoc:
@$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.4\./ }' || \ @$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.4\./ }' || \
echo >&2 "Warning: asciidoc versions other than 8.4.x are unsupported" echo >&2 "Warning: asciidoc versions other than 8.4.x are unsupported"
version.html: ../../NEWS $(BASE)/Makefile.doc $(DEPS) all.html: $(SRC_FILES)
version.html: ../../NEWS $(DEPS)
@echo "DOC locale/$(LOCALE)/$@" @echo "DOC locale/$(LOCALE)/$@"
# NOTE: asciidoc doesn't source the conf file implicitly when processing stdin # NOTE: asciidoc doesn't source the conf file implicitly when processing stdin
sed -e '1i\ sed -e '1i\
@@ -60,7 +62,7 @@ heading:Version{nbsp}information[version-information]' \
/' ../../NEWS | \ /' ../../NEWS | \
${ASCIIDOC} -f $(BASE)/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) $(FILES): %.html: %.txt $(DEPS)
@echo "DOC locale/$(LOCALE)/$@" @echo "DOC locale/$(LOCALE)/$@"
$(ASCIIDOC) -f $(BASE)/asciidoc.conf -a configname=$(NAME) --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 $@ $<

File diff suppressed because one or more lines are too long

View File

@@ -91,6 +91,6 @@ Enable _passthrough_ mode on *some* Google sites:
Set the filetype to mail when editing email at Gmail: Set the filetype to mail when editing email at Gmail:
\{nbsp}[c]:autocmd LocationChange .* :set editor=gvim\ -f[c] + \{nbsp}[c]:autocmd LocationChange .* :set editor=gvim\ -f[c] +
\{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c 'set ft=mail'"[c] \{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c $$'set ft=mail'$$"[c]
// vim: set filetype=asciidoc: // vim: set filetype=asciidoc:

View File

@@ -23,7 +23,7 @@ ________________________________________________________________________________
|:pa| |:pageinfo| + |:pa| |:pageinfo| +
||:pa[geinfo]|| ||:pa[geinfo]||
________________________________________________________________________________ ________________________________________________________________________________
Show various page information. See [c]:help 'pageinfo'[c] for available options. Show various page information. See [c]:help $$'pageinfo'$$[c] for available options.
________________________________________________________________________________ ________________________________________________________________________________

View File

@@ -30,8 +30,8 @@ is displayed as:
class="hiddentag">:help</span> <span class="hiddentag">:h</span> <span class="hiddentag">:help</span> <span class="hiddentag">:h</span> <span
class="hiddentag">help</span> class="hiddentag">help</span>
<div class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></div><br /> <span class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></span><br />
<div class="key">&lt;F1&gt;</div></p> <span class="key">&lt;F1&gt;</span></p>
<div class="quoteblock"> <div class="quoteblock">
<div class="quoteblock-content"> <div class="quoteblock-content">
<p>Open help window. <p>Open help window.

View File

@@ -1,10 +1,12 @@
logo:[] logo:[]
+++<div style="text-align: center;">+++ ++++++
*First there was a Navigator, then there was an Explorer. <p style="text-align: center; font-weight: bold;">
First there was a Navigator, then there was an Explorer.
Later it was time for a Konqueror. Now it's time for an Imperator, the Later it was time for a Konqueror. Now it's time for an Imperator, the
VIMperator :)* VIMperator :)
+++</div>+++ </p>
++++++
heading::Introduction[intro] heading::Introduction[intro]

View File

@@ -129,7 +129,8 @@ Below is an overview of which modes each map command applies to:
:imap :inoremap :iunmap :imapclear - Insert mode :imap :inoremap :iunmap :imapclear - Insert mode
:cmap :cnoremap :cunmap :cmapclear - Command-line mode :cmap :cnoremap :cunmap :cmapclear - Command-line mode
subsection::Key{nbsp}sequences[:&lt;>,key-sequence] // |<>| breaks doc validation
subsection::Key{nbsp}sequences[key-notation,key-sequence]
For most keys, the key-sequence is the same as the character you see when you For most keys, the key-sequence is the same as the character you see when you
type that key, however there are some exceptions which allow for a much larger type that key, however there are some exceptions which allow for a much larger

View File

@@ -2,10 +2,12 @@
heading::Quick-start{nbsp}tutorial[tutorial] heading::Quick-start{nbsp}tutorial[tutorial]
+++<div style="text-align: center;">+++ ++++++
*This is a quickstart tutorial to help get new users up and running in <p style="text-align: center; font-weight: bold;">
Vimperator. It is not intended as a full reference explaining all features.* This is a quickstart tutorial to help get new users up and running in
+++</div>+++ Vimperator. It is not intended as a full reference explaining all features.
</p>
++++++
If you've started using Vimperator from scratch (i.e., without any If you've started using Vimperator from scratch (i.e., without any
customization), you should be looking at this help page in a relatively customization), you should be looking at this help page in a relatively

View File

@@ -304,7 +304,7 @@ td span.tag {
padding-top: 25px !important; padding-top: 25px !important;
} }
div.key { span.key {
color: rgb(255, 0, 255); /* magenta */ color: rgb(255, 0, 255); /* magenta */
min-width: 120px; /* with 20px padding actually 140px */ min-width: 120px; /* with 20px padding actually 140px */
/*padding-bottom: 5px;*/ /*padding-bottom: 5px;*/

View File

@@ -100,6 +100,6 @@ Enable _passthrough_ mode on *some* Google sites:
Set the filetype to mail when editing email at Gmail: Set the filetype to mail when editing email at Gmail:
\{nbsp}[c]:autocmd LocationChange .* :set editor=gvim\ -f[c] + \{nbsp}[c]:autocmd LocationChange .* :set editor=gvim\ -f[c] +
\{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c 'set ft=mail'"[c] \{nbsp}[c]:autocmd LocationChange mail\.google\.com :set editor="gvim -f -c $$'set ft=mail'$$"[c]
// vim: set filetype=asciidoc: // vim: set filetype=asciidoc:

View File

@@ -23,7 +23,7 @@ ________________________________________________________________________________
|:pa| |:pageinfo| + |:pa| |:pageinfo| +
||:pa[geinfo]|| ||:pa[geinfo]||
________________________________________________________________________________ ________________________________________________________________________________
Show various page information. See [c]:help 'pageinfo'[c] for available options. Show various page information. See [c]:help $$'pageinfo'$$[c] for available options.
________________________________________________________________________________ ________________________________________________________________________________

View File

@@ -30,8 +30,8 @@ is displayed as:
class="hiddentag">:help</span> <span class="hiddentag">:h</span> <span class="hiddentag">:help</span> <span class="hiddentag">:h</span> <span
class="hiddentag">help</span> class="hiddentag">help</span>
<div class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></div><br /> <span class="key">:h[elp] <span class="argument">&#123;subject&#125;</span></span><br />
<div class="key">&lt;F1&gt;</div></p> <span class="key">&lt;F1&gt;</span></p>
<div class="quoteblock"> <div class="quoteblock">
<div class="quoteblock-content"> <div class="quoteblock-content">
<p>Open help window. <p>Open help window.

View File

@@ -1,4 +1,4 @@
LOGO logo:[]
section::Introduction[intro] section::Introduction[intro]

View File

@@ -141,7 +141,8 @@ Below is an overview of which modes each map command applies to:
:imap :inoremap :iunmap :imapclear - Insert mode :imap :inoremap :iunmap :imapclear - Insert mode
:cmap :cnoremap :cunmap :cmapclear - Command-line mode :cmap :cnoremap :cunmap :cmapclear - Command-line mode
subsection::Key{nbsp}sequences[:&lt;>,key-sequence] // |<>| breaks doc validation
subsection::Key{nbsp}sequences[key-notation,key-sequence]
For most keys, the key-sequence is the same as the character you see when you For most keys, the key-sequence is the same as the character you see when you
type that key, however there are some exceptions which allow for a much larger type that key, however there are some exceptions which allow for a much larger

View File

@@ -304,7 +304,7 @@ td span.tag {
padding-top: 25px !important; padding-top: 25px !important;
} }
div.key { span.key {
color: rgb(255, 0, 255); /* magenta */ color: rgb(255, 0, 255); /* magenta */
min-width: 120px; /* with 20px padding actually 140px */ min-width: 120px; /* with 20px padding actually 140px */
/*padding-bottom: 5px;*/ /*padding-bottom: 5px;*/