diff options
| author | Doug Kearns <dougkearns@gmail.com> | 2009-08-06 23:17:08 +1000 |
|---|---|---|
| committer | Doug Kearns <dougkearns@gmail.com> | 2009-08-06 23:17:08 +1000 |
| commit | 9ede619160a8eabf148dfa4c20bb4881e24c7050 (patch) | |
| tree | 4bcf220c7ec829dac1deb83b88f5932967c93c6e | |
| parent | 817cbd1e75a0c0d72bc5a25509328b47a994f409 (diff) | |
| download | pentadactyl-9ede619160a8eabf148dfa4c20bb4881e24c7050.tar.gz | |
Update help source files for Asciidoc 8.4.x.
52 files changed, 323 insertions, 321 deletions
diff --git a/common/Makefile.doc b/common/Makefile.doc index 17f4652d..e1c5950a 100644 --- a/common/Makefile.doc +++ b/common/Makefile.doc @@ -47,8 +47,8 @@ distclean: clean asciidoc: check-asciidoc $(DOC_FILES) check-asciidoc: - @$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.2\./ }' || \ - echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported" + @$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.4\./ }' || \ + echo >&2 "Warning: asciidoc versions other than 8.4.x are unsupported" version.html: ../../NEWS $(BASE)/Makefile.doc $(DEPS) @echo "DOC locale/$(LOCALE)/$@" diff --git a/common/content/liberator.js b/common/content/liberator.js index d496e474..fda6400e 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -1930,7 +1930,7 @@ window.addEventListener("liberatorHelpLink", function (event) { if (/^(mapping|command)$/.test(elem.className)) tag = tag.replace(/^\d+/, ""); if (elem.className == "command") - tag = tag.replace(/\[.*?\]/g, "").replace(/!$/, ""); + tag = tag.replace(/\[.*?\]/g, "").replace(/(\w+)!$/, "$1"); if (tag) { diff --git a/muttator/locale/en-US/asciidoc.conf b/muttator/locale/en-US/asciidoc.conf index 986557af..4b69783d 100644 --- a/muttator/locale/en-US/asciidoc.conf +++ b/muttator/locale/en-US/asciidoc.conf @@ -29,16 +29,16 @@ LOGO=<div style="text-align: center;"><span class="muttator-logo"></span></div> [macros] # heading:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=heading +(?u)^(?P<name>heading)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # section:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=section +(?u)^(?P<name>section)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # subsection:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=subsection +(?u)^(?P<name>subsection)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # help:helptext[href] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=help +(?su)(?<!\w)[\\]?(?P<name>help):(?P<target>\S*?)\[(?P<attrlist>.*?)\]= # FIXME: this logo/donation banner is really ugly. --djk -[heading-inlinemacro] +[heading-blockmacro] {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="muttator-logo"></span>} <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> @@ -52,7 +52,7 @@ LOGO=<div style="text-align: center;"><span class="muttator-logo"></span></div> </table> # maximum 3 tags for now -[section-inlinemacro] +[section-blockmacro] <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> <td style="width: 50%"><{outfile@.*all.html:h3:h2}>{target}</{outfile@.*all.html:h3:h2}></td> @@ -64,7 +64,7 @@ LOGO=<div style="text-align: center;"><span class="muttator-logo"></span></div> </tr> </table> -[subsection-inlinemacro] +[subsection-blockmacro] <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> <td style="width: 50%"><{outfile@.*all.html:h4:h3}>{target}</{outfile@.*all.html:h4:h3}></td> @@ -77,11 +77,11 @@ LOGO=<div style="text-align: center;"><span class="muttator-logo"></span></div> </table> [help-inlinemacro] -<a href="chrome://liberator/locale/{1}">{target}</a> +<a href="chrome://liberator/locale/{outfile@.*all.html:all.html:{1}}#{2={1}}">{target}</a> [quotes] -|=tag ||=key +|=tag [o]=#option '=option2 [c]=#command @@ -106,7 +106,7 @@ jump=<a class="jump" href="#">|</a> argument=<span class="argument">|</span> # NOTE: in certain contexts the unescaped '#' is stripped. As we're ditching # asciidoc I won't bother investigating --djk -argument2=<span class="argument">&\#123;|}</span> +argument2=<span class="argument">{|}</span> argument3=<span class="argument">[|]</span> [specialwords] diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf index eed08af8..c23e67d2 100644 --- a/vimperator/locale/en-US/asciidoc.conf +++ b/vimperator/locale/en-US/asciidoc.conf @@ -29,16 +29,16 @@ LOGO=<div style="text-align: center;"><span class="vimperator-logo"></span></div [macros] # heading:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=heading +(?u)^(?P<name>heading)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # section:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=section +(?u)^(?P<name>section)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # subsection:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=subsection +(?u)^(?P<name>subsection)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # help:helptext[href] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=help +(?su)(?<!\w)[\\]?(?P<name>help):(?P<target>\S*?)\[(?P<attrlist>.*?)\]= # FIXME: this logo/donation banner is really ugly. --djk -[heading-inlinemacro] +[heading-blockmacro] {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-----MIIHPwYJKoZIhvcNAQcEoIIHMDCCBywCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBDDJfc+lXLBSAM9XSWv/ebzG/L7PTqYiIXaWVg8pfinDsfYaAcifcgCTuApg4v/VaZIQ/hLODzQu2EvmjGXP0twErA/Q8G5gx0l197PJSyVXb1sLwd1mgOdLF4t0HmDCdEI9z3H6CMhsb3xVwlfpzllSfCIqzlSpx4QtdzEZGzLDELMAkGBSsOAwIaBQAwgbwGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQI8ZOwn5QkHgaAgZjjtPQxB7Vw2rS7Voap9y+xdVLoczUQ97hw+bOdZLcGykBtfoVjdn76MS51QKjGp1fEmxkqTuQ+Fxv8+OVtHu0QF/qlrhmC3fJBRJ0IFWxKdXS+Wod4615BDaG2X1hzvCL443ffka8XlLSiFTuW43BumQs/O+6Jqsk2hcReP3FIQOvtWMSgGTALnZx7x5c60u/3NSKW5qvyWKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA3MDMyMTIyMzI1OFowIwYJKoZIhvcNAQkEMRYEFCirrvlwYVHQiNEEbM6ikfx9+Dm5MA0GCSqGSIb3DQEBAQUABIGAtbsR8GdCdURLziozXLSdtY+zJZUPPeQFXXy2V1S/3ldiN+pRvd4HI7xz8mOY1UaKJZpwZnOosy9MflL1/hbiEtEyQ2Dm/s4jnTcJng/NjLIZu+0NYxXRJhB+zMJubnMMMjzNrGlqI4F2HAB/bCA1eOJ5B83Of3dA4rk/T/8GoSQ=-----END PKCS7-----"/> </fieldset> </form> </div> <span class="vimperator-logo"></span>} <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> @@ -52,7 +52,7 @@ LOGO=<div style="text-align: center;"><span class="vimperator-logo"></span></div </table> # maximum 3 tags for now -[section-inlinemacro] +[section-blockmacro] <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> <td style="width: 50%"><{outfile@.*all.html:h3:h2}>{target}</{outfile@.*all.html:h3:h2}></td> @@ -64,7 +64,7 @@ LOGO=<div style="text-align: center;"><span class="vimperator-logo"></span></div </tr> </table> -[subsection-inlinemacro] +[subsection-blockmacro] <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> <td style="width: 50%"><{outfile@.*all.html:h4:h3}>{target}</{outfile@.*all.html:h4:h3}></td> @@ -80,8 +80,8 @@ LOGO=<div style="text-align: center;"><span class="vimperator-logo"></span></div <a href="chrome://liberator/locale/{outfile@.*all.html:all.html:{1}}#{2={1}}">{target}</a> [quotes] -|=tag ||=key +|=tag [o]=#option '=option2 [c]=#command @@ -106,7 +106,7 @@ jump=<a class="jump" href="#">|</a> argument=<span class="argument">|</span> # NOTE: in certain contexts the unescaped '#' is stripped. As we're ditching # asciidoc I won't bother investigating --djk -argument2=<span class="argument">&\#123;|}</span> +argument2=<span class="argument">{|}</span> argument3=<span class="argument">[|]</span> [specialwords] diff --git a/vimperator/locale/en-US/autocommands.txt b/vimperator/locale/en-US/autocommands.txt index e9d4d06f..aad5d246 100644 --- a/vimperator/locale/en-US/autocommands.txt +++ b/vimperator/locale/en-US/autocommands.txt @@ -1,4 +1,4 @@ -heading:Automatic{nbsp}commands[autocommands] +heading::Automatic{nbsp}commands[autocommands] Autocommands are a way to automatically execute code when certain events happen. @@ -32,7 +32,7 @@ Available {events}: *PageLoadPre* Triggered after a page load is initiated *PageLoad* Triggered when a page gets (re)loaded/opened *PrivateMode* Triggered when private mode is activated or deactivated -*ShellCmdPost* Triggered after executing a shell command with [c]:![c]#{cmd} +*ShellCmdPost* Triggered after executing a shell command with [c]:![c]{cmd} *VimperatorEnter* Triggered after Firefox starts *VimperatorLeavePre* Triggered before exiting Firefox, just before destroying each module *VimperatorLeave* Triggered before exiting Firefox @@ -76,7 +76,7 @@ Apply the autocommands matching the specified URL to the current buffer. If no [a][url][a] is specified use the current URL. ________________________________________________________________________________ -section:Examples[autocmd-examples] +section::Examples[autocmd-examples] Enable _passthrough_ mode on all Google sites: diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index ff836e96..be8220d5 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -1,4 +1,4 @@ -heading:Browsing[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 @@ -25,7 +25,7 @@ Vimperator mode is temporarily disabled with [m]<C-z>[m], [m]<C-v>[m] will pass the next key to Vimperator instead of the web page. ________________________________________________________________________________ -section:Opening{nbsp}web{nbsp}pages[opening] +section::Opening{nbsp}web{nbsp}pages[opening] |o| |:o| |:open| ||:o[pen] [a][arg1][a], [a][arg2][a], ...|| + @@ -161,14 +161,14 @@ Increments the last number in URL by 1, or by [count] if given. ________________________________________________________________________________ -|\~| + -||\~|| +|$$~$$| + +||$$~$$|| ________________________________________________________________________________ Open home directory. You can also use the hints and have the probably fastest file browser on earth. :) ________________________________________________________________________________ -section:Navigating[navigating] +section::Navigating[navigating] |H| |<C-o>| |CTRL-O| |:ba| |:back| ||:[count]ba[ck] [a][url][a]|| + @@ -237,7 +237,7 @@ _http://www.example.com/_. When browsing a local directory, it goes to the root directory. ________________________________________________________________________________ -section:Reloading[reloading] +section::Reloading[reloading] |r| ||r|| @@ -267,7 +267,7 @@ ________________________________________________________________________________ Reload all pages. Forces reloading of all pages. If [!] is given, skip the cache. ________________________________________________________________________________ -section:Stopping[stopping] +section::Stopping[stopping] |<C-c>| ||<C-c>|| @@ -288,7 +288,7 @@ ________________________________________________________________________________ Stop loading all web pages. ________________________________________________________________________________ -section:Writing[writing,save-file] +section::Writing[writing,save-file] |:w| |:write| |:sav| |:saveas| + ||:sav[eas][!] [a][file][a]|| @@ -297,7 +297,7 @@ Save current web page to disk. If [a][file][a] is omitted, save to the page's default filename. Existing documents will only be overwritten if [!] is given. ________________________________________________________________________________ -section:Quitting[quitting,save-session] +section::Quitting[quitting,save-session] |:q| |:quit| + ||:q[uit]|| @@ -348,7 +348,7 @@ Quit and save the session. Quit Vimperator, no matter how many tabs/windows are open. The session is stored. Works like [c]:xall[c]. ________________________________________________________________________________ -section:The{nbsp}current{nbsp}directory[current-directory] +section::The{nbsp}current{nbsp}directory[current-directory] |:chd| |:chdir| |:cd| ||:cd [-|path]|| diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt index 40fac01d..4a123e6a 100644 --- a/vimperator/locale/en-US/buffer.txt +++ b/vimperator/locale/en-US/buffer.txt @@ -1,9 +1,9 @@ -heading:Buffer[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. -section:Buffer{nbsp}information[buffer-information] +section::Buffer{nbsp}information[buffer-information] |<C-g>| + ||<C-g>|| @@ -60,7 +60,7 @@ Toggle between rendered and source view. Alternates the page in the current tab between a normally rendered view and the internal editor source view. ________________________________________________________________________________ -section:Motion{nbsp}commands[motion,scrolling] +section::Motion{nbsp}commands[motion,scrolling] |^| |0| + ||0|| @@ -170,7 +170,7 @@ ________________________________________________________________________________ Scroll down a full page. Scroll window [count] pages Forwards (downwards) in the buffer. ________________________________________________________________________________ -section:Jumping{nbsp}to{nbsp}elements[jumping] +section::Jumping{nbsp}to{nbsp}elements[jumping] |<Tab>| + ||<Tab>|| @@ -228,7 +228,7 @@ browsing forums or documentation. Change 'previouspattern' to modify its behavior. It follows relations between files too. ________________________________________________________________________________ -section:Zooming[zooming,zoom] +section::Zooming[zooming,zoom] The zooming commands are dependent on two properties -- a zoom range and a series of levels within that range. @@ -333,7 +333,7 @@ Normally this command operates on the text zoom; if used with [!], it operates on full zoom. ________________________________________________________________________________ -section:Working{nbsp}with{nbsp}frames[frames] +section::Working{nbsp}with{nbsp}frames[frames] |:frameo| |:frameonly| ||:frameo[nly]|| + @@ -341,7 +341,7 @@ ________________________________________________________________________________ Show only the current frame's page. ________________________________________________________________________________ -section:Copying{nbsp}text[copying,yanking] +section::Copying{nbsp}text[copying,yanking] When running in X11, the text of the following commands is not only copied to the clipboard but is also put into the X11 selection, which @@ -361,7 +361,7 @@ ________________________________________________________________________________ Copy currently selected text to the system clipboard. ________________________________________________________________________________ -section:Alternate{nbsp}style{nbsp}sheets[alternate-stylesheet] +section::Alternate{nbsp}style{nbsp}sheets[alternate-stylesheet] Page authors may specify alternate style sheets for an HTML document. Users can then switch between these various style sheets, selecting their favorite. diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt index d6259600..449a1ade 100644 --- a/vimperator/locale/en-US/cmdline.txt +++ b/vimperator/locale/en-US/cmdline.txt @@ -1,4 +1,4 @@ -heading:Command-line{nbsp}mode[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]"). @@ -11,7 +11,7 @@ commands, which may require arguments. ________________________________________________________________________________ -section:Command-line{nbsp}editing[cmdline-editing] +section::Command-line{nbsp}editing[cmdline-editing] |c_<C-c>| + ||<C-c>|| @@ -58,7 +58,7 @@ ________________________________________________________________________________ Recall the next command line from the history list. ________________________________________________________________________________ -section:Command-line{nbsp}completion[cmdline-completion] +section::Command-line{nbsp}completion[cmdline-completion] |c_<Tab>| + ||<Tab>|| diff --git a/vimperator/locale/en-US/developer.txt b/vimperator/locale/en-US/developer.txt index a96d3dd0..e6a323f5 100644 --- a/vimperator/locale/en-US/developer.txt +++ b/vimperator/locale/en-US/developer.txt @@ -1,6 +1,6 @@ -heading:Developer{nbsp}information[developer-information] +heading::Developer{nbsp}information[developer-information] -section:Writing{nbsp}documentation[writing-docs,documentation] +section::Writing{nbsp}documentation[writing-docs,documentation] For every new feature, writing documentation is _mandatory_ for the patch to be accepted. The docs are written in @@ -62,7 +62,7 @@ Some notes about the code above: There are also some additional asciidoc commands specifically for writing Vimperator documentation: -- *$$section:Writing{nbsp}documentation[writing-docs,documentation]$$* Creates +- *$$section::Writing{nbsp}documentation[writing-docs,documentation]$$* Creates a new section like _Writing Documentation_ in this help file with 2 tags. - *$$help:developer{nbsp}information[developer.html,documentation]$$* creates a link with text _developer information_ to the tag _documentation_ in @@ -74,7 +74,7 @@ on the mailing list or on #vimperator. Usually help should be grouped together in logically connected subject areas like help:opening{nbsp}web{nbsp}pages[browsing.html,opening]. -section:Generating{nbsp}documentation[generating-docs] +section::Generating{nbsp}documentation[generating-docs] You can also autogenerate most of the asciidoc help after you have written a new command, mapping or option. For this, use: diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt index b7c2f143..2f394600 100644 --- a/vimperator/locale/en-US/eval.txt +++ b/vimperator/locale/en-US/eval.txt @@ -1,4 +1,4 @@ -heading:Expression{nbsp}evaluation[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 dd9258b4..2a7cc805 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -1,11 +1,11 @@ -heading:Vimperator's{nbsp}GUI[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 is required. There are commands for accessing the menu system, standard dialogs and the sidebar. -section:Menus[menu] +section::Menus[menu] |:emenu| + ||:emenu {menu}|| @@ -16,7 +16,7 @@ hierarchical path to the menu item with each submenu separated by a period. E.g. [c]:emenu File.Open File...[c] ________________________________________________________________________________ -section:Dialogs[dialogs] +section::Dialogs[dialogs] |:addo| |:addons| + ||:addo[ns]|| @@ -72,7 +72,7 @@ Show progress of current downloads. Open the original Firefox download dialog in a new tab. Here, downloads can be paused, canceled and resumed. ________________________________________________________________________________ -section:Add-ons[extensions,add-ons] +section::Add-ons[extensions,add-ons] |:exta| |:extadd| + ||:exta[dd] {file}|| @@ -123,7 +123,7 @@ Open the preferences dialog for an extension. If [!] is given, open a dialog, otherwise open a buffer. See also 'newtab'. ________________________________________________________________________________ -section:Sidebar[sidebar] +section::Sidebar[sidebar] |:sbcl| |:sbclose| + ||:sbcl[ose]|| @@ -140,7 +140,7 @@ standard Firefox View->Sidebar menu. Add-ons, Preferences and Downloads are also available in the sidebar. ________________________________________________________________________________ -section:Toolbars[toolbar] +section::Toolbars[toolbar] |:tbs| |:tbshow| |:toolbars| |:toolbarshow| + ||:toolbarshow {name}|| diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt index 3a693f04..7f54d1cb 100644 --- a/vimperator/locale/en-US/hints.txt +++ b/vimperator/locale/en-US/hints.txt @@ -1,4 +1,4 @@ -heading:Hints[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 a4f40a49..47278a99 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -1,13 +1,13 @@ -heading:Index[index] +heading::Index[index] This file contains a list of all available commands, mappings and options. -section:Insert{nbsp}mode[insert-index] +section::Insert{nbsp}mode[insert-index] ||[m]<C-i>[m]|| Launch the external editor + ||[m]<C-]>[m]|| Expand an Insert-mode abbreviation + -section:Normal{nbsp}mode[normal-index] +section::Normal{nbsp}mode[normal-index] ||[m]<C-^>[m]|| Select the alternate tab or the [count]th tab + ||[m]<C-a>[m]|| Increment last number in URL + @@ -130,7 +130,7 @@ section:Normal{nbsp}mode[normal-index] ||[m]zr[m]|| Reduce text zoom of current web page by a larger amount + ||[m]zz[m]|| Set text zoom value of current web page + -section:Command-line{nbsp}editing[ex-edit-index] +section::Command-line{nbsp}editing[ex-edit-index] ||[m]<C-c>[m]|| Quit Command-line mode without executing + @@ -142,7 +142,7 @@ section:Command-line{nbsp}editing[ex-edit-index] ||[m]<Tab>[m]|| Complete the word in front of the cursor according to the behavior specified in 'wildmode' + ||[m]<S-Tab>[m]|| Complete the previous full match when 'wildmode' contains "full" + -section:Ex{nbsp}commands[ex-cmd-index,:index] +section::Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:![c]|| Run a command + ||[c]:abbreviate[c]|| Abbreviate a key sequence + @@ -275,7 +275,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:wqall[c]|| Save the session and quit + ||[c]:zoom[c]|| Set zoom value of current web page + -section:Options[option-index] +section::Options[option-index] ||'activate'|| Define when tabs are automatically activated + ||'cdpath'|| List of directories searched when executing [c]:cd[c] + diff --git a/vimperator/locale/en-US/insert.txt b/vimperator/locale/en-US/insert.txt index d5920d7c..6c7e3d6c 100644 --- a/vimperator/locale/en-US/insert.txt +++ b/vimperator/locale/en-US/insert.txt @@ -1,4 +1,4 @@ -heading:Insert{nbsp}mode[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 @@ -11,7 +11,7 @@ Starts Insert mode in text areas when 'insertmode' is not set. ________________________________________________________________________________ -section:Insert-mode{nbsp}special{nbsp}keys[ins-special-keys] +section::Insert-mode{nbsp}special{nbsp}keys[ins-special-keys] |i_<C-i>| + ||<C-i>|| diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index 43f340eb..2b62165f 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -6,7 +6,7 @@ Later it was time for a Konqueror. Now it's time for an Imperator, the VIMperator :)* +++</div>+++ -section:Introduction[intro] +section::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] @@ -47,7 +47,7 @@ t-shirts or mugs. Of course, as we believe in free, open source software, only support us financially if you really like Vimperator and the money doesn't hurt - otherwise just use it, recommend it, and like it :) -section:Help{nbsp}topics[overview] +section::Help{nbsp}topics[overview] - help:Quick-start{nbsp}tutorial[tutorial.html]: A quick-start tutorial for new users. @@ -86,7 +86,7 @@ section:Help{nbsp}topics[overview] You can also jump directly to the help of a specific command with [c]:help o[c] or [c]:help :set[c]. -section:Features[features] +section::Features[features] * Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m], [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m]<C-f>[m], etc.) @@ -110,7 +110,7 @@ section:Features[features] * Marks support ([m]m[m][a]a[a] to set mark a on a web page, [m]'[m][a]a[a] to go there) * QuickMarks support (quickly go to previously marked web pages with - [m]go[m][a]\\{a-zA-Z0-9\\}[a]) + [m]go[m][a]{a-zA-Z0-9}[a]) * [c]:map[c] and [c]:command[c] support (and feedkeys() for script writers) * [c]:time[c] support for profiling * Move the text cursor and select text with Vim keys and a Visual mode @@ -119,7 +119,7 @@ section:Features[features] * AutoCommands to execute actions on certain events * A comprehensive help system, explaining all commands, mappings and options -section:Contact[contact] +section::Contact[contact] Please send comments/bug reports/patches to the mailing list, where we will properly answer any questions. You can also join the diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 04e67f50..62c3de71 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -1,6 +1,6 @@ -heading:Key{nbsp}mappings,{nbsp}abbreviations,{nbsp}and{nbsp}user-defined{nbsp}commands[] +heading::Key{nbsp}mappings,{nbsp}abbreviations,{nbsp}and{nbsp}user-defined{nbsp}commands[] -section:Key{nbsp}mapping[key-mapping,mapping,map,macro] +section::Key{nbsp}mapping[key-mapping,mapping,map,macro] The key mapping commands can be used to either redefine the standard key bindings or define new ones. A mapping consists of a key, or [j]key-sequence[j], @@ -21,7 +21,7 @@ Keys can be mapped in four distinct modes: Warning: Mappings are NOT saved between sessions, make sure you put them in your vimperatorrc file! -subsection:Map{nbsp}commands[:map-commands] +subsection::Map{nbsp}commands[:map-commands] |:map| ||:map {lhs} {rhs}|| + @@ -115,7 +115,7 @@ List all mappings starting with {lhs} for the applicable mode(s). ________________________________________________________________________________ -subsection:Special{nbsp}arguments{nbsp}[:map-arguments] +subsection::Special{nbsp}arguments{nbsp}[:map-arguments] |:map-<silent>| + @@ -134,13 +134,13 @@ Below is an overview of which modes each map command applies to: :imap :inoremap :iunmap :imapclear - Insert mode :cmap :cnoremap :cunmap :cmapclear - Command-line mode -subsection:Key{nbsp}sequences[:<>,key-sequence] +subsection::Key{nbsp}sequences[:<>,key-sequence] 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 number of keys to be used in mappings. - * *<lt>*, *\<*, *<Space>*, *\ * allow a literal *<* or space character. + * *<lt>*, *\<*, *<Space>*, *$$\ $$* allow a literal *<* or space character. * *\'*, *\"* and *\\* must be used to avoid escaping issues when mapping a quote or backslash. * *<Left>* *<Right>* *<Up>* *<Down>* *<PageUp>* *<PageDown>* *<Esc>* *<CR>* (for carriage return/enter) * *<CapsLock>* *<NumLock>* *<Ins>* *<Del>* *<Tab>* *<BS>* (for a backspace) @@ -173,7 +173,7 @@ the situation: * *<C-A-J>*: exactly the same as above * *<C-A-S-j>*: press J while holding control and alt -subsection:Special{nbsp}characters[:map-special-chars] +subsection::Special{nbsp}characters[:map-special-chars] |<Nop>| + ||<Nop>|| @@ -206,7 +206,7 @@ it works like + \{nbsp}[c]:map ,h :echo "Hello"<CR>[c] ________________________________________________________________________________ -section:Abbreviations[abbreviations] +section::Abbreviations[abbreviations] Vimperator can automatically replace words identified as abbreviations, which may be used to save typing or to correct commonly misspelled @@ -303,7 +303,7 @@ ________________________________________________________________________________ Remove all abbreviations for Insert mode. ________________________________________________________________________________ -section:User-defined{nbsp}commands[user-commands] +section::User-defined{nbsp}commands[user-commands] |:com| |:command| ||:com[mand]|| + @@ -444,7 +444,7 @@ ________________________________________________________________________________ Delete the user-defined command {cmd}. ________________________________________________________________________________ -section:Examples[command-examples] +section::Examples[command-examples] Add a :Google command to search via google: diff --git a/vimperator/locale/en-US/marks.txt b/vimperator/locale/en-US/marks.txt index 5c31d92c..bf43654a 100644 --- a/vimperator/locale/en-US/marks.txt +++ b/vimperator/locale/en-US/marks.txt @@ -1,4 +1,4 @@ -heading:Marks[different-marks,marks] +heading::Marks[different-marks,marks] Vimperator supports a number of different marks: @@ -10,7 +10,7 @@ Vimperator supports a number of different marks: - History is also a special type of marks, as Vimperator automatically remembers sites which you have visited in the past. -section:Bookmarks[bookmarks] +section::Bookmarks[bookmarks] |a| |:bma| |:bmark| ||:bma[rk][!] [a][-title=title][a] [a][-keyword=kw][a] [a][-tags=tag1,tag2][a] [a][url][a]|| + @@ -72,7 +72,7 @@ The following options WILL be interpreted in the future: * [!] a special version to delete ALL bookmarks ________________________________________________________________________________ -section:History[history] +section::History[history] |<C-o>| + ||[count]<C-o>|| @@ -135,21 +135,21 @@ Filter can also contain the following options: + -max=N (short options: -m) ________________________________________________________________________________ -section:QuickMarks[quickmarks] +section::QuickMarks[quickmarks] |go| + -||go[a]\\{a-zA-Z0-9\\}[a]|| +||go[a]{a-zA-Z0-9}[a]|| ________________________________________________________________________________ Jump to a QuickMark in the current tab. Open any QuickMark in the current tab. -You can mark any URLs with [m]M[m][a]\\{a-zA-Z0-9\\}[a]. These QuickMarks are +You can mark any URLs with [m]M[m][a]{a-zA-Z0-9}[a]. These QuickMarks are persistent across browser sessions. ________________________________________________________________________________ |gn| + -||gn[a]\\{a-zA-Z0-9\\}[a]|| +||gn[a]{a-zA-Z0-9}[a]|| ________________________________________________________________________________ -Jump to a QuickMark in a new tab. Works like [m]go[m][a]\\{a-zA-Z0-9\\}[a] but +Jump to a QuickMark in a new tab. Works like [m]go[m][a]{a-zA-Z0-9}[a] but opens the QuickMark in a new tab. Whether the new tab is activated or not depends on the 'activate' option. + Mnemonic: Go in a new tab. [m]gt[m] would make more sense but is already @@ -158,11 +158,11 @@ ________________________________________________________________________________ |M| + -||M[a]\\{a-zA-Z0-9\\}[a]|| +||M[a]{a-zA-Z0-9}[a]|| ________________________________________________________________________________ Add new QuickMark for current URL. You can go to a marked URL in the current -tab with [m]go[m][a]\\{a-zA-Z0-9\\}[a] or in a new tab with -[m]gn[m][a]\\{a-zA-Z0-9\\}[a]. These QuickMarks are persistent across browser +tab with [m]go[m][a]{a-zA-Z0-9}[a] or in a new tab with +[m]gn[m][a]{a-zA-Z0-9}[a]. These QuickMarks are persistent across browser sessions. ________________________________________________________________________________ @@ -185,8 +185,9 @@ ________________________________________________________________________________ |:qma| |:qmark| ||:qma[rk] {a-zA-Z0-9} [a][url][a]|| + ________________________________________________________________________________ -Mark a URL with a letter for quick access. You can also mark whole groups like this: + -[c]:qmark f +++http://forum1.com+++, +++http://forum2.com+++, imdb some artist[c] +Mark a URL with a letter for quick access. You can also mark whole groups +like this: + + [c]:qmark f +++http://forum1.com+++, +++http://forum2.com+++, imdb some artist[c] ________________________________________________________________________________ @@ -197,18 +198,18 @@ Show all QuickMarks. If [a][arg][a] is specified then limit the list to those QuickMarks mentioned. ________________________________________________________________________________ -section:Local{nbsp}marks[localmarks] +section::Local{nbsp}marks[localmarks] |m| + -||m[a]\\{a-zA-Z\\}[a]|| +||m[a]{a-zA-Z}[a]|| ________________________________________________________________________________ Set mark at the cursor position. Marks a-z are local to the buffer, whereas A-Z are valid between buffers. ________________________________________________________________________________ -|\`| |\'| + -||\'[a]\\{a-zA-Z\\}[a]|| +|$$`$$| |$$'$$| + +||'[a]{a-zA-Z}[a]|| ________________________________________________________________________________ Jump to the mark in the current buffer. Marks a-z are local to the buffer, whereas A-Z are valid between buffers. diff --git a/vimperator/locale/en-US/message.txt b/vimperator/locale/en-US/message.txt index 6999573d..852f8712 100644 --- a/vimperator/locale/en-US/message.txt +++ b/vimperator/locale/en-US/message.txt @@ -1,4 +1,4 @@ -heading:Error{nbsp}and{nbsp}informational{nbsp}messages[messages] +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 f699ffaa..f1f1fc87 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -1,4 +1,4 @@ -heading:Options[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: @@ -10,7 +10,7 @@ achieve special effects. These options come in 5 forms: *stringlist* a comma-separated list of strings ------------------------------------------------------- -section:Setting{nbsp}options[set-option,E764] +section::Setting{nbsp}options[set-option,E764] |:set| |:se| + ||:se[t]|| @@ -153,7 +153,7 @@ Environment variables are expanded for path options like 'cdpath' and 'runtimepath'. The variable notation is _$VAR_ (terminated by a non-word character) or _$\\{VAR}_. _%VAR%_ is also supported on Windows. -section:Setting{nbsp}Firefox{nbsp}options[firefox-options,preferences] +section::Setting{nbsp}Firefox{nbsp}options[firefox-options,preferences] Firefox options can be viewed and set with the following commands: @@ -193,7 +193,7 @@ The following preferences are set: // TODO: others? -section:List{nbsp}of{nbsp}options[list-options] +section::List{nbsp}of{nbsp}options[list-options] |\'act'| |\'activate'| ||'activate' 'act'|| stringlist (default: "homepage,quickmark,tabopen,paste") @@ -636,16 +636,16 @@ ____ |\'rtp'| |\'runtimepath'| ||'runtimepath' 'rtp'|| stringlist ____ -(default: _$VIMPERATOR_RUNTIME_ or Unix, Mac: "\~/.vimperator", Windows: "\~/vimperator") +(default: _$VIMPERATOR_RUNTIME_ or $$Unix, Mac: "~/.vimperator", Windows: "~/vimperator"$$) List of directories searched for runtime files: + colors/ + macros/ + plugin/ + -Example: [c]:set runtimepath=\~/myvimperator,\~/.vimperator[c] + -This will search for plugins in both "\~/myvimperator/plugin" and -"\~/.vimperator/plugin" +Example: [c]:set runtimepath=$$~/myvimperator,~/.vimperator$$[c] + +This will search for plugins in both $$"~/myvimperator/plugin" and +"~/.vimperator/plugin"$$ On startup, if the environment variable _$VIMPERATOR_RUNTIME_ does not exist, Vimperator will set it to match this value. @@ -785,8 +785,8 @@ ____ Use visual bell instead of beeping on errors. The visual bell style is controlled by [c]:hi Bell[c]. -To disable both the audible and visual bells use [c]:set visualbell[c] and -[c]:hi Bell display: none;[c] +To disable both the audible and visual bells use [c]:set visualbell[c] +and [c]:hi Bell display: none;[c] ____ diff --git a/vimperator/locale/en-US/pattern.txt b/vimperator/locale/en-US/pattern.txt index dcc685f8..e0720022 100644 --- a/vimperator/locale/en-US/pattern.txt +++ b/vimperator/locale/en-US/pattern.txt @@ -1,4 +1,4 @@ -heading:Text{nbsp}search{nbsp}commands[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 @@ -44,15 +44,15 @@ opposite direction. ________________________________________________________________________________ -|\*| + -||\*|| +|$$*$$| + +||$$*$$|| ________________________________________________________________________________ Search forward for the next word under the cursor. ________________________________________________________________________________ -|\#| + -||\#|| +|$$#$$| + +||$$#$$|| ________________________________________________________________________________ Search backward for the previous word under the cursor. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/print.txt b/vimperator/locale/en-US/print.txt index 6059f6d8..7310e1cc 100644 --- a/vimperator/locale/en-US/print.txt +++ b/vimperator/locale/en-US/print.txt @@ -1,4 +1,4 @@ -heading:Printing[printing] +heading::Printing[printing] |:ha| |:hardcopy| + ||:ha[rdcopy][!]|| @@ -16,7 +16,7 @@ As above, but write the output to {filename}. Note: Not available on Windows. ________________________________________________________________________________ -section:Firefox{nbsp}printing{nbsp}dialogs[firefox-print-dialogs] +section::Firefox{nbsp}printing{nbsp}dialogs[firefox-print-dialogs] The "Print Preview" and "Page Setup" dialogs can be opened via the [c]:dialog[c] command diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt index 359172ae..a2e1dc48 100644 --- a/vimperator/locale/en-US/repeat.txt +++ b/vimperator/locale/en-US/repeat.txt @@ -1,8 +1,8 @@ -heading:Repeating{nbsp}commands[repeating] +heading::Repeating{nbsp}commands[repeating] Vimperator can repeat a number of commands and record macros. -section:Single{nbsp}repeats[single-repeat] +section::Single{nbsp}repeats[single-repeat] |.| ||[count].|| @@ -20,7 +20,7 @@ Repeat the last Ex command [count] times. ____________________________________________________________________________ -section:Macros[macros,complex-repeat] +section::Macros[macros,complex-repeat] |q| ||q\\{0-9a-zA-Z}|| + @@ -64,7 +64,7 @@ Replay the last executed macro [count] times. ____________________________________________________________________________ -section:Using{nbsp}scripts[using-scripts] +section::Using{nbsp}scripts[using-scripts] |:so| |:source| ||:so[urce][!] {file}|| + @@ -93,7 +93,7 @@ function hello2() { are only available within the scope of the script. The _.vimperatorrc_ file in your home directory and any files in -_\~/.vimperator/plugin/_ are always sourced at startup. \~ is supported as a +_$$~/.vimperator/plugin/$$_ are always sourced at startup. $$~$$ is supported as a shortcut for the _$HOME_ directory. If [!] is specified, errors are not printed. ________________________________________________________________________________ @@ -134,7 +134,7 @@ Stop sourcing a script file. This can only be called from within a Vimperator script file. ________________________________________________________________________________ -section:Profiling[profile,profiling] +section::Profiling[profile,profiling] |:time| ||:[count]time[!] {code|:command}|| + diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index 9fc0f800..d437e4b4 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -1,10 +1,10 @@ -heading:Starting{nbsp}Vimperator[starting] +heading::Starting{nbsp}Vimperator[starting] |startup-options| + Command-line options can be passed to Vimperator via the -liberator Firefox option. These are passed as single string argument. -E.g firefox -liberator "\++cmd=\'set exrc' +u=\'tempRcFile' \++noplugin" +E.g firefox -liberator "$$++cmd='set exrc' +u='tempRcFile' ++noplugin$$" |+c| + ||+c={command}|| @@ -14,8 +14,8 @@ Execute a single Ex command after all initialization has been performed. See ________________________________________________________________________________ -|\++cmd| + -||\++cmd={command}|| +|$$++cmd$$| + +||$$++cmd={command}$$|| ________________________________________________________________________________ Execute a single Ex command before any initialization has been performed. See [j]initialization[j]. @@ -32,13 +32,13 @@ is "NONE" then plugin loading is also skipped. ________________________________________________________________________________ -|\++noplugin| + -||\++noplugin|| +|$$++noplugin$$| + +||$$++noplugin$$|| ________________________________________________________________________________ Prevents plugin scripts from being loaded at startup. See 'loadplugins'. ________________________________________________________________________________ -section:Initialization[initialization,startup] +section::Initialization[initialization,startup] At startup, Vimperator completes the following tasks in order. @@ -49,9 +49,9 @@ further locations are tried. a. |$VIMPERATOR_INIT| _$VIMPERATOR_INIT_ -- May contain a single Ex command (e.g., "[c]:source {file}[c]"). - b. _\~/\_vimperatorrc_ -- Windows only. If this file exists, its contents + b. _$$~/_vimperatorrc$$_ -- Windows only. If this file exists, its contents are executed and _$MY_VIMPERATORRC_ set to its path. - c. _\~/.vimperatorrc_ -- If this file exists, its contents are executed. + c. _$$~/.vimperatorrc$$_ -- If this file exists, its contents are executed. 2. If 'exrc' is set and the +u command-line option was not specified, then any RC file in the current directory is also sourced. @@ -63,7 +63,7 @@ subdirectories) are sourced alphabetically. No plugins will be sourced if: * 'noloadplugins' is set. - * the \++noplugin command-line option was specified. + * the $$++noplugin$$ command-line option was specified. * the +u=NONE command-line option specified set. Any particular plugin will not be loaded if it has already been loaded (e.g., @@ -76,7 +76,7 @@ The user's ~ (i.e., "home") directory is determined as follows: _%USERPROFILE%_, and then _%HOMEDRIVE%%HOMEPATH%_. It uses the first one it finds. -section:Saving{nbsp}settings[save-settings] +section::Saving{nbsp}settings[save-settings] |:mkv| |:mkvimperatorrc| ||:mkv[imperatorrc][!] [a][file][a]|| + @@ -90,7 +90,7 @@ Warning: this differs from Vim's behavior which defaults to writing the file in the current directory. ________________________________________________________________________________ -section:Restarting[restarting] +section::Restarting[restarting] |:res| |:restart| + ||:res[tart]|| diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index 05acc557..bba589bb 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -1,4 +1,4 @@ -heading:Styling{nbsp}the{nbsp}GUI{nbsp}and{nbsp}web{nbsp}pages[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 @@ -102,7 +102,7 @@ ________________________________________________________________________________ ||:sty[le][!] [-name={name}] [-append] {filter} [{css}]|| + ________________________________________________________________________________ Add CSS styles to the browser or to web pages. {filter} is a comma -separated list of URLs to match. URLs ending with *\** are matched as +separated list of URLs to match. URLs ending with *** are matched as prefixes, URLs not containing any *:* or */* characters are matched as domains. If {name} (short option: *-n*) is provided, any existing style with the same name is overridden, and the style may later diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index 655c5443..758de0a8 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -1,10 +1,10 @@ -heading:Tabs[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 result many buffer and tab commands are interchangeable. -section:Listing{nbsp}tabs[listing-tabs] +section::Listing{nbsp}tabs[listing-tabs] |B| |:tabs| |:ls| |:files| |:buffers| ||:buffers [a][filter][a]|| + @@ -14,7 +14,7 @@ Show a list of buffers (=tabs) matching [a][filter][a]. Without [a][filter][a] list all tabs. ________________________________________________________________________________ -section:Opening{nbsp}tabs[opening-tabs] +section::Opening{nbsp}tabs[opening-tabs] |:tab| + ||:tab {cmd}|| @@ -39,7 +39,7 @@ ________________________________________________________________________________ //TODO: should the tab commands be moved back here? See [j]opening[j] for other ways to open new tabs. -section:Changing{nbsp}tabs[changing-tabs] +section::Changing{nbsp}tabs[changing-tabs] |gb| + ||[count]gb|| @@ -99,7 +99,7 @@ buffer, it is selected. With [!] the next buffer matching the argument is selected, even if it cannot be identified uniquely. Use [m]b[m] as a shortcut to open this prompt. -If argument is [a]\#[a], the alternate buffer will be selected (see [m]<C-^>[m]). +If argument is [a]#[a], the alternate buffer will be selected (see [m]<C-^>[m]). If no argument is given the current buffer remains current. ________________________________________________________________________________ @@ -132,7 +132,7 @@ ________________________________________________________________________________ Detach the current tab, and open it in its own window. ________________________________________________________________________________ -section:Reordering{nbsp}tabs[reordering-tabs] +section::Reordering{nbsp}tabs[reordering-tabs] |:tabm| |:tabmove| ||:tabm[ove] [a][N][a]|| + @@ -174,7 +174,7 @@ Switch to the previous tab or go [count] tabs back. Wraps around from the first tab to the last tab. ________________________________________________________________________________ -section:Closing{nbsp}tabs[closing-tabs] +section::Closing{nbsp}tabs[closing-tabs] |d| |:tabc| |:tabclose| |:bun| |:bunload| |:bw| |:bwipeout| |:bd| |:bdelete| ||:[count]bd[elete][!] [a][arg][a]|| + @@ -213,7 +213,7 @@ after a browser restart. ________________________________________________________________________________ -section:Looping{nbsp}over{nbsp}tabs[looping-over-tabs] +section::Looping{nbsp}over{nbsp}tabs[looping-over-tabs] |:tabd| |:tabdo| |:bufd| |:bufdo| + ||:tabd[o] {cmd}|| diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index d9e4dae7..257a5ab4 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -1,6 +1,6 @@ // Initial revision: Sun Jun 8 10:07:05 UTC 2008 (penryu) -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 @@ -23,7 +23,7 @@ Vimperator is to leave these disabled for now. (The above action can be reversed with [c]:set go=<CR>[c]) You can look at the entry for 'guioptions' in help:options[options.html] for more information on this. -section:Vimperator's{nbsp}modal{nbsp}interface[modal] +section::Vimperator's{nbsp}modal{nbsp}interface[modal] Vimperator's power, like Vim's, comes from it's modal interface. Keys have different meanings depending on which mode the browser is in. Vimperator has @@ -41,7 +41,7 @@ To return to Normal mode from Command-line mode, type [m]<Esc>[m]. Pressing [m]<Esc>[m] will also return you to Normal mode from most other modes in Vimperator. -section:Getting{nbsp}help[getting-help] +section::Getting{nbsp}help[getting-help] Vim is a great editor but it's not much of a web browser. So even seasoned Vim users will probably have to look at Vimperator documentation sooner or later. @@ -63,7 +63,7 @@ And you can find out about the [m]gt[m] and [m]gT[m] mapping with Finally, in addition to the help system itself, [c]:exusage[c], [c]:viusage[c] and [c]:optionusage[c] are useful quick-reference commands. -section:Mouseless[living-mouseless] +section::Mouseless[living-mouseless] *-- or how I learned to stop worrying and love the 80+ buttons I already have.* @@ -76,7 +76,7 @@ assumption that a web browser doesn't have to be one of those. Here are some areas where the mouse is typically considered indisposable, and how Vimperator challenges this preconception. -section:Scrolling[keyboard-scrolling] +section::Scrolling[keyboard-scrolling] Scrolling the browser window is done with simple keystrokes: @@ -92,7 +92,7 @@ Scrolling the browser window is done with simple keystrokes: Your standard buttons ([m]<Up>[m]/[m]<Down>[m]/[m]<PgUp>[m]/[m]<PgDn>[m]) will also work as expected. -section:History{nbsp}and{nbsp}tabs[history-navigation,tab-navigation] +section::History{nbsp}and{nbsp}tabs[history-navigation,tab-navigation] History navigation (e.g., ``Back'', ``Forward'') are done similarly to scrolling. @@ -123,7 +123,7 @@ equivalent: \{nbsp}[c]:tabopen vimperator.org<CR>[c] + \{nbsp}[m]tvimperator.org<CR>[m] -section:Some{nbsp}hints{nbsp}about{nbsp}surfing...[hints-tutorial] +section::Some{nbsp}hints{nbsp}about{nbsp}surfing...[hints-tutorial] So now you can navigate around in Vimperator. But wait... how do you *open* a page or tab linked in a web page? How do you ``click'' on all those links @@ -154,7 +154,7 @@ uniquely identified soon, and Vimperator will open it. Once you're done, remember to use [m]<C-o>[m] (``History Back'') or [m]d[m] (``Delete Buffer'') to return here, depending on which key you used to activate QuickHint mode. -section:Common{nbsp}issues[common-issues] +section::Common{nbsp}issues[common-issues] Say you get half-way done typing in a new URL, only to remember that you've already got that page open in the previous tab. Your command line might look @@ -167,7 +167,7 @@ following: \{nbsp}[m]<Esc>gT[m] -section:Saving{nbsp}for{nbsp}posterity{nbsp}-{nbsp}vimperatorrc[vimperatorrc] +section::Saving{nbsp}for{nbsp}posterity{nbsp}-{nbsp}vimperatorrc[vimperatorrc] Once you get Vimperator set up with your desired options, maps, and commands, you'll probably want them to be available the next time you open Vimperator. @@ -180,7 +180,7 @@ This will create the file *_$HOME_/.vimperatorrc* containing your settings. It is a simple text file, just like a vimrc file and can be easily edited to suit your preferences. -section:Find{nbsp}the{nbsp}exit{nbsp}nearest{nbsp}you[quitting-without-menus] +section::Find{nbsp}the{nbsp}exit{nbsp}nearest{nbsp}you[quitting-without-menus] Vimperator supports all of Vim's classic methods of exiting. @@ -190,7 +190,7 @@ Vimperator supports all of Vim's classic methods of exiting. * [m]ZZ[m] -- Normal mode mapping equivalent to [c]:xall[c] * [m]ZQ[m] -- Normal mode mapping equivalent to [c]:qall[c] -section:Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither-firefox] +section::Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither-firefox] You might feel pretty disoriented now. Don't worry. This is still Firefox underneath. Here are some ways Vimperator allows Firefox to shine through. See @@ -221,7 +221,7 @@ If you get hopelessly lost, just type [c]:help<CR>[c] and click the // TODO: other sections? -section:Get{nbsp}me{nbsp}out{nbsp}of{nbsp}here![removal] +section::Get{nbsp}me{nbsp}out{nbsp}of{nbsp}here![removal] If you've given it a fair shot and determined ... TODO @@ -234,7 +234,7 @@ Alternatively, you can do this the old-fashioned way: re-enable the menubar, as above, with [c]:set go+=m[c], and select *Add-ons* from the *Tools* menu. -section:I'm{nbsp}interested...but{nbsp}lost![support] +section::I'm{nbsp}interested...but{nbsp}lost![support] Vimperator has an energetic and growing user base. If you've run into a problem that you can't seem to solve with Vimperator, or if you think you might have diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt index 89b57110..2d16d991 100644 --- a/vimperator/locale/en-US/various.txt +++ b/vimperator/locale/en-US/various.txt @@ -1,6 +1,6 @@ -heading:Other{nbsp}help[] +heading::Other{nbsp}help[] -section:Various{nbsp}commands[various] +section::Various{nbsp}commands[various] |:beep| + ||:beep|| @@ -35,7 +35,7 @@ backslash before the \'!', then the backslash is removed. Warning: Input redirection (< foo) not done, also do not run commands which require stdin or it will hang Firefox! It is possible to launch background -processes, though (e.g. ':! xterm &'). +processes, though (e.g. [c]:! xterm &[c]). ________________________________________________________________________________ @@ -55,7 +55,7 @@ Show version information. You can show the Firefox version page with [c]:version![c]. ________________________________________________________________________________ -section:Online{nbsp}help[online-help] +section::Online{nbsp}help[online-help] |<F1>| |:help| |:h| |help| ||:h[elp] [a][subject][a]|| + @@ -108,7 +108,7 @@ now dead, unfortunately. So now you might wonder what the meaning of death is... -section:Uncategorized{nbsp}help[uncategorized] +section::Uncategorized{nbsp}help[uncategorized] |<C-[>| |<Esc>| + ||<Esc>|| diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf index c701991d..a8e6617e 100644 --- a/xulmus/locale/en-US/asciidoc.conf +++ b/xulmus/locale/en-US/asciidoc.conf @@ -29,16 +29,16 @@ LOGO=<div style="text-align: center;"><span class="xulmus-logo"></span></div> [macros] # heading:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=heading +(?u)^(?P<name>heading)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # section:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=section +(?u)^(?P<name>section)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # subsection:Title[tag1,tag2] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=subsection +(?u)^(?P<name>subsection)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=# # help:helptext[href] -(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=help +(?su)(?<!\w)[\\]?(?P<name>help):(?P<target>\S*?)\[(?P<attrlist>.*?)\]= # FIXME: this logo/donation banner is really ugly. --djk -[heading-inlinemacro] +[heading-blockmacro] {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="xulmus-logo"></span>} <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> @@ -52,7 +52,7 @@ LOGO=<div style="text-align: center;"><span class="xulmus-logo"></span></div> </table> # maximum 3 tags for now -[section-inlinemacro] +[section-blockmacro] <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> <td style="width: 50%"><{outfile@.*all.html:h3:h2}>{target}</{outfile@.*all.html:h3:h2}></td> @@ -64,7 +64,7 @@ LOGO=<div style="text-align: center;"><span class="xulmus-logo"></span></div> </tr> </table> -[subsection-inlinemacro] +[subsection-blockmacro] <table style="border-bottom: 1px solid silver; width: 100%"> <tr style="width: 100%"> <td style="width: 50%"><{outfile@.*all.html:h4:h3}>{target}</{outfile@.*all.html:h4:h3}></td> @@ -80,8 +80,8 @@ LOGO=<div style="text-align: center;"><span class="xulmus-logo"></span></div> <a href="chrome://liberator/locale/{outfile@.*all.html:all.html:{1}}#{2={1}}">{target}</a> [quotes] -|=tag ||=key +|=tag [o]=#option '=option2 [c]=#command @@ -106,7 +106,7 @@ jump=<a class="jump" href="#">|</a> argument=<span class="argument">|</span> # NOTE: in certain contexts the unescaped '#' is stripped. As we're ditching # asciidoc I won't bother investigating --djk -argument2=<span class="argument">&\#123;|}</span> +argument2=<span class="argument">{|}</span> argument3=<span class="argument">[|]</span> [specialwords] diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt index ca02c858..a0d6b8d6 100644 --- a/xulmus/locale/en-US/autocommands.txt +++ b/xulmus/locale/en-US/autocommands.txt @@ -1,4 +1,4 @@ -heading:Automatic{nbsp}commands[autocommands] +heading::Automatic{nbsp}commands[autocommands] Autocommands are a way to automatically execute code when certain events happen. @@ -85,7 +85,7 @@ Apply the autocommands matching the specified URL to the current buffer. If no [a][url][a] is specified use the current URL. ________________________________________________________________________________ -section:Examples[autocmd-examples] +section::Examples[autocmd-examples] Enable _passthrough_ mode on all Google sites: diff --git a/xulmus/locale/en-US/browsing.txt b/xulmus/locale/en-US/browsing.txt index fbdb1166..b6c7ae94 100644 --- a/xulmus/locale/en-US/browsing.txt +++ b/xulmus/locale/en-US/browsing.txt @@ -1,4 +1,4 @@ -heading:Browsing[surfing,browsing] +heading::Browsing[surfing,browsing] |surfing| |browsing| + @@ -27,7 +27,7 @@ Xulmus mode is temporarily disabled with [m]<C-z>[m], [m]<C-v>[m] will pass the next key to Xulmus instead of the web page. ________________________________________________________________________________ -section:Opening{nbsp}web{nbsp}pages[opening] +section::Opening{nbsp}web{nbsp}pages[opening] |o| |:o| |:open| ||:o[pen] [a][arg1][a], [a][arg2][a], ...|| + @@ -157,14 +157,14 @@ Increments the last number in URL by 1, or by [count] if given. ________________________________________________________________________________ -|\~| + -||\~|| +|$$~$$| + +||$$~$$|| ________________________________________________________________________________ Open home directory. You can also use the hints and have the probably fastest file browser on earth. :) ________________________________________________________________________________ -section:Navigating[navigating] +section::Navigating[navigating] |H| |<C-o>| |CTRL-O| |:ba| |:back| ||:[count]ba[ck] [a][url][a]|| + @@ -233,7 +233,7 @@ _http://www.example.com/_. When browsing a local directory, it goes to the root directory. ________________________________________________________________________________ -section:Reloading[reloading] +section::Reloading[reloading] |r| ||r|| @@ -263,7 +263,7 @@ ________________________________________________________________________________ Reload all pages. Forces reloading of all pages. If [!] is given, skip the cache. ________________________________________________________________________________ -section:Stopping[stopping] +section::Stopping[stopping] |<C-c>| ||<C-c>|| @@ -284,7 +284,7 @@ ________________________________________________________________________________ Stop loading all web pages. ________________________________________________________________________________ -section:Writing[writing,save-file] +section::Writing[writing,save-file] |:w| |:write| |:sav| |:saveas| + ||:sav[eas][!] [a][file][a]|| @@ -293,7 +293,7 @@ Save current web page to disk. If [a][file][a] is omitted, save to the page's default filename. Existing documents will only be overwritten if [!] is given. ________________________________________________________________________________ -section:Quitting[quitting,save-session] +section::Quitting[quitting,save-session] |:q| |:quit| + ||:q[uit]|| @@ -337,7 +337,7 @@ Quit and save the session. Quit Xulmus, no matter how many tabs/windows are open. The session is stored. Works like [c]:xall[c]. ________________________________________________________________________________ -section:The{nbsp}current{nbsp}directory[current-directory] +section::The{nbsp}current{nbsp}directory[current-directory] |:chd| |:chdir| |:cd| ||:cd [-|path]|| diff --git a/xulmus/locale/en-US/buffer.txt b/xulmus/locale/en-US/buffer.txt index a2548dad..59ccc8f7 100644 --- a/xulmus/locale/en-US/buffer.txt +++ b/xulmus/locale/en-US/buffer.txt @@ -1,9 +1,9 @@ -heading:Buffer[buffer,document] +heading::Buffer[buffer,document] Xulmus holds exactly one buffer object for each tab. It is usually an (X)HTML document with advanced features. -section:Buffer{nbsp}information[buffer-information] +section::Buffer{nbsp}information[buffer-information] |<C-g>| + ||<C-g>|| @@ -60,7 +60,7 @@ Toggle between rendered and source view. Alternates the page in the current tab between a normally rendered view and the internal editor source view. ________________________________________________________________________________ -section:Motion{nbsp}commands[motion,scrolling] +section::Motion{nbsp}commands[motion,scrolling] |^| |0| + ||0|| @@ -170,7 +170,7 @@ ________________________________________________________________________________ Scroll down a full page. Scroll window [count] pages Forwards (downwards) in the buffer. ________________________________________________________________________________ -section:Jumping{nbsp}to{nbsp}elements[jumping] +section::Jumping{nbsp}to{nbsp}elements[jumping] |<Tab>| + ||<Tab>|| @@ -228,7 +228,7 @@ browsing forums or documentation. Change 'previouspattern' to modify its behavior. It follows relations between files too. ________________________________________________________________________________ -section:Zooming[zooming,zoom] +section::Zooming[zooming,zoom] The zooming commands are dependent on two properties -- a zoom range and a series of levels within that range. @@ -333,7 +333,7 @@ Normally this command operates on the text zoom; if used with [!], it operates on full zoom. ________________________________________________________________________________ -section:Working{nbsp}with{nbsp}frames[frames] +section::Working{nbsp}with{nbsp}frames[frames] |:frameo| |:frameonly| ||:frameo[nly]|| + @@ -341,7 +341,7 @@ ________________________________________________________________________________ Show only the current frame's page. ________________________________________________________________________________ -section:Copying{nbsp}text[copying,yanking] +section::Copying{nbsp}text[copying,yanking] When running in X11, the text of the following commands is not only copied to the clipboard but is also put into the X11 selection, which @@ -361,7 +361,7 @@ ________________________________________________________________________________ Copy currently selected text to the system clipboard. ________________________________________________________________________________ -section:Alternate{nbsp}style{nbsp}sheets[alternate-stylesheet] +section::Alternate{nbsp}style{nbsp}sheets[alternate-stylesheet] Page authors may specify alternate style sheets for an HTML document. Users can then switch between these various style sheets, selecting their favorite. diff --git a/xulmus/locale/en-US/cmdline.txt b/xulmus/locale/en-US/cmdline.txt index d6259600..449a1ade 100644 --- a/xulmus/locale/en-US/cmdline.txt +++ b/xulmus/locale/en-US/cmdline.txt @@ -1,4 +1,4 @@ -heading:Command-line{nbsp}mode[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]"). @@ -11,7 +11,7 @@ commands, which may require arguments. ________________________________________________________________________________ -section:Command-line{nbsp}editing[cmdline-editing] +section::Command-line{nbsp}editing[cmdline-editing] |c_<C-c>| + ||<C-c>|| @@ -58,7 +58,7 @@ ________________________________________________________________________________ Recall the next command line from the history list. ________________________________________________________________________________ -section:Command-line{nbsp}completion[cmdline-completion] +section::Command-line{nbsp}completion[cmdline-completion] |c_<Tab>| + ||<Tab>|| diff --git a/xulmus/locale/en-US/developer.txt b/xulmus/locale/en-US/developer.txt index 70776a22..23ae25b5 100644 --- a/xulmus/locale/en-US/developer.txt +++ b/xulmus/locale/en-US/developer.txt @@ -1,6 +1,6 @@ -heading:Developer{nbsp}information[developer-information] +heading::Developer{nbsp}information[developer-information] -section:Writing{nbsp}documentation[writing-docs,documentation] +section::Writing{nbsp}documentation[writing-docs,documentation] For every new feature, writing documentation is _mandatory_ for the patch to be accepted. The docs are written in @@ -62,7 +62,7 @@ Some notes about the code above: There are also some additional asciidoc commands specifically for writing Xulmus documentation: -- *$$section:Writing{nbsp}documentation[writing-docs,documentation]$$* Creates +- *$$section::Writing{nbsp}documentation[writing-docs,documentation]$$* Creates a new section like _Writing Documentation_ in this help file with 2 tags. - *$$help:developer{nbsp}information[developer.html#documentation]$$* creates a link with text _developer information_ to the tag _documentation_ in @@ -74,7 +74,7 @@ on the mailing list or on #vimperator. Usually help should be grouped together in logically connected subject areas like help:opening{nbsp}web{nbsp}pages[browsing.html#opening]. -section:Generating{nbsp}documentation[generating-docs] +section::Generating{nbsp}documentation[generating-docs] You can also autogenerate most of the asciidoc help after you have written a new command, mapping or option. For this, use: diff --git a/xulmus/locale/en-US/eval.txt b/xulmus/locale/en-US/eval.txt index 4eba4039..a1e6836f 100644 --- a/xulmus/locale/en-US/eval.txt +++ b/xulmus/locale/en-US/eval.txt @@ -1,4 +1,4 @@ -heading:Expression{nbsp}evaluation[expression,expr,eval] +heading::Expression{nbsp}evaluation[expression,expr,eval] //INTRO TO BE WRITTEN... diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt index 1a7b3dec..a9286ae8 100644 --- a/xulmus/locale/en-US/gui.txt +++ b/xulmus/locale/en-US/gui.txt @@ -1,11 +1,11 @@ -heading:Vimperator's{nbsp}GUI[gui] +heading::Vimperator's{nbsp}GUI[gui] Although Xulmus offers the most frequently used Songbird functionality via Ex and Normal mode commands there may be times when directly accessing the GUI is required. There are commands for accessing the menu system, standard dialogs and the sidebar. -section:Menus[menu] +section::Menus[menu] |:emenu| + ||:emenu {menu}|| @@ -16,7 +16,7 @@ hierarchical path to the menu item with each submenu separated by a period. E.g. [c]:emenu File.Open File...[c] ________________________________________________________________________________ -section:Dialogs[dialogs] +section::Dialogs[dialogs] |:addo| |:addons| + ||:addo[ns]|| @@ -68,7 +68,7 @@ Show progress of current downloads. Open the original Songbird download dialog in a new tab. Here, downloads can be paused, canceled and resumed. ________________________________________________________________________________ -section:Add-ons[extensions,add-ons] +section::Add-ons[extensions,add-ons] |:exta| |:extadd| + ||:exta[dd] {file}|| @@ -119,7 +119,7 @@ Open the preferences dialog for an extension. If [!] is given, open a dialog, otherwise open a buffer. See also 'newtab'. ________________________________________________________________________________ -section:Sidebar[sidebar] +section::Sidebar[sidebar] |:dpcl| |:dpclose| + ||:dpcl[ose] {pane}|| @@ -135,7 +135,7 @@ Open the specified display pane. {pane} is any of "service pane left", "service pane bottom", "content pane bottom" or "right sidebar". ________________________________________________________________________________ -section:Toolbars[toolbar] +section::Toolbars[toolbar] |:tbs| |:tbshow| |:toolbars| |:toolbarshow| + ||:toolbarshow {name}|| diff --git a/xulmus/locale/en-US/hints.txt b/xulmus/locale/en-US/hints.txt index 325b4e24..2c3cf8bd 100644 --- a/xulmus/locale/en-US/hints.txt +++ b/xulmus/locale/en-US/hints.txt @@ -1,4 +1,4 @@ -heading:Hints[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/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt index 4b7445fe..fc3c2208 100644 --- a/xulmus/locale/en-US/index.txt +++ b/xulmus/locale/en-US/index.txt @@ -1,9 +1,9 @@ -heading:Index[index] +heading::Index[index] This file contains a list of all available commands, mappings and options. HEADER -section:Player{nbsp}mode[player-index] +section::Player{nbsp}mode[player-index] ||[m]x[m]|| Play the current track + ||[m]z[m]|| Play the previous track + @@ -38,12 +38,12 @@ section:Player{nbsp}mode[player-index] ||<C-4>|| Rate the current track with 4 stars + ||<C-5>|| Rate the current track with 5 stars + -section:Insert{nbsp}mode[insert-index] +section::Insert{nbsp}mode[insert-index] ||[m]<C-i>[m]|| Launch the external editor + ||[m]<C-]>[m]|| Expand an Insert-mode abbreviation + -section:Normal{nbsp}mode[normal-index] +section::Normal{nbsp}mode[normal-index] ||[m]<C-^>[m]|| Select the alternate tab or the [count]th tab + ||[m]<C-a>[m]|| Increment last number in URL + @@ -166,7 +166,7 @@ section:Normal{nbsp}mode[normal-index] ||[m]zr[m]|| Reduce text zoom of current web page by a larger amount + ||[m]zz[m]|| Set text zoom value of current web page + -section:Command-line{nbsp}editing[ex-edit-index] +section::Command-line{nbsp}editing[ex-edit-index] ||[m]<C-c>[m]|| Quit Command-line mode without executing + @@ -178,7 +178,7 @@ section:Command-line{nbsp}editing[ex-edit-index] ||[m]<Tab>[m]|| Complete the word in front of the cursor according to the behavior specified in 'wildmode' + ||[m]<S-Tab>[m]|| Complete the previous full match when 'wildmode' contains "full" + -section:Ex{nbsp}commands[ex-cmd-index,:index] +section::Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:![c]|| Run a command + ||[c]:abbreviate[c]|| Abbreviate a key sequence + @@ -322,7 +322,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:wqall[c]|| Save the session and quit + ||[c]:zoom[c]|| Set zoom value of current web page + -section:Options[option-index] +section::Options[option-index] ||'activate'|| Define when tabs are automatically activated + ||'cdpath'|| List of directories searched when executing [c]:cd[c] + diff --git a/xulmus/locale/en-US/insert.txt b/xulmus/locale/en-US/insert.txt index d5920d7c..6c7e3d6c 100644 --- a/xulmus/locale/en-US/insert.txt +++ b/xulmus/locale/en-US/insert.txt @@ -1,4 +1,4 @@ -heading:Insert{nbsp}mode[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 @@ -11,7 +11,7 @@ Starts Insert mode in text areas when 'insertmode' is not set. ________________________________________________________________________________ -section:Insert-mode{nbsp}special{nbsp}keys[ins-special-keys] +section::Insert-mode{nbsp}special{nbsp}keys[ins-special-keys] |i_<C-i>| + ||<C-i>|| diff --git a/xulmus/locale/en-US/intro.txt b/xulmus/locale/en-US/intro.txt index 3ad3807b..729dea72 100644 --- a/xulmus/locale/en-US/intro.txt +++ b/xulmus/locale/en-US/intro.txt @@ -1,6 +1,6 @@ LOGO -section:Introduction[intro] +section::Introduction[intro] http://vimperator.org/Xulmus[Xulmus] is a free media player add-on for Songbird, which combines the best features of the @@ -35,7 +35,7 @@ Of course as a believer in free open source software, only make a donation if you really like Xulmus and the money doesn't hurt -- otherwise just use it, recommend it and like it :) -section:Help{nbsp}topics[overview] +section::Help{nbsp}topics[overview] //- help:Tutorial[tutorial.html]: A quick-start tutorial for new users. - help:Starting{nbsp}Xulmus[starting.html]: How Xulmus starts up, where it @@ -76,7 +76,7 @@ section:Help{nbsp}topics[overview] You can also jump directly to the help of a specific command with [c]:help o[c] or [c]:help :set[c]. -section:Features[features] +section::Features[features] // TODO: make Xulmus specific * Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m], [m]gg[m], [m]G[m], @@ -101,7 +101,7 @@ section:Features[features] * Marks support ([m]m[m][a]a[a] to set mark a on a web page, [m]'[m][a]a[a] to go there) * QuickMarks support (quickly go to previously marked web pages with - [m]go[m][a]\\{a-zA-Z0-9\\}[a]) + [m]go[m][a]{a-zA-Z0-9}[a]) * [c]:map[c] and [c]:command[c] support (and feedkeys() for script writers) * [c]:time[c] support for profiling * Move the text cursor and select text with Vim keys and a Visual mode @@ -110,7 +110,7 @@ section:Features[features] * AutoCommands to execute actions on certain events * A comprehensive help system, explaining all commands, mappings and options -section:Contact[contact] +section::Contact[contact] Please send comments/bug reports/patches to the mailing list, where we will properly answer any questions. You can also join the diff --git a/xulmus/locale/en-US/map.txt b/xulmus/locale/en-US/map.txt index f6e272be..05caec2c 100644 --- a/xulmus/locale/en-US/map.txt +++ b/xulmus/locale/en-US/map.txt @@ -1,6 +1,6 @@ -heading:Key{nbsp}mappings,{nbsp}abbreviations,{nbsp}and{nbsp}user-defined{nbsp}commands[] +heading::Key{nbsp}mappings,{nbsp}abbreviations,{nbsp}and{nbsp}user-defined{nbsp}commands[] -section:Key{nbsp}mapping[key-mapping,mapping,map,macro] +section::Key{nbsp}mapping[key-mapping,mapping,map,macro] The key mapping commands can be used to either redefine the standard key bindings or define new ones. A mapping consists of a key, or [j]key-sequence[j], @@ -21,7 +21,7 @@ Keys can be mapped in four distinct modes: Warning: Mappings are NOT saved between sessions, make sure you put them in your xulmusrc file! -subsection:Map{nbsp}commands[:map-commands] +subsection::Map{nbsp}commands[:map-commands] |:map| ||:map {lhs} {rhs}|| + @@ -115,7 +115,7 @@ List all mappings starting with {lhs} for the applicable mode(s). ________________________________________________________________________________ -subsection:Special{nbsp}arguments{nbsp}[:map-arguments] +subsection::Special{nbsp}arguments{nbsp}[:map-arguments] |:map-<silent>| + @@ -134,13 +134,13 @@ Below is an overview of which modes each map command applies to: :imap :inoremap :iunmap :imapclear - Insert mode :cmap :cnoremap :cunmap :cmapclear - Command-line mode -subsection:Key{nbsp}sequences[:<>,key-sequence] +subsection::Key{nbsp}sequences[:<>,key-sequence] 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 number of keys to be used in mappings. - * *<lt>*, *\<*, *<Space>*, *\ * allow a literal *<* or space character. + * *<lt>*, *\<*, *<Space>*, *$$\ $$* allow a literal *<* or space character. * *\'*, *\"* and *\\* must be used to avoid escaping issues when mapping a quote or backslash. * *<Left>* *<Right>* *<Up>* *<Down>* *<PageUp>* *<PageDown>* *<Esc>* *<CR>* (for carriage return/enter) * *<CapsLock>* *<NumLock>* *<Ins>* *<Del>* *<Tab>* *<BS>* (for a backspace) @@ -173,7 +173,7 @@ the situation: * *<C-A-J>*: exactly the same as above * *<C-A-S-j>*: press J while holding control and alt -subsection:Special{nbsp}characters[:map-special-chars] +subsection::Special{nbsp}characters[:map-special-chars] |<Nop>| + ||<Nop>|| @@ -206,7 +206,7 @@ it works like + \{nbsp}[c]:map ,h :echo "Hello"<CR>[c] ________________________________________________________________________________ -section:Abbreviations[abbreviations] +section::Abbreviations[abbreviations] Xulmus can automatically replace words identified as abbreviations, which may be used to save typing or to correct commonly misspelled @@ -303,7 +303,7 @@ ________________________________________________________________________________ Remove all abbreviations for Insert mode. ________________________________________________________________________________ -section:User-defined{nbsp}commands[user-commands] +section::User-defined{nbsp}commands[user-commands] |:com| |:command| ||:com[mand]|| + @@ -444,7 +444,7 @@ ________________________________________________________________________________ Delete the user-defined command {cmd}. ________________________________________________________________________________ -section:Examples[command-examples] +section::Examples[command-examples] Add a :Google command to search via google: diff --git a/xulmus/locale/en-US/marks.txt b/xulmus/locale/en-US/marks.txt index 4411a121..9e150fe8 100644 --- a/xulmus/locale/en-US/marks.txt +++ b/xulmus/locale/en-US/marks.txt @@ -1,4 +1,4 @@ -heading:Marks[different-marks,marks] +heading::Marks[different-marks,marks] Xulmus supports a number of different marks: @@ -10,7 +10,7 @@ Xulmus supports a number of different marks: - History is also a special type of marks, as Xulmus automatically remembers sites which you have visited in the past. -section:Bookmarks[bookmarks] +section::Bookmarks[bookmarks] |a| |:bma| |:bmark| ||:bma[rk][!] [a][-title=title][a] [a][-keyword=kw][a] [a][-tags=tag1,tag2][a] [a][url][a]|| + @@ -72,7 +72,7 @@ The following options WILL be interpreted in the future: * [!] a special version to delete ALL bookmarks ________________________________________________________________________________ -section:History[history] +section::History[history] |<C-o>| + ||[count]<C-o>|| @@ -135,21 +135,21 @@ Filter can also contain the following options: + -max=N (short options: -m) ________________________________________________________________________________ -section:QuickMarks[quickmarks] +section::QuickMarks[quickmarks] |go| + -||go[a]\\{a-zA-Z0-9\\}[a]|| +||go[a]{a-zA-Z0-9}[a]|| ________________________________________________________________________________ Jump to a QuickMark in the current tab. Open any QuickMark in the current tab. -You can mark any URLs with [m]M[m][a]\\{a-zA-Z0-9\\}[a]. These QuickMarks are +You can mark any URLs with [m]M[m][a]{a-zA-Z0-9}[a]. These QuickMarks are persistent across browser sessions. ________________________________________________________________________________ |gn| + -||gn[a]\\{a-zA-Z0-9\\}[a]|| +||gn[a]{a-zA-Z0-9}[a]|| ________________________________________________________________________________ -Jump to a QuickMark in a new tab. Works like [m]go[m][a]\\{a-zA-Z0-9\\}[a] but +Jump to a QuickMark in a new tab. Works like [m]go[m][a]{a-zA-Z0-9}[a] but opens the QuickMark in a new tab. Whether the new tab is activated or not depends on the 'activate' option. + Mnemonic: Go in a new tab. [m]gt[m] would make more sense but is already @@ -158,11 +158,11 @@ ________________________________________________________________________________ |M| + -||M[a]\\{a-zA-Z0-9\\}[a]|| +||M[a]{a-zA-Z0-9}[a]|| ________________________________________________________________________________ Add new QuickMark for current URL. You can go to a marked URL in the current -tab with [m]go[m][a]\\{a-zA-Z0-9\\}[a] or in a new tab with -[m]gn[m][a]\\{a-zA-Z0-9\\}[a]. These QuickMarks are persistent across browser +tab with [m]go[m][a]{a-zA-Z0-9}[a] or in a new tab with +[m]gn[m][a]{a-zA-Z0-9}[a]. These QuickMarks are persistent across browser sessions. ________________________________________________________________________________ @@ -185,8 +185,9 @@ ________________________________________________________________________________ |:qma| |:qmark| ||:qma[rk] {a-zA-Z0-9} [a][url][a]|| + ________________________________________________________________________________ -Mark a URL with a letter for quick access. You can also mark whole groups like this: + -[c]:qmark f +++http://forum1.com+++, +++http://forum2.com+++, imdb some artist[c] +Mark a URL with a letter for quick access. You can also mark whole groups +like this: + + [c]:qmark f +++http://forum1.com+++, +++http://forum2.com+++, imdb some artist[c] ________________________________________________________________________________ @@ -197,18 +198,18 @@ Show all QuickMarks. If [a][arg][a] is specified then limit the list to those QuickMarks mentioned. ________________________________________________________________________________ -section:Local{nbsp}marks[localmarks] +section::Local{nbsp}marks[localmarks] |m| + -||m[a]\\{a-zA-Z\\}[a]|| +||m[a]{a-zA-Z}[a]|| ________________________________________________________________________________ Set mark at the cursor position. Marks a-z are local to the buffer, whereas A-Z are valid between buffers. ________________________________________________________________________________ -|\`| |\'| + -||\'[a]\\{a-zA-Z\\}[a]|| +|$$`$$| |$$'$$| + +||'[a]{a-zA-Z}[a]|| ________________________________________________________________________________ Jump to the mark in the current buffer. Marks a-z are local to the buffer, whereas A-Z are valid between buffers. diff --git a/xulmus/locale/en-US/message.txt b/xulmus/locale/en-US/message.txt index 34fb8be5..07f7fb77 100644 --- a/xulmus/locale/en-US/message.txt +++ b/xulmus/locale/en-US/message.txt @@ -1,4 +1,4 @@ -heading:Error{nbsp}and{nbsp}informational{nbsp}messages[messages] +heading::Error{nbsp}and{nbsp}informational{nbsp}messages[messages] |message-history| + diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt index 79566f6f..38d99bc8 100644 --- a/xulmus/locale/en-US/options.txt +++ b/xulmus/locale/en-US/options.txt @@ -1,4 +1,4 @@ -heading:Options[options] +heading::Options[options] Xulmus has a number of internal variables and switches which can be set to achieve special effects. These options come in 5 forms: @@ -10,7 +10,7 @@ achieve special effects. These options come in 5 forms: *stringlist* a comma-separated list of strings ------------------------------------------------------- -section:Setting{nbsp}options[set-option,E764] +section::Setting{nbsp}options[set-option,E764] |:set| |:se| + ||:se[t]|| @@ -153,7 +153,7 @@ Environment variables are expanded for path options like 'cdpath' and 'runtimepath'. The variable notation is _$VAR_ (terminated by a non-word character) or _$\\{VAR}_. _%VAR%_ is also supported on Windows. -section:Setting{nbsp}Songbird{nbsp}options[songbird-options,preferences] +section::Setting{nbsp}Songbird{nbsp}options[songbird-options,preferences] Songbird options can be viewed and set with the following commands: @@ -193,7 +193,7 @@ The following preferences are set: // TODO: others? -section:List{nbsp}of{nbsp}options[list-options] +section::List{nbsp}of{nbsp}options[list-options] |\'act'| |\'activate'| ||'activate' 'act'|| stringlist (default: "homepage,quickmark,tabopen,paste") @@ -637,16 +637,16 @@ ____ |\'rtp'| |\'runtimepath'| ||'runtimepath' 'rtp'|| stringlist ____ -(default: _$XULMUS_RUNTIME_ or Unix, Mac: "\~/.xulmus", Windows: "\~/xulmus") +(default: _$XULMUS_RUNTIME_ or $$Unix, Mac: "~/.xulmus", Windows: "~/xulmus"$$) List of directories searched for runtime files: + colors/ + macros/ + plugin/ + -Example: [c]:set runtimepath=\~/myxulmus,\~/.xulmus[c] + -This will search for plugins in both "\~/myxulmus/plugin" and -"\~/.xulmus/plugin" +Example: [c]:set runtimepath=$$~/myxulmus,~/.xulmus$$[c] + +This will search for plugins in both $$"~/myxulmus/plugin" and +"~/.xulmus/plugin"$$ On startup, if the environment variable _$XULMUS_RUNTIME_ does not exist, Xulmus will set it to match this value. @@ -792,8 +792,8 @@ ____ Use visual bell instead of beeping on errors. The visual bell style is controlled by [c]:hi Bell[c]. -To disable both the audible and visual bells use [c]:set visualbell[c] and -[c]:hi Bell display: none;[c] +To disable both the audible and visual bells use [c]:set visualbell[c] +and [c]:hi Bell display: none;[c] ____ diff --git a/xulmus/locale/en-US/pattern.txt b/xulmus/locale/en-US/pattern.txt index 8f7ba4c3..91b82452 100644 --- a/xulmus/locale/en-US/pattern.txt +++ b/xulmus/locale/en-US/pattern.txt @@ -1,4 +1,4 @@ -heading:Text{nbsp}search{nbsp}commands[text-search-commands] +heading::Text{nbsp}search{nbsp}commands[text-search-commands] Xulmus provides a Vim-like interface to Songbird's standard text search functionality. There is no support for using regular expressions in search @@ -44,15 +44,15 @@ opposite direction. ________________________________________________________________________________ -|\*| + -||\*|| +|$$*$$| + +||$$*$$|| ________________________________________________________________________________ Search forward for the next word under the cursor. ________________________________________________________________________________ -|\#| + -||\#|| +|$$#$$| + +||$$#$$|| ________________________________________________________________________________ Search backward for the previous word under the cursor. ________________________________________________________________________________ diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt index fafd08bf..474e9d13 100644 --- a/xulmus/locale/en-US/player.txt +++ b/xulmus/locale/en-US/player.txt @@ -1,9 +1,9 @@ -heading:Player{nbsp}mode[player-mode,player] +heading::Player{nbsp}mode[player-mode,player] The following features apply to Player mode which is activated when the media tab has focus. -section:Playing{nbsp}tracks[playing-tracks] +section::Playing{nbsp}tracks[playing-tracks] |p_x| |:playerp| |:playerplay| ||:playerp[lay]|| + @@ -64,7 +64,7 @@ ________________________________________________________________________________ Select the currently playing track. ________________________________________________________________________________ -section:Queueing{nbsp}tracks[queue,queueing] +section::Queueing{nbsp}tracks[queue,queueing] |p_f| |:f| |:filter| ||:f[ilter] {artist} [a][album][a] [a][track][a]|| + @@ -77,7 +77,7 @@ specified with [a][track][a]. ________________________________________________________________________________ -section:Filtering{nbsp}the{nbsp}library[filter,filtering] +section::Filtering{nbsp}the{nbsp}library[filter,filtering] |p_F| |:F| |:Filter| ||:F[ilter] {keywords}|| + @@ -88,7 +88,7 @@ provided as arguments. This text search applies over the default filter properties, namely: Genre, Artist, Album and Track. ________________________________________________________________________________ -section:Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking] +section::Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking] |p_<Left>| |p_h| ||[count]h|| @@ -130,7 +130,7 @@ seconds is assumed. The position is absolute unless the value is prefixed with Positions may also be specified in [a][HH:]MM:SS[a] format. ________________________________________________________________________________ -section:Adjusting{nbsp}the{nbsp}volume[volume] +section::Adjusting{nbsp}the{nbsp}volume[volume] |p_+| |p_=| ||+|| + @@ -155,7 +155,7 @@ Set the player volume. {value} can be an absolute value between 0 and 100% or a relative value if prefixed with "-" or "+". ________________________________________________________________________________ -section:Managing{nbsp}playlists[playlists] +section::Managing{nbsp}playlists[playlists] |:load| ||:load [a][playlist][a]|| + @@ -164,7 +164,7 @@ Load [a][playlist][a]. If no playlist is specified then the main library view is loaded. ________________________________________________________________________________ -section:Changing{nbsp}media{nbsp}views[media-view,view] +section::Changing{nbsp}media{nbsp}views[media-view,view] |:mediav| |:mediaview| ||:mediav[iew] {view}|| + @@ -173,7 +173,7 @@ Change the media view to {view}. This can only be run when the media tab is the current tab. ________________________________________________________________________________ -section:Search{nbsp}commands[search] +section::Search{nbsp}commands[search] |p_/| ||/{pattern}<CR>|| + @@ -201,7 +201,7 @@ Find the previous track. Repeats the last search in the opposite direction. If the search hits TOP of the view, it continues from BOTTTOM. ________________________________________________________________________________ -section:Rating{nbsp}tracks[rating] +section::Rating{nbsp}tracks[rating] |p_<C-5>| |p_<C-4>| |p_<C-3>| |p_<C-2>| |p_<C-1>| |p_<C-0>| ||<C-0>|| + diff --git a/xulmus/locale/en-US/print.txt b/xulmus/locale/en-US/print.txt index bb3decbf..506c59f6 100644 --- a/xulmus/locale/en-US/print.txt +++ b/xulmus/locale/en-US/print.txt @@ -1,4 +1,4 @@ -heading:Printing[printing] +heading::Printing[printing] |:ha| |:hardcopy| + ||:ha[rdcopy][!]|| @@ -16,7 +16,7 @@ As above, but write the output to {filename}. Note: Not available on Windows. ________________________________________________________________________________ -section:Songbird{nbsp}printing{nbsp}dialogs[songbird-print-dialogs] +section::Songbird{nbsp}printing{nbsp}dialogs[songbird-print-dialogs] The "Print Preview" and "Page Setup" dialogs can be opened via the [c]:dialog[c] command diff --git a/xulmus/locale/en-US/repeat.txt b/xulmus/locale/en-US/repeat.txt index 2479088b..f011f598 100644 --- a/xulmus/locale/en-US/repeat.txt +++ b/xulmus/locale/en-US/repeat.txt @@ -1,8 +1,8 @@ -heading:Repeating{nbsp}commands[repeating] +heading::Repeating{nbsp}commands[repeating] Xulmus can repeat a number of commands and record macros. -section:Single{nbsp}repeats[single-repeat] +section::Single{nbsp}repeats[single-repeat] |.| ||[count].|| @@ -19,7 +19,7 @@ ____________________________________________________________________________ Repeat the last Ex command [count] times. ____________________________________________________________________________ -section:Macros[macros,complex-repeat] +section::Macros[macros,complex-repeat] |q| ||q\\{0-9a-zA-Z}|| + @@ -63,7 +63,7 @@ Replay the last executed macro [count] times. ____________________________________________________________________________ -section:Using{nbsp}scripts[using-scripts] +section::Using{nbsp}scripts[using-scripts] |:so| |:source| ||:so[urce][!] {file}|| + @@ -92,7 +92,7 @@ function hello2() { are only available within the scope of the script. The _.xulmusrc_ file in your home directory and any files in -_\~/.xulmus/plugin/_ are always sourced at startup. \~ is supported as a +_$$~/.xulmus/plugin/$$_ are always sourced at startup. $$~$$ is supported as a shortcut for the _$HOME_ directory. If [!] is specified, errors are not printed. ________________________________________________________________________________ @@ -133,7 +133,7 @@ Stop sourcing a script file. This can only be called from within a Xulmus script file. ________________________________________________________________________________ -section:Profiling[profile,profiling] +section::Profiling[profile,profiling] |:time| ||:[count]time[!] {code|:command}|| + diff --git a/xulmus/locale/en-US/starting.txt b/xulmus/locale/en-US/starting.txt index ba655d70..000b40e0 100644 --- a/xulmus/locale/en-US/starting.txt +++ b/xulmus/locale/en-US/starting.txt @@ -1,10 +1,10 @@ -heading:Starting{nbsp}Xulmus[starting] +heading::Starting{nbsp}Xulmus[starting] |startup-options| + Command-line options can be passed to Xulmus via the -liberator Firefox option. These are passed as single string argument. -E.g firefox -liberator "\++cmd=\'set exrc' +u=\'tempRcFile' \++noplugin" +E.g firefox -liberator "$$++cmd='set exrc' +u='tempRcFile' ++noplugin$$" |+c| + ||+c={command}|| @@ -14,8 +14,8 @@ Execute a single Ex command after all initialization has been performed. See ________________________________________________________________________________ -|\++cmd| + -||\++cmd={command}|| +|$$++cmd$$| + +||$$++cmd={command}$$|| ________________________________________________________________________________ Execute a single Ex command before any initialization has been performed. See [j]initialization[j]. @@ -32,13 +32,13 @@ is "NONE" then plugin loading is also skipped. ________________________________________________________________________________ -|\++noplugin| + -||\++noplugin|| +|$$++noplugin$$| + +||$$++noplugin$$|| ________________________________________________________________________________ Prevents plugin scripts from being loaded at startup. See 'loadplugins'. ________________________________________________________________________________ -section:Initialization[initialization,startup] +section::Initialization[initialization,startup] At startup, Xulmus completes the following tasks in order. @@ -49,9 +49,9 @@ further locations are tried. a. |$XULMUS_INIT| _$XULMUS_INIT_ -- May contain a single Ex command (e.g., "[c]:source {file}[c]"). - b. [a]\~/_xulmusrc[a] -- Windows only. If this file exists, its contents + b. _$$~/_xulmusrc$$_ -- Windows only. If this file exists, its contents are executed and _$MY_XULMUSRC_ set to its path. - c. [a]\~/.xulmusrc[a] -- If this file exists, its contents are executed. + c. _$$~/.xulmusrc$$_ -- If this file exists, its contents are executed. 2. If 'exrc' is set and the +u command-line option was not specified, then any RC file in the current directory is also sourced. @@ -63,7 +63,7 @@ subdirectories) are sourced alphabetically. No plugins will be sourced if: * 'noloadplugins' is set. - * the \++noplugin command-line option was specified. + * the $$++noplugin$$ command-line option was specified. * the +u=NONE command-line option specified set. Any particular plugin will not be loaded if it has already been loaded (e.g., @@ -76,7 +76,7 @@ The user's ~ (i.e., "home") directory is determined as follows: _%USERPROFILE%_, and then _%HOMEDRIVE%%HOMEPATH%_. It uses the first one it finds. -section:Saving{nbsp}settings[save-settings] +section::Saving{nbsp}settings[save-settings] |:mkx| |:mkxulmusrc| ||:mkx[ulmusrc][!] [a][file][a]|| + @@ -90,7 +90,7 @@ Warning: this differs from Vim's behavior which defaults to writing the file in the current directory. ________________________________________________________________________________ -section:Restarting[restarting] +section::Restarting[restarting] |:res| |:restart| + ||:res[tart]|| diff --git a/xulmus/locale/en-US/styling.txt b/xulmus/locale/en-US/styling.txt index 2cc31444..73cf8ad1 100644 --- a/xulmus/locale/en-US/styling.txt +++ b/xulmus/locale/en-US/styling.txt @@ -1,4 +1,4 @@ -heading:Styling{nbsp}the{nbsp}GUI{nbsp}and{nbsp}web{nbsp}pages[styling] +heading::Styling{nbsp}the{nbsp}GUI{nbsp}and{nbsp}web{nbsp}pages[styling] Xulmus allows you to style both the player and any web pages you view. All styling is specified via CSS. Although you may style any user interface element @@ -102,7 +102,7 @@ ________________________________________________________________________________ ||:sty[le][!] [-name={name}] [-append] {filter} [{css}]|| + ________________________________________________________________________________ Add CSS styles to the player or to web pages. {filter} is a comma -separated list of URLs to match. URLs ending with *\** are matched as +separated list of URLs to match. URLs ending with *** are matched as prefixes, URLs not containing any *:* or */* characters are matched as domains. If {name} (short option: *-n*) is provided, any existing style with the same name is overridden, and the style may later diff --git a/xulmus/locale/en-US/tabs.txt b/xulmus/locale/en-US/tabs.txt index 8a9ea985..6d178f4c 100644 --- a/xulmus/locale/en-US/tabs.txt +++ b/xulmus/locale/en-US/tabs.txt @@ -1,10 +1,10 @@ -heading:Tabs[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 result many buffer and tab commands are interchangeable. -section:Listing{nbsp}tabs[listing-tabs] +section::Listing{nbsp}tabs[listing-tabs] |B| |:tabs| |:ls| |:files| |:buffers| ||:buffers [a][filter][a]|| + @@ -14,7 +14,7 @@ Show a list of buffers (=tabs) matching [a][filter][a]. Without [a][filter][a] list all tabs. ________________________________________________________________________________ -section:Opening{nbsp}tabs[opening-tabs] +section::Opening{nbsp}tabs[opening-tabs] |:tab| + ||:tab {cmd}|| @@ -39,7 +39,7 @@ ________________________________________________________________________________ //TODO: should the tab commands be moved back here? See [j]opening[j] for other ways to open new tabs. -section:Changing{nbsp}tabs[changing-tabs] +section::Changing{nbsp}tabs[changing-tabs] |gb| + ||[count]gb|| @@ -99,7 +99,7 @@ buffer, it is selected. With [!] the next buffer matching the argument is selected, even if it cannot be identified uniquely. Use [m]b[m] as a shortcut to open this prompt. -If argument is [a]\#[a], the alternate buffer will be selected (see [m]<C-^>[m]). +If argument is [a]#[a], the alternate buffer will be selected (see [m]<C-^>[m]). If no argument is given the current buffer remains current. ________________________________________________________________________________ @@ -132,7 +132,7 @@ ________________________________________________________________________________ Detach the current tab, and open it in its own window. ________________________________________________________________________________ -section:Reordering{nbsp}tabs[reordering-tabs] +section::Reordering{nbsp}tabs[reordering-tabs] |:tabm| |:tabmove| ||:tabm[ove] [a][N][a]|| + @@ -174,7 +174,7 @@ Switch to the previous tab or go [count] tabs back. Wraps around from the first tab to the last tab. ________________________________________________________________________________ -section:Closing{nbsp}tabs[closing-tabs] +section::Closing{nbsp}tabs[closing-tabs] |d| |:tabc| |:tabclose| |:bun| |:bunload| |:bw| |:bwipeout| |:bd| |:bdelete| ||:[count]bd[elete][!] [a][arg][a]|| + @@ -213,7 +213,7 @@ ________________________________________________________________________________ //after a browser restart. //________________________________________________________________________________ -section:Looping{nbsp}over{nbsp}tabs[looping-over-tabs] +section::Looping{nbsp}over{nbsp}tabs[looping-over-tabs] |:tabd| |:tabdo| |:bufd| |:bufdo| + ||:tabd[o] {cmd}|| diff --git a/xulmus/locale/en-US/tutorial.txt b/xulmus/locale/en-US/tutorial.txt index d9e4dae7..257a5ab4 100644 --- a/xulmus/locale/en-US/tutorial.txt +++ b/xulmus/locale/en-US/tutorial.txt @@ -1,6 +1,6 @@ // Initial revision: Sun Jun 8 10:07:05 UTC 2008 (penryu) -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 @@ -23,7 +23,7 @@ Vimperator is to leave these disabled for now. (The above action can be reversed with [c]:set go=<CR>[c]) You can look at the entry for 'guioptions' in help:options[options.html] for more information on this. -section:Vimperator's{nbsp}modal{nbsp}interface[modal] +section::Vimperator's{nbsp}modal{nbsp}interface[modal] Vimperator's power, like Vim's, comes from it's modal interface. Keys have different meanings depending on which mode the browser is in. Vimperator has @@ -41,7 +41,7 @@ To return to Normal mode from Command-line mode, type [m]<Esc>[m]. Pressing [m]<Esc>[m] will also return you to Normal mode from most other modes in Vimperator. -section:Getting{nbsp}help[getting-help] +section::Getting{nbsp}help[getting-help] Vim is a great editor but it's not much of a web browser. So even seasoned Vim users will probably have to look at Vimperator documentation sooner or later. @@ -63,7 +63,7 @@ And you can find out about the [m]gt[m] and [m]gT[m] mapping with Finally, in addition to the help system itself, [c]:exusage[c], [c]:viusage[c] and [c]:optionusage[c] are useful quick-reference commands. -section:Mouseless[living-mouseless] +section::Mouseless[living-mouseless] *-- or how I learned to stop worrying and love the 80+ buttons I already have.* @@ -76,7 +76,7 @@ assumption that a web browser doesn't have to be one of those. Here are some areas where the mouse is typically considered indisposable, and how Vimperator challenges this preconception. -section:Scrolling[keyboard-scrolling] +section::Scrolling[keyboard-scrolling] Scrolling the browser window is done with simple keystrokes: @@ -92,7 +92,7 @@ Scrolling the browser window is done with simple keystrokes: Your standard buttons ([m]<Up>[m]/[m]<Down>[m]/[m]<PgUp>[m]/[m]<PgDn>[m]) will also work as expected. -section:History{nbsp}and{nbsp}tabs[history-navigation,tab-navigation] +section::History{nbsp}and{nbsp}tabs[history-navigation,tab-navigation] History navigation (e.g., ``Back'', ``Forward'') are done similarly to scrolling. @@ -123,7 +123,7 @@ equivalent: \{nbsp}[c]:tabopen vimperator.org<CR>[c] + \{nbsp}[m]tvimperator.org<CR>[m] -section:Some{nbsp}hints{nbsp}about{nbsp}surfing...[hints-tutorial] +section::Some{nbsp}hints{nbsp}about{nbsp}surfing...[hints-tutorial] So now you can navigate around in Vimperator. But wait... how do you *open* a page or tab linked in a web page? How do you ``click'' on all those links @@ -154,7 +154,7 @@ uniquely identified soon, and Vimperator will open it. Once you're done, remember to use [m]<C-o>[m] (``History Back'') or [m]d[m] (``Delete Buffer'') to return here, depending on which key you used to activate QuickHint mode. -section:Common{nbsp}issues[common-issues] +section::Common{nbsp}issues[common-issues] Say you get half-way done typing in a new URL, only to remember that you've already got that page open in the previous tab. Your command line might look @@ -167,7 +167,7 @@ following: \{nbsp}[m]<Esc>gT[m] -section:Saving{nbsp}for{nbsp}posterity{nbsp}-{nbsp}vimperatorrc[vimperatorrc] +section::Saving{nbsp}for{nbsp}posterity{nbsp}-{nbsp}vimperatorrc[vimperatorrc] Once you get Vimperator set up with your desired options, maps, and commands, you'll probably want them to be available the next time you open Vimperator. @@ -180,7 +180,7 @@ This will create the file *_$HOME_/.vimperatorrc* containing your settings. It is a simple text file, just like a vimrc file and can be easily edited to suit your preferences. -section:Find{nbsp}the{nbsp}exit{nbsp}nearest{nbsp}you[quitting-without-menus] +section::Find{nbsp}the{nbsp}exit{nbsp}nearest{nbsp}you[quitting-without-menus] Vimperator supports all of Vim's classic methods of exiting. @@ -190,7 +190,7 @@ Vimperator supports all of Vim's classic methods of exiting. * [m]ZZ[m] -- Normal mode mapping equivalent to [c]:xall[c] * [m]ZQ[m] -- Normal mode mapping equivalent to [c]:qall[c] -section:Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither-firefox] +section::Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither-firefox] You might feel pretty disoriented now. Don't worry. This is still Firefox underneath. Here are some ways Vimperator allows Firefox to shine through. See @@ -221,7 +221,7 @@ If you get hopelessly lost, just type [c]:help<CR>[c] and click the // TODO: other sections? -section:Get{nbsp}me{nbsp}out{nbsp}of{nbsp}here![removal] +section::Get{nbsp}me{nbsp}out{nbsp}of{nbsp}here![removal] If you've given it a fair shot and determined ... TODO @@ -234,7 +234,7 @@ Alternatively, you can do this the old-fashioned way: re-enable the menubar, as above, with [c]:set go+=m[c], and select *Add-ons* from the *Tools* menu. -section:I'm{nbsp}interested...but{nbsp}lost![support] +section::I'm{nbsp}interested...but{nbsp}lost![support] Vimperator has an energetic and growing user base. If you've run into a problem that you can't seem to solve with Vimperator, or if you think you might have diff --git a/xulmus/locale/en-US/various.txt b/xulmus/locale/en-US/various.txt index d6ac5edc..15d1f61b 100644 --- a/xulmus/locale/en-US/various.txt +++ b/xulmus/locale/en-US/various.txt @@ -1,6 +1,6 @@ -heading:Other{nbsp}help[] +heading::Other{nbsp}help[] -section:Various{nbsp}commands[various] +section::Various{nbsp}commands[various] |:beep| + ||:beep|| @@ -35,7 +35,7 @@ backslash before the \'!', then the backslash is removed. Warning: Input redirection (< foo) not done, also do not run commands which require stdin or it will hang Songbird! It is possible to launch background -processes, though (e.g. ':! xterm &'). +processes, though (e.g. [c]:! xterm &[c]). ________________________________________________________________________________ @@ -55,7 +55,7 @@ Show version information. You can show the Songbird version page with [c]:version![c]. ________________________________________________________________________________ -section:Online{nbsp}help[online-help] +section::Online{nbsp}help[online-help] |<F1>| |:help| |:h| |help| ||:h[elp] [a][subject][a]|| + @@ -108,7 +108,7 @@ now dead, unfortunately. So now you might wonder what the meaning of death is... -section:Uncategorized{nbsp}help[uncategorized] +section::Uncategorized{nbsp}help[uncategorized] |<C-[>| |<Esc>| + ||<Esc>|| |