From ec4982d50b666a00cb8c8f2b9f2fc25a01e23e48 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Tue, 4 Aug 2009 17:43:04 +1000 Subject: [PATCH] Add a :helpall command. This effectively divides the help into chunked and unchunked subsystems for clarity. --- common/content/liberator.js | 71 +++++++++++++------- muttator/contrib/vim/syntax/muttator.vim | 6 +- muttator/locale/en-US/intro.txt | 2 +- vimperator/NEWS | 2 +- vimperator/content/config.js | 2 +- vimperator/contrib/vim/syntax/vimperator.vim | 22 +++--- vimperator/locale/en-US/asciidoc.conf | 2 +- vimperator/locale/en-US/developer.txt | 6 +- vimperator/locale/en-US/eval.txt | 2 +- vimperator/locale/en-US/index.txt | 3 +- vimperator/locale/en-US/options.txt | 2 +- vimperator/locale/en-US/starting.txt | 5 +- vimperator/locale/en-US/various.txt | 13 +++- xulmus/contrib/vim/syntax/xulmus.vim | 26 +++---- xulmus/locale/en-US/asciidoc.conf | 2 +- xulmus/locale/en-US/eval.txt | 2 +- xulmus/locale/en-US/index.txt | 3 +- xulmus/locale/en-US/starting.txt | 5 +- xulmus/locale/en-US/various.txt | 13 +++- 19 files changed, 111 insertions(+), 78 deletions(-) diff --git a/common/content/liberator.js b/common/content/liberator.js index 93fa6a65..d496e474 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -302,7 +302,7 @@ const liberator = (function () //{{{ registerObserver("load_mappings", function () { mappings.add(modes.all, [""], - "Open help window", + "Open the help page", function () { liberator.help(); }); if (liberator.has("session")) @@ -561,21 +561,34 @@ const liberator = (function () //{{{ bang: true }); - commands.add(["h[elp]"], - "Display help", - function (args) + [ { - if (args.bang) - return void liberator.echoerr("E478: Don't panic!"); - - liberator.help(args.literalArg); + name: "h[elp]", + description: "Open the help page" }, { - argCount: "?", - bang: true, - completer: function (context) completion.help(context), - literal: 0 - }); + name: "helpa[ll]", + description: "Open the single unchunked help page" + } + ].forEach(function (command) { + let unchunked = command.name == "helpa[ll]"; + + commands.add([command.name], + command.description, + function (args) + { + if (args.bang) + return void liberator.echoerr("E478: Don't panic!"); + + liberator.help(args.literalArg, unchunked); + }, + { + argCount: "?", + bang: true, + completer: function (context) completion.help(context, unchunked), + literal: 0 + }); + }); commands.add(["javas[cript]", "js"], "Run a JavaScript command through eval()", @@ -823,12 +836,14 @@ const liberator = (function () //{{{ context.completions = liberator.extensions; }; - completion.help = function help(context) { + completion.help = function help(context, unchunked) { context.title = ["Help"]; context.anchored = false; + context.key = unchunked; context.generate = function () { - let res = config.helpFiles.map(function (file) { + let files = unchunked ? ["all.html"] : config.helpFiles; + let res = files.map(function (file) { let resp = util.httpGet("chrome://liberator/locale/" + file); if (!resp) return []; @@ -1335,11 +1350,13 @@ const liberator = (function () //{{{ * Returns the URL of the specified help topic if it exists. * * @param {string} topic The help topic to lookup. + * @param {boolean} unchunked Whether to search the unchunked help page. * @returns {string} */ - findHelp: function (topic) + findHelp: function (topic, unchunked) { - let items = completion.runCompleter("help", topic); + unchunked = !!unchunked; + let items = completion.runCompleter("help", topic, null, unchunked); let partialMatch = null; function format(item) item[1] + "#" + encodeURIComponent(item[0]); @@ -1363,14 +1380,15 @@ const liberator = (function () //{{{ * exists. * * @param {string} topic The help topic to open. + * @param {boolean} unchunked Whether to use the unchunked help page. * @returns {string} */ - help: function (topic) + help: function (topic, unchunked) { let where = (options["newtab"] && options.get("newtab").has("all", "help")) ? liberator.NEW_TAB : liberator.CURRENT_TAB; - if (!topic) + if (!topic && !unchunked) { let helpFile = options["helpfile"]; @@ -1381,7 +1399,7 @@ const liberator = (function () //{{{ return; } - let page = this.findHelp(topic); + let page = this.findHelp(topic, unchunked); if (page == null) return void liberator.echoerr("E149: Sorry, no help for " + topic); @@ -1915,14 +1933,15 @@ window.addEventListener("liberatorHelpLink", function (event) { tag = tag.replace(/\[.*?\]/g, "").replace(/!$/, ""); if (tag) - var page = liberator.findHelp(tag); - - if (page) { - elem.href = "chrome://liberator/locale/" + page; - if (buffer.URL.replace(/#.*/, "") == elem.href.replace(/#.*/, "")) // XXX - setTimeout(function () { content.postMessage("fragmentChange", "*"); }, 0); + let page = liberator.findHelp(tag, /\/all.html($|#)/.test(elem.ownerDocument.location.href)); + if (page) + elem.href = "chrome://liberator/locale/" + page; } + + // TODO: use HashChange event in Gecko 1.9.2 + if (elem.href) + setTimeout(function () { content.postMessage("fragmentChange", "*"); }, 0); }, true, true); // called when the chrome is fully loaded and before the main window is shown diff --git a/muttator/contrib/vim/syntax/muttator.vim b/muttator/contrib/vim/syntax/muttator.vim index a682ae15..e17d536a 100644 --- a/muttator/contrib/vim/syntax/muttator.vim +++ b/muttator/contrib/vim/syntax/muttator.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Muttator configuration file " Maintainer: Doug Kearns -" Last Change: 2009 Jul 22 +" Last Change: 2009 Aug 3 " TODO: make this muttator specific - shared liberator config? @@ -25,8 +25,8 @@ syn keyword muttatorCommand ab[breviate] ab[clear] addo[ns] addr[essbook] bN[ext \ colo[rscheme] com[mand] comc[lear] con[tact] contacts copy[to] cu[nmap] cuna[bbrev] delc[ommand] delm[arks] delmac[ros] \ dels[tyle] dia[log] do[autocmd] doautoa[ll] ec[ho] echoe[rr] echom[sg] em[enu] empty[trash] exe[cute] exta[dd] extd[isable] \ extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exu[sage] fini[sh] frameo[nly] get[messages] go[to] - \ h[elp] ha[rdcopy] hi[ghlight] ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] iuna[bbrev] javas[cript] js let - \ loadplugins lpl m[ail] ma[rk] macros map mapc[lear] marks mes[sages] messc[lear] mkm[uttatorrc] mm[ap] mmapc[lear] + \ h[elp] helpa[ll] ha[rdcopy] hi[ghlight] ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] iuna[bbrev] javas[cript] + \ js let loadplugins lpl m[ail] ma[rk] macros map mapc[lear] marks mes[sages] messc[lear] mkm[uttatorrc] mm[ap] mmapc[lear] \ mno[remap] move[to] mu[nmap] nm[ap] nmapc[lear] nno[remap] no[remap] norm[al] nu[nmap] optionu[sage] pa[geinfo] pagest[yle] \ pas pc[lose] pl[ay] pref[erences] prefs pw[d] q[uit] re[load] res[tart] run runt[ime] sav[eas] scrip[tnames] se[t] \ setg[lobal] setl[ocal] sil[ent] so[urce] st[op] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabfir[st] diff --git a/muttator/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt index 5eba75eb..c6e75ab0 100644 --- a/muttator/locale/en-US/intro.txt +++ b/muttator/locale/en-US/intro.txt @@ -49,7 +49,7 @@ it, recommend it and like it :) section:Help{nbsp}topics[overview] -TO BE WRITTEN... +//TO BE WRITTEN... For now use [c]:viusage![c], [c]:exusage![c] and [c]:optionusage![c] to find out about available mappings, commands and options. When in Message mode diff --git a/vimperator/NEWS b/vimperator/NEWS index dd2e81ba..fc425cc7 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -33,7 +33,7 @@ *-liberator* option * add [m];i[m] and [m];I[m] for opening image location (in new tab) * add [j]all.html[j] to show all help sections in a single page - available via - [c]:help all[c] + [c]:helpall[c] * add [m];c[m] extended hint mode - open the context menu * add [m]@:[m] mapping - repeat the last Ex command * add [m]\[m] mapping - toggle between rendered and source view diff --git a/vimperator/content/config.js b/vimperator/content/config.js index dc417e3c..af11e935 100644 --- a/vimperator/content/config.js +++ b/vimperator/content/config.js @@ -125,7 +125,7 @@ const config = { //{{{ "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html", "marks.html", "repeat.html", "autocommands.html", "print.html", "gui.html", "styling.html", "message.html", "developer.html", - "various.html", "version.html", "index.html", "all.html" + "various.html", "version.html", "index.html" ], get ignoreKeys() { diff --git a/vimperator/contrib/vim/syntax/vimperator.vim b/vimperator/contrib/vim/syntax/vimperator.vim index 3808edb7..12498f5f 100644 --- a/vimperator/contrib/vim/syntax/vimperator.vim +++ b/vimperator/contrib/vim/syntax/vimperator.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: VIMperator configuration file " Maintainer: Doug Kearns -" Last Change: 2009 Jul 22 +" Last Change: 2009 Aug 3 " TODO: make this vimperator specific - shared liberator config? @@ -25,16 +25,16 @@ syn keyword vimperatorCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] b \ cno[remap] colo[rscheme] com[mand] comc[lear] cu[nmap] cuna[bbrev] delbm[arks] delc[ommand] delm[arks] delmac[ros] \ delqm[arks] dels[tyle] dia[log] dl do[autocmd] doautoa[ll] downl[oads] e[dit] ec[ho] echoe[rr] echom[sg] em[enu] exe[cute] \ exta[dd] extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exu[sage] files fini[sh] fo[rward] - \ frameo[nly] fw h[elp] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] - \ iuna[bbrev] javas[cript] js ju[mps] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks mes[sages] messc[lear] - \ mkv[imperatorrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage] pa[geinfo] - \ pagest[yle] pas pc[lose] pl[ay] pref[erences] prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw] re[load] - \ reloada[ll] res[tart] run runt[ime] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal] sideb[ar] - \ sil[ent] so[urce] st[op] stopa[ll] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabde[tach] tabdu[plicate] - \ tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tbh[ide] tbs[how] - \ tbt[oggle] time tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] - \ unm[ap] ve[rsion] vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open] winc[lose] - \ wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] + \ frameo[nly] fw h[elp] helpa[ll] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] + \ iu[nmap] iuna[bbrev] javas[cript] js ju[mps] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks mes[sages] + \ messc[lear] mkv[imperatorrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage] + \ pa[geinfo] pagest[yle] pas pc[lose] pl[ay] pref[erences] prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw] + \ re[load] reloada[ll] res[tart] run runt[ime] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal] + \ sideb[ar] sil[ent] so[urce] st[op] stopa[ll] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabde[tach] + \ tabdu[plicate] tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs + \ tbh[ide] tbs[how] tbt[oggle] time tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] + \ undoa[ll] unl[et] unm[ap] ve[rsion] vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open] + \ winc[lose] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] \ contained syn match vimperatorCommand "!" contained diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf index 0302024f..eed08af8 100644 --- a/vimperator/locale/en-US/asciidoc.conf +++ b/vimperator/locale/en-US/asciidoc.conf @@ -77,7 +77,7 @@ LOGO=
[help-inlinemacro] -{target} +{target} [quotes] |=tag diff --git a/vimperator/locale/en-US/developer.txt b/vimperator/locale/en-US/developer.txt index 331dfe41..a96d3dd0 100644 --- a/vimperator/locale/en-US/developer.txt +++ b/vimperator/locale/en-US/developer.txt @@ -10,7 +10,7 @@ _make doc_. Please refer to the http://www.methods.co.nz/asciidoc/userguide.html[asciidoc documentation] above for details. Usually you can just write text as is, and mostly it will be interpreted correctly. The only difficult part is to write special sections -like for help::help[various.html#online-help]. +like for help::help[various.html,online-help]. ---------------------------------------------------------------------------------- || |:help| |:h| |help| @@ -64,7 +64,7 @@ Vimperator documentation: - *$$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 +- *$$help:developer{nbsp}information[developer.html,documentation]$$* creates a link with text _developer information_ to the tag _documentation_ in the file _developer.html_. @@ -72,7 +72,7 @@ Vimperator documentation: If you don't know in which file/section you should put some documentation, ask 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]. +help:opening{nbsp}web{nbsp}pages[browsing.html,opening]. section:Generating{nbsp}documentation[generating-docs] diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt index 9fc67025..b7c2f143 100644 --- a/vimperator/locale/en-US/eval.txt +++ b/vimperator/locale/en-US/eval.txt @@ -1,6 +1,6 @@ heading:Expression{nbsp}evaluation[expression,expr,eval] -INTRO TO BE WRITTEN... +//INTRO TO BE WRITTEN... |:ec| |:echo| + ||:ec[ho] {expr}|| diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 255fabaf..a4f40a49 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -193,7 +193,8 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:forward[c]|| Go forward in the browser history + ||[c]:frameonly[c]|| Show only the current frame's page + ||[c]:hardcopy[c]|| Print current document + -||[c]:help[c]|| Display help + +||[c]:help[c]|| Open the help page + +||[c]:helpall[c]|| Open the single unchunked help page + ||[c]:highlight[c]|| Style Vimperator + ||[c]:history[c]|| Show recently visited URLs + ||[c]:iabbrev[c]|| Abbreviate a key sequence in Insert mode + diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index cba39048..f3bea90e 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -451,7 +451,7 @@ ____ |\'noprivate'| |\'private'| ||'private'|| boolean (default: off) ____ -Set the 'private browsing' option. In private browsing mode history, cache +Set the "private browsing" option. In private browsing mode history, cache files, cookies, form data, passwords, and download list entries are available only for the duration of the private browsing session and deleted when returning to normal browsing mode. diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index 04a6b48c..9fc0f800 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -27,9 +27,8 @@ ________________________________________________________________________________ ________________________________________________________________________________ The file {rcfile} is used for user initialization commands. If {rcfile} is "NORC" then no startup initialization is performed except for the loading of -plugins, i.e. steps 1. and 2. in -help:initialization[starting.html#Initialization] are skipped. If {rcfile} is -"NONE" then plugin loading is also skipped. +plugins, i.e. steps 1. and 2. in [j]initialization[j] are skipped. If {rcfile} +is "NONE" then plugin loading is also skipped. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt index 94c8ba64..89b57110 100644 --- a/vimperator/locale/en-US/various.txt +++ b/vimperator/locale/en-US/various.txt @@ -61,11 +61,18 @@ section:Online{nbsp}help[online-help] ||:h[elp] [a][subject][a]|| + |||| ________________________________________________________________________________ -Open help window. The default page, as specified by 'helpfile' is shown unless -[a][subject][a] is specified. If you need help for a specific topic, try +Open the help page. The default page, as specified by 'helpfile' is shown +unless [a][subject][a] is specified. If you need help for a specific topic, try [c]:help overview[c]. +________________________________________________________________________________ -All help pages can be viewed in a single page via [c]:help all[c]. + +|:helpall| |:helpa| |help-all| +||:helpa[ll] [a][subject][a]|| + +________________________________________________________________________________ +Open the single unchunked help page. + +See [c]:help[c]. ________________________________________________________________________________ diff --git a/xulmus/contrib/vim/syntax/xulmus.vim b/xulmus/contrib/vim/syntax/xulmus.vim index e5a83e02..445e0b24 100644 --- a/xulmus/contrib/vim/syntax/xulmus.vim +++ b/xulmus/contrib/vim/syntax/xulmus.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Xulmus configuration file " Maintainer: Doug Kearns -" Last Change: 2009 Jul 22 +" Last Change: 2009 Aug 3 " TODO: make this xulmus specific - shared liberator config? @@ -25,18 +25,18 @@ syn keyword xulmusCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] ba[ck \ cno[remap] colo[rscheme] com[mand] comc[lear] cu[nmap] cuna[bbrev] delbm[arks] delc[ommand] delm[arks] delmac[ros] \ delqm[arks] dels[tyle] dia[log] displayp[ane] dl do[autocmd] doautoa[ll] downl[oads] dp[ane] dpcl[ose] dpope[n] e[dit] \ ec[ho] echoe[rr] echom[sg] em[enu] exe[cute] exta[dd] extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] - \ extp[references] exu[sage] f[ilter] files fini[sh] fo[rward] frameo[nly] fw h[elp] ha[rdcopy] hi[ghlight] hist[ory] hs - \ ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] iuna[bbrev] javas[cript] js ju[mps] let load loadplugins lpl ls - \ ma[rk] macros map mapc[lear] marks mediav[iew] mes[sages] messc[lear] mkv[imperatorrc] mkx[ulmusrc] nm[ap] nmap[clear] - \ nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage] pa[geinfo] pagest[yle] pas pc[lose] pl[ay] - \ playern[ext] playerp[lay] playerpa[use] playerpr[ev] players[top] pm[ap] pmap[clear] pno[remap] pref[erences] prefs pu[nmap] - \ pw[d] q[uit] qa[ll] qma[rk] qmarks queue quita[ll] re[draw] re[load] reloada[ll] res[tart] run runt[ime] sav[eas] sb[ar] - \ sb[open] sbcl[ose] scrip[tnames] se[t] see[k] setg[lobal] setl[ocal] sideb[ar] sil[ent] sort[view] so[urce] st[op] stopa[ll] - \ sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabde[tach] tabdu[plicate] tabe[dit] tabfir[st] tabl[ast] tabm[ove] - \ tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tbh[ide] tbs[how] tbt[oggle] time tn[ext] toolbarh[ide] - \ toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] ve[rsion] vie[wsource] viu[sage] - \ vm[ap] vmap[clear] vno[remap] vol[ume] vu[nmap] w[rite] wc[lose] win[open] winc[lose] wine[dit] wo[pen] wq wqa[ll] xa[ll] - \ zo[om] + \ extp[references] exu[sage] f[ilter] files fini[sh] fo[rward] frameo[nly] fw h[elp] helpa[ll] ha[rdcopy] hi[ghlight] + \ hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] iuna[bbrev] javas[cript] js ju[mps] let load + \ loadplugins lpl ls ma[rk] macros map mapc[lear] marks mediav[iew] mes[sages] messc[lear] mkv[imperatorrc] mkx[ulmusrc] + \ nm[ap] nmap[clear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage] pa[geinfo] pagest[yle] pas + \ pc[lose] pl[ay] playern[ext] playerp[lay] playerpa[use] playerpr[ev] players[top] pm[ap] pmap[clear] pno[remap] + \ pref[erences] prefs pu[nmap] pw[d] q[uit] qa[ll] qma[rk] qmarks queue quita[ll] re[draw] re[load] reloada[ll] res[tart] run + \ runt[ime] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] see[k] setg[lobal] setl[ocal] sideb[ar] sil[ent] sort[view] + \ so[urce] st[op] stopa[ll] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabde[tach] tabdu[plicate] tabe[dit] + \ tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tbh[ide] tbs[how] + \ tbt[oggle] time tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] + \ unm[ap] ve[rsion] vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vol[ume] vu[nmap] w[rite] wc[lose] win[open] + \ winc[lose] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] \ contained syn match xulmusCommand "!" contained diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf index 8f1866c8..c701991d 100644 --- a/xulmus/locale/en-US/asciidoc.conf +++ b/xulmus/locale/en-US/asciidoc.conf @@ -77,7 +77,7 @@ LOGO=
[help-inlinemacro] -{target} +{target} [quotes] |=tag diff --git a/xulmus/locale/en-US/eval.txt b/xulmus/locale/en-US/eval.txt index 75e336d9..4eba4039 100644 --- a/xulmus/locale/en-US/eval.txt +++ b/xulmus/locale/en-US/eval.txt @@ -1,6 +1,6 @@ heading:Expression{nbsp}evaluation[expression,expr,eval] -INTRO TO BE WRITTEN... +//INTRO TO BE WRITTEN... |:ec| |:echo| + ||:ec[ho] {expr}|| diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt index 363e141e..4b7445fe 100644 --- a/xulmus/locale/en-US/index.txt +++ b/xulmus/locale/en-US/index.txt @@ -232,7 +232,8 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||[c]:forward[c]|| Go forward in the browser history + ||[c]:frameonly[c]|| Show only the current frame's page + ||[c]:hardcopy[c]|| Print current document + -||[c]:help[c]|| Display help + +||[c]:help[c]|| Open the help page + +||[c]:helpall[c]|| Open the single unchunked help page + ||[c]:highlight[c]|| Style Xulmus + ||[c]:history[c]|| Show recently visited URLs + ||[c]:iabbrev[c]|| Abbreviate a key sequence in Insert mode + diff --git a/xulmus/locale/en-US/starting.txt b/xulmus/locale/en-US/starting.txt index 7ff84d4e..ba655d70 100644 --- a/xulmus/locale/en-US/starting.txt +++ b/xulmus/locale/en-US/starting.txt @@ -27,9 +27,8 @@ ________________________________________________________________________________ ________________________________________________________________________________ The file {rcfile} is used for user initialization commands. If {rcfile} is "NORC" then no startup initialization is performed except for the loading of -plugins, i.e. steps 1. and 2. in -help:initialization[starting.html#Initialization] are skipped. If {rcfile} is -"NONE" then plugin loading is also skipped. +plugins, i.e. steps 1. and 2. in [j]initialization[j] are skipped. If {rcfile} +is "NONE" then plugin loading is also skipped. ________________________________________________________________________________ diff --git a/xulmus/locale/en-US/various.txt b/xulmus/locale/en-US/various.txt index 492bac42..d6ac5edc 100644 --- a/xulmus/locale/en-US/various.txt +++ b/xulmus/locale/en-US/various.txt @@ -61,11 +61,18 @@ section:Online{nbsp}help[online-help] ||:h[elp] [a][subject][a]|| + |||| ________________________________________________________________________________ -Open help window. The default page, as specified by 'helpfile' is shown unless -[a][subject][a] is specified. If you need help for a specific topic, try +Open the help page. The default page, as specified by 'helpfile' is shown +unless [a][subject][a] is specified. If you need help for a specific topic, try [c]:help overview[c]. +________________________________________________________________________________ -All help pages can be viewed in a single page via [c]:help all[c]. + +|:helpall| |:helpa| |help-all| +||:helpa[ll] [a][subject][a]|| + +________________________________________________________________________________ +Open the single unchunked help page. + +See [c]:help[c]. ________________________________________________________________________________