summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Kearns <dougkearns@gmail.com>2009-05-24 23:26:15 +1000
committerDoug Kearns <dougkearns@gmail.com>2009-05-24 23:32:09 +1000
commit61b6491b8b4ca6003166d6533d2518a7a1db26dc (patch)
tree5ae915d11a2440b59cf8ff9fb92bd28b65c58849
parent73759f78f842a126bc1afa770d2cd78679d0bfb3 (diff)
downloadpentadactyl-61b6491b8b4ca6003166d6533d2518a7a1db26dc.tar.gz
Add all.html for viewing all help in a single page.
This is all really inside out. It would be much better to store the help in a single file and use asciidoc/docbook's capabilities to split it if desired.
-rw-r--r--common/Makefile.doc11
-rw-r--r--vimperator/NEWS1
-rw-r--r--vimperator/content/config.js2
-rw-r--r--vimperator/locale/en-US/asciidoc.conf28
-rw-r--r--vimperator/locale/en-US/autocommands.txt4
-rw-r--r--vimperator/locale/en-US/browsing.txt4
-rw-r--r--vimperator/locale/en-US/buffer.txt4
-rw-r--r--vimperator/locale/en-US/cmdline.txt4
-rw-r--r--vimperator/locale/en-US/developer.txt2
-rw-r--r--vimperator/locale/en-US/eval.txt4
-rw-r--r--vimperator/locale/en-US/gui.txt4
-rw-r--r--vimperator/locale/en-US/hints.txt4
-rw-r--r--vimperator/locale/en-US/index.txt6
-rw-r--r--vimperator/locale/en-US/insert.txt4
-rw-r--r--vimperator/locale/en-US/map.txt4
-rw-r--r--vimperator/locale/en-US/marks.txt4
-rw-r--r--vimperator/locale/en-US/message.txt2
-rw-r--r--vimperator/locale/en-US/options.txt4
-rw-r--r--vimperator/locale/en-US/pattern.txt4
-rw-r--r--vimperator/locale/en-US/print.txt4
-rw-r--r--vimperator/locale/en-US/repeat.txt6
-rw-r--r--vimperator/locale/en-US/starting.txt2
-rw-r--r--vimperator/locale/en-US/styling.txt4
-rw-r--r--vimperator/locale/en-US/tabs.txt4
-rw-r--r--vimperator/locale/en-US/tutorial.txt6
-rw-r--r--vimperator/locale/en-US/various.txt4
26 files changed, 58 insertions, 72 deletions
diff --git a/common/Makefile.doc b/common/Makefile.doc
index 68f2cf06..e340791f 100644
--- a/common/Makefile.doc
+++ b/common/Makefile.doc
@@ -50,13 +50,14 @@ check-asciidoc:
@$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.2\./ }' || \
echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported"
-$(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
- @echo "DOC locale/$(LOCALE)/$@"
- $(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(DOCLANG) -a doctitle="$(shell basename $@)" -o $@ $<
-
version.html: ../../NEWS $(BASE)/Makefile.doc $(ADC_DEPS)
@echo "DOC locale/$(LOCALE)/$@"
# NOTE: asciidoc doesn't source the conf file implicitly when processing stdin
sed -e '1i\
-HEADER' -e '/^[0-9]/d' -e '/^ \+\* version /s/.*version \+\([0-9.]\+\).*/section:Version{nbsp}\1[version-\1]\
+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 -
+
+$(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
+ @echo "DOC locale/$(LOCALE)/$@"
+ $(ASCIIDOC) --unsafe -a linkcss -a quirks! -a lang=$(DOCLANG) -a doctitle="$(shell basename $@)" -o $@ $<
+
diff --git a/vimperator/NEWS b/vimperator/NEWS
index 88b2621b..23931bf6 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -3,6 +3,7 @@
* add @: mapping - repeat the last Ex command
* add \ mapping - toggle between rendered and source view
* add ;c extended hint mode - open the context menu
+ * :help all now shows all help sections in a single page
2009-05-21:
* version 2.1
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index cad178f7..1d088c48 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -119,7 +119,7 @@ const config = { //{{{
"pattern.html", "tabs.html", "hints.html", "map.html", "eval.html",
"marks.html", "repeat.html", "autocommands.html", "print.html",
"gui.html", "styling.html", "message.html", "developer.html",
- "various.html", "index.html", "version.html"
+ "various.html", "version.html", "index.html", "all.html"
],
get ignoreKeys() {
diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf
index 48ffb933..f52b207d 100644
--- a/vimperator/locale/en-US/asciidoc.conf
+++ b/vimperator/locale/en-US/asciidoc.conf
@@ -18,30 +18,48 @@ email=stubenschrott@vimperator.org
<title>{doctitle}</title>
</head>
<body>
-<h1 style="font-size: inherit; text-align: right;">
+<div style="font-size: inherit; text-align: right;">
<span class="tag" style="float: none;">{doctitle}</span>
-</h1>
+</div>
[replacements]
LOGO=<div style="text-align: center;"><span class="vimperator-logo"></span></div>
-HEADER=<div style="float: right; padding-left: 1px;"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <fieldset class="paypal"> <input type="hidden" name="cmd" value="_s-xclick"/> <input type="image" src="data:image/gif;base64,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" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/> <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/> </fieldset> </form> </div> <span class="vimperator-logo"></span>
\[count\]=<span class="argument">&#91;count&#93;</span>
\[!\]=<span class="argument">&#91;!&#93;</span>
[macros]
+# heading:Page{nbsp}Heading[tag1,tag2]
+(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=heading
# section:Introduction[tag1,tag2]
(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=section
# help:helptext[href]
(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=help
+# FIXME: this logo/donation banner is really ugly. --djk
+[heading-inlinemacro]
+{outfile@.*(intro|all).html::<div style="float\: right; padding-left\: 1px;"> <form action="https\://www.paypal.com/cgi-bin/webscr" method="post"> <fieldset class="paypal"> <input type="hidden" name="cmd" value="_s-xclick"/> <input type="image" src="data\:image/gif;base64,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" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/> <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/> </fieldset> </form> </div> <span class="vimperator-logo"></span>}
+<table style="border-bottom: 1px solid silver; width: 100%">
+<tr style="width: 100%">
+<td style="width: 50%"><{outfile@.*all.html:h2:h1 style="border\: none"}>{target}</{outfile@.*all.html:h2:h1}></td>
+<td style="width: 50%">
+{3? <a id="{3}"/><span class="tag">{3}</span>}
+{2? <a id="{2}"/><span class="tag">{2}</span>}
+{1? <a id="{1}"/><span class="tag">{1}</span>}
+</td>
+</tr>
+</table>
+
# maximum 3 tags for now
[section-inlinemacro]
<table style="border-bottom: 1px solid silver; width: 100%">
-<tr style="width: 100%"><td style="width: 50%"><h2>{target}</h2></td><td style="width: 50%">
+<tr style="width: 100%">
+<td style="width: 50%"><{outfile@.*all.html:h3:h2}>{target}</{outfile@.*all.html:h3:h2}></td>
+<td style="width: 50%">
{3? <a id="{3}"/><span class="tag">{3}</span>}
{2? <a id="{2}"/><span class="tag">{2}</span>}
{1? <a id="{1}"/><span class="tag">{1}</span>}
-</td></tr>
+</td>
+</tr>
</table>
[help-inlinemacro]
diff --git a/vimperator/locale/en-US/autocommands.txt b/vimperator/locale/en-US/autocommands.txt
index 36104b56..a2bed93c 100644
--- a/vimperator/locale/en-US/autocommands.txt
+++ b/vimperator/locale/en-US/autocommands.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|autocommands| +
+heading:Automatic{nbsp}commands[autocommands]
Autocommands are a way to automatically execute code when certain events
happen.
diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt
index a6becad1..c32697dd 100644
--- a/vimperator/locale/en-US/browsing.txt
+++ b/vimperator/locale/en-US/browsing.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|surfing| |browsing| +
+heading:Browsing[surfing,browsing]
Vimperator overrides nearly all Firefox keys in order to make browsing more
pleasant for Vim users. On the rare occasions when you want to pass a keystroke
diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt
index 8029020d..40fac01d 100644
--- a/vimperator/locale/en-US/buffer.txt
+++ b/vimperator/locale/en-US/buffer.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|buffer| |document| +
+heading:Buffer[buffer,document]
Vimperator holds exactly one buffer object for each tab. It is usually an
(X)HTML document with advanced features.
diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt
index 3ee75fef..d6259600 100644
--- a/vimperator/locale/en-US/cmdline.txt
+++ b/vimperator/locale/en-US/cmdline.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|Command-line-mode| |Command-line| |mode-cmdline| +
+heading:Command-line{nbsp}mode[Command-line-mode,Command-line,mode-cmdline]
Command-line mode is used to enter Ex commands ("[m]:[m]") and text search patterns
("[m]/[m]" and "[m]?[m]").
diff --git a/vimperator/locale/en-US/developer.txt b/vimperator/locale/en-US/developer.txt
index cf875d82..331dfe41 100644
--- a/vimperator/locale/en-US/developer.txt
+++ b/vimperator/locale/en-US/developer.txt
@@ -1,4 +1,4 @@
-HEADER
+heading:Developer{nbsp}information[developer-information]
section:Writing{nbsp}documentation[writing-docs,documentation]
diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt
index bbc0d5ba..9fc67025 100644
--- a/vimperator/locale/en-US/eval.txt
+++ b/vimperator/locale/en-US/eval.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|expression| |expr| |eval| +
+heading:Expression{nbsp}evaluation[expression,expr,eval]
INTRO TO BE WRITTEN...
diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt
index bec1f78b..bcaa3b7a 100644
--- a/vimperator/locale/en-US/gui.txt
+++ b/vimperator/locale/en-US/gui.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|gui| +
+heading:Vimperator's{nbsp}GUI[gui]
Although Vimperator offers the most frequently used Firefox functionality via
Ex and Normal mode commands there may be times when directly accessing the GUI
diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt
index 6b105f4e..b4e5bd37 100644
--- a/vimperator/locale/en-US/hints.txt
+++ b/vimperator/locale/en-US/hints.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|quick-hints| |hints| +
+heading:Hints[quick-hints,hints]
Hints are the way in which Vimperator allows you to follow links on a page. By
providing each link with a suitable hint, you can access all links with a
diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt
index e39156d0..f81dc37f 100644
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -1,8 +1,6 @@
-HEADER
+heading:Index[index]
-|index| +
-
-This file contains a list of all available commands.
+This file contains a list of all available commands, mappings and options.
section:Insert{nbsp}mode[insert-index]
diff --git a/vimperator/locale/en-US/insert.txt b/vimperator/locale/en-US/insert.txt
index c49d440e..d5920d7c 100644
--- a/vimperator/locale/en-US/insert.txt
+++ b/vimperator/locale/en-US/insert.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|Insert-mode| |Insert| |mode-insert| +
+heading:Insert{nbsp}mode[Insert-mode,Insert,mode-insert]
Insert mode is used to enter text in text boxes and text areas. When
'insertmode' is set, focusing on a text area immediately switches to
diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt
index 136a85f0..c84138c0 100644
--- a/vimperator/locale/en-US/map.txt
+++ b/vimperator/locale/en-US/map.txt
@@ -1,6 +1,4 @@
-HEADER
-
-Key mappings, abbreviations, and user-defined commands.
+heading:Key{nbsp}mappings,{nbsp}abbreviations,{nbsp}and{nbsp}user-defined{nbsp}commands.[]
section:Key{nbsp}mapping[key-mapping,mapping,macro]
diff --git a/vimperator/locale/en-US/marks.txt b/vimperator/locale/en-US/marks.txt
index 7a6e1239..5c31d92c 100644
--- a/vimperator/locale/en-US/marks.txt
+++ b/vimperator/locale/en-US/marks.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|different-marks| |marks| +
+heading:Marks[different-marks,marks]
Vimperator supports a number of different marks:
diff --git a/vimperator/locale/en-US/message.txt b/vimperator/locale/en-US/message.txt
index f7c18f9b..6999573d 100644
--- a/vimperator/locale/en-US/message.txt
+++ b/vimperator/locale/en-US/message.txt
@@ -1,4 +1,4 @@
-HEADER
+heading:Error{nbsp}and{nbsp}informational{nbsp}messages[messages]
|message-history| +
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index bee73ed1..3565a775 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|options| +
+heading:Options[options]
Vimperator has a number of internal variables and switches which can be set to
achieve special effects. These options come in 5 forms:
diff --git a/vimperator/locale/en-US/pattern.txt b/vimperator/locale/en-US/pattern.txt
index 6462a897..0b928944 100644
--- a/vimperator/locale/en-US/pattern.txt
+++ b/vimperator/locale/en-US/pattern.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|text-search-commands| +
+heading:Text{nbsp}search{nbsp}commands[text-search-commands]
Vimperator provides a Vim-like interface to Firefox's standard text search
functionality. There is no support for using regular expressions in search
diff --git a/vimperator/locale/en-US/print.txt b/vimperator/locale/en-US/print.txt
index 8cf3d180..6059f6d8 100644
--- a/vimperator/locale/en-US/print.txt
+++ b/vimperator/locale/en-US/print.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|printing| +
+heading:Printing[printing]
|:ha| |:hardcopy| +
||:ha[rdcopy][!]||
diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt
index 64fdef07..ab94260a 100644
--- a/vimperator/locale/en-US/repeat.txt
+++ b/vimperator/locale/en-US/repeat.txt
@@ -1,10 +1,8 @@
-HEADER
-
-|repeat| +
+heading:Repeating{nbsp}commands[repeating]
Vimperator can repeat a number of commands and record macros.
-section:Single{nbsp}repates[single-repeat]
+section:Single{nbsp}repeats[single-repeat]
|.|
||[count].||
diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt
index ed51c649..010d21b9 100644
--- a/vimperator/locale/en-US/starting.txt
+++ b/vimperator/locale/en-US/starting.txt
@@ -1,4 +1,4 @@
-HEADER
+heading:Starting{nbsp}Vimperator[starting]
Vimperator does not yet read any command-line options. When it does, they will
be documented here.
diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt
index 87de57cb..05acc557 100644
--- a/vimperator/locale/en-US/styling.txt
+++ b/vimperator/locale/en-US/styling.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|styling| +
+heading:Styling{nbsp}the{nbsp}GUI{nbsp}and{nbsp}web{nbsp}pages[styling]
Vimperator allows you to style both the browser and any web pages you view. All
styling is specified via CSS. Although you may style any user interface element
diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt
index 8f19414a..dd625c57 100644
--- a/vimperator/locale/en-US/tabs.txt
+++ b/vimperator/locale/en-US/tabs.txt
@@ -1,6 +1,4 @@
-HEADER
-
-|tabs| +
+heading:Tabs[tabs]
Tabs are used to be able to view many web pages at the same time. Each tab
contains exactly one buffer -- multiple buffers per tab are not supported. As a
diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt
index f85af34f..d9e4dae7 100644
--- a/vimperator/locale/en-US/tutorial.txt
+++ b/vimperator/locale/en-US/tutorial.txt
@@ -1,14 +1,12 @@
-HEADER
-
// Initial revision: Sun Jun 8 10:07:05 UTC 2008 (penryu)
+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
Vimperator. It is not intended as a full reference explaining all features.*
+++</div>+++
-section:Quick-start{nbsp}tutorial[tutorial]
-
If you've started using Vimperator from scratch (i.e., without any
customization), you should be looking at this help page in a relatively
bare-looking window. The menubar, navigation bar, and bookmark bars are hidden.
diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt
index 67ee6e2f..94c8ba64 100644
--- a/vimperator/locale/en-US/various.txt
+++ b/vimperator/locale/en-US/various.txt
@@ -1,4 +1,4 @@
-HEADER
+heading:Other{nbsp}help[]
section:Various{nbsp}commands[various]
@@ -64,6 +64,8 @@ ________________________________________________________________________________
Open help window. The default page, as specified by 'helpfile' is shown unless
[a][subject][a] is specified. If you need help for a specific topic, try
[c]:help overview[c].
+
+All help pages can be viewed in a single page via [c]:help all[c].
________________________________________________________________________________