diff --git a/content/completion.js b/content/completion.js index 133a953c..60f4ef63 100644 --- a/content/completion.js +++ b/content/completion.js @@ -301,7 +301,7 @@ vimperator.Completion = function () //{{{ Help: function (filter) { var res = []; - var files = ["intro.html", "options.xhtml", "motion.html"]; + var files = ["intro.html", "options.html", "motion.html", "starting.html"]; for (var file in files) { try diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf index cc28c38f..05f935bd 100644 --- a/locale/en-US/asciidoc.conf +++ b/locale/en-US/asciidoc.conf @@ -24,18 +24,21 @@ LOGO=
image:chrome://vimperator/content/logo_white.png[Vimperator]
image:chrome://vimperator/content/logo_white.png[Vimperator] # [macros] -# # Tag: |primary,secondary,tertiary| not yet support, only use single tags -# (?su)(?.+?)\|(?!\+)=tag -# # same as tag, but with anchor -# (?su)(?.+?)\|(?!\+)=atag -# -# [tag-inlinemacro] -# {target} -# -# [atag-inlinemacro] -# -# {target} +# section:Introduction[tag1,tag2] +(?su)(?.+?)\|(?!\+)=section +# help:helptext[href] +(?su)(?.+?)\|(?!\+)=help +# maximum 3 tags for now +[section-inlinemacro] + +{3? {3}} +{2? {2}} +{1? {1}} +

{target}

+ +[help-inlinemacro] +
{target} [quotes] |=tag diff --git a/locale/en-US/initialization.xhtml b/locale/en-US/initialization.xhtml deleted file mode 100644 index 702dde77..00000000 --- a/locale/en-US/initialization.xhtml +++ /dev/null @@ -1,27 +0,0 @@ - - - -Vimperator Help: Introduction - - - - -
-

initialization

Initialization

At startup Vimperator sources a user -RC file, containing Ex commands, and any JavaScript files found in the plugin -directory.

The RC file may be named .vimperatorrc or _vimperatorrc. The -search order is:

The plugin directory is named:

The user's $HOME(~) directory is -determined as follows:

$VIMPERATOR_HOME -can be used to override the calculated $HOME directory. -
- - diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt index 27f48f0f..ab558a3a 100644 --- a/locale/en-US/intro.txt +++ b/locale/en-US/intro.txt @@ -6,17 +6,14 @@ Later it was time for a Konqueror. Now it's time for an Imperator, the VIMperator :)* +++
+++ -|intro| +section:Introduction[intro] -Introduction ------------- http://vimperator.mozdev.org[Vimperator] is a free browser add-on for Firefox, which makes it look and behave like the http://www.vim.org[Vim] text editor. It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in. -|warning| + - +|warning| + Warning: To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden. + If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + @@ -25,6 +22,7 @@ If you don't like Vimperator at all, you can uninstall it by typing If you like it, but can't remember the shortcuts, press [m]F1[m] or [c]:help[c] to get this help window back. +|author| |donation| + Vimperator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott]. If you appreciate my work on Vimperator and want to encourage me working on it more, you can either send me greetings, patches or make a donation: @@ -45,21 +43,13 @@ Of course as a believer in free open source software, only make a donation 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] -|overview| +- help:Initialization[starting.html]: How vimperator starts up, where it reads the config file... +- help:Options[options.html]: A description of all options -Help topics ------------ -- file:initialization.xhtml[Initialization]: How vimperator starts up, where it reads the config file... -- file:options.xhtml[Options]: Foo +section:Features[features] -+++
+++ - -|features| - -Features --------- * Vim-like keybindings (h,j,k,l,gg,G,0,$,ZZ,,etc.) * Ex-commands (:quit, :open www.foo.com, ...) * Tab completion available for all commands with support for 'longest' matching when set in [o]wildmode[o] @@ -78,12 +68,8 @@ Features * Move the text cursor and select text with vim keys and a visual mode. (for now only for the browser, no text fields) * A comprehensive help file, explaining all commands, mappings and settings. -+++
+++ +section:Contact[contact] -|contact| - -Contact -------- Please send comments/bug reports/patches to the mailing list, where I will properly answer any questions. You can also join the #vimperator IRC channel on irc.freenode.net or check the Wiki for frequently asked questions. Make diff --git a/locale/en-US/options.txt b/locale/en-US/options.txt new file mode 100644 index 00000000..9100b06e --- /dev/null +++ b/locale/en-US/options.txt @@ -0,0 +1,84 @@ +HEADER + +This is the playground for testing asciidoc to make it finally +usable for our help system. + +[[abstract]] |abstract| + +Abstract +-------- +The optional abstract (one or more paragraphs) goes here. +You can also jump to xref:section[section]. + +This document is an AsciiDoc article skeleton containing briefly +annotated element placeholders plus a couple of example index entries +and footnotes. The preface, appendix, bibliography, glossary and index +section titles are significant ('specialsections'). + +-------------------------------------- +foo bar#include + +int main() { + printf("Hello World!\n"); + exit(0); +} +-------------------------------------- + +|scrollbind-relative| + + +Each 'scrollbind' window keeps track of its "relative offset," which can be +thought of as the difference between the current window's vertical scroll +position and the other window's vertical scroll position. When one of the +'scrollbind' windows is asked to vertically scroll past the beginning or end +limit of its text, the window no longer scrolls, but remembers how far past +the limit it wishes to be. The window keeps this information so that it can +maintain the same relative offset, regardless of its being asked to scroll +past its buffer's limits. + +|| +|||| +|||| +2 ist ein sehr langer text den ich einfach mal weiterschreibe, bis er fertig ist + + +[[section]] |test| |foo| + +The First Section +----------------- +Article sections start at level 1 and can be nested up to four levels +deep. +footnote:[An example footnote.] +indexterm:[Example index entry] + +And now for something completely different: ((monkeys)), lions and +tigers (Bengal and Siberian) using the alternative syntax index +entries. +(((Big cats,Lions))) +(((Big cats,Tigers,Bengal Tiger))) +(((Big cats,Tigers,Siberian Tiger))) +Note that multi-entry terms generate separate index entries. + +Here are a couple of image examples: an image:images/smallnew.png[] +example inline image followed by an example block image: + +.Tiger block image +image::images/tiger.png[Tiger image] + +Followed by an example table: + +.An example table +`-----------------`-------------------------- +Option Description +--------------------------------------------- +-a 'USER GROUP' Add 'USER' to 'GROUP'. +-R 'GROUP' Disables access to 'GROUP'. +--------------------------------------------- + +[[X1]] +Sub-section with Anchor +~~~~~~~~~~~~~~~~~~~~~~~ +Sub-section at level 2. + + + +// vim: set syntax=asciidoc: diff --git a/locale/en-US/options.xhtml b/locale/en-US/options.xhtml deleted file mode 100644 index 80730bb9..00000000 --- a/locale/en-US/options.xhtml +++ /dev/null @@ -1,82 +0,0 @@ - - - -Vimperator Help: Introduction - - - - -

Options

- -Options are beaaaaautiful, but read the -introduction -first. - - - - -

Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
'activate'
'act'
Define when tabs are automatically activated
stringlist (default: homepage,quickmark,tabopen,paste)

Available items:
  • homepage: gH mapping
  • quickmark: go and gn mappings
  • tabopen: :tabopen[!] command
  • paste: P and gP mappings

'activate'
'act'

'complete'
'cpt'
Items which are completed at the :[tab]open prompt
charlist (default: sfbh)

Available items:
  • s: Search engines and keyword URLs
  • f: Local files
  • b: Bookmarks
  • h: History
The order is important, so :set complete=bs would list bookmarks first, and then any available quick searches.
Add 'sort' to the 'wildoptions' option if you want all entries sorted.
'complete'
'cpt'

'defsearch'
'ds'
Set the default search engine
string (default: google)

The default search engine is used in the :[tab]open [arg] command if [arg] neither looks like a URL or like a specified search engine/keyword.
'defsearch'
'ds'

'editor'
Set the external text editor
string (default: gvim -f)

Sets the editor to run when <C-i> is pressed in INSERT and TEXTAREA modes. Note that Vimperator will not behave correctly if the editor forks its own process, such as with gvim without the -f argument.
'editor'

'extendedhinttags'
'eht'
XPath string of hintable elements activated by ';'
string (default: //*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | //input[not(@type='hidden')] | //a | //area | //iframe | //textarea | //button | //select | //xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | //xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select)

'extendedhinttags'
'eht'

'focusedhintstyle'
'fhs'
CSS specification of focused hints
string (default: z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;)

'focusedhintstyle'
'fhs'

'fullscreen'
'fs'
Show the current window fullscreen
boolean (default: off)

'fullscreen'
'nofullscreen'
'fs'
'nofs'

'guioptions'
'go'
Show or hide the menu, toolbar and scrollbars
charlist (default: '')

Supported characters:
  • m: menubar
  • T: toolbar
  • b: bookmark bar
You can also hide the tab bar with :set showtabline=0.
'guioptions'
'go'

'hinttimeout'
'hto'
Automatically follow non unique numerical hint after {arg} ms
number (default: 0)

Set to 0 (the default) to only follow numeric hints after pressing <Return> or when the hint is unique.
'hinttimeout'
'hto'

'hintstyle'
'hs'
CSS specification of unfocused hints
string (default: z-index:5000; font-family:monospace; font-size:12px; color:white; background-color:red; border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;)

'hintstyle'
'hs'

'hinttags'
'ht'
XPath string of hintable elements activated by 'f' and 'F'
string (default: //*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | //input[not(@type='hidden')] | //a | //area | //iframe | //textarea | //button | //select | //xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] | //xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select)

'hinttags'
'ht'

'history'
'hi'
Number of Ex commands and search patterns to store in the commandline history
number (default: 500)

'history'
'hi'

'hlsearch'
'hls'
Highlight previous search pattern matches
boolean (default: off)

'hlsearch'
'nohlsearch'
'hls'
'nohls'

'hlsearchstyle'
'hlss'
CSS specification of highlighted search items
string (default: color: black; background-color: yellow; padding: 0; display: inline;)

'hlsearchstyle'
'hlss'

'ignorecase'
'ic'
Ignore case in search patterns
boolean (default: on)

'ignorecase'
'noignorecase'
'ic'
'noic'

'incsearch'
'is'
Show where the search pattern matches as it is typed
boolean (default: on)

NOTE: Incremental searching currently only works in the forward direction.
'incsearch'
'noincsearch'
'is'
'nois'

'insertmode'
'im'
Use Insert mode as the default for text areas
boolean (default: on)

Makes Vimperator work in a way that Insert mode is the default mode for text areas. Useful if you want to use Vimperator as a modeless editor, keeping the known Firefox interface for editing text areas.
'insertmode'
'noinsertmode'
'im'
'noim'

'laststatus'
'ls'
Show the status line
number (default: 2)

Determines when the last window will have a status line. Possible values:
  • 0: never
  • 1: only if there are multiple windows
  • 2: always
NOTE: laststatus=1 not implemented yet.
'laststatus'
'ls'

'linksearch'
'lks'
Limit the search to hyperlink text
boolean (default: off)

This includes (X)HTML elements with an "href" atrribute and XLink "simple" links.
'linksearch'
'nolinksearch'
'lks'
'nolks'

'more'
Pause the message list window when more than one screen of listings is displayed
boolean (default: on)

'more'
'nomore'

'nextpattern'
Patterns to use when guessing the 'next' page in a document sequence
stringlist (default: \bnext,^>$,^(>>|»)$,^(>|»),(>|»)$)

Each pattern, in order, is matched against all links in the page with the first match being used.
The patterns are case insensitive regular expressions.
'nextpattern'

'pageinfo'
'pa'
Desired info on :pa[geinfo]
charlist (default: gfm)

Available items:
  • g: general info
  • f: feeds
  • m: meta tags
The order matters
'pageinfo'
'pa'

'popups'
'pps'
Where to show requested popup windows
number (default: 1)

Define where to show requested popup windows. Does not apply to windows which are opened by middle clicking a link, they always open in a new tab. Possible values:
  • 0: Force to open in the current tab (NOTE: this can stop some web sites from working correctly!)
  • 1: Always open in a new tab
  • 2: Open in a new window if it has a specific requested size (default in Firefox)
  • 3: Always open in a new window
NOTE: This option does not change the popup blocker of Firefox in any way.
'popups'
'pps'

'preload'
Speed up first time history/bookmark completion
boolean (default: on)

History access can be quite slow for a large history. Vimperator maintains a cache to speed it up significantly on subsequent access.
In order to also speed up first time access, it is cached at startup, if this option is set (recommended).
'preload'
'nopreload'

'previewheight'
'pvh'
Default height for preview window
number (default: 10)

Value must be between 1 and 50. If the value is too high, completions may cover the command-line. Close the preview window with :pclose.
NOTE: Option currently disabled
'previewheight'
'pvh'

'previouspattern'
Patterns to use when guessing the 'previous' page in a document sequence
stringlist (default: \bprev|previous\b,^<$,^(<<|«)$,^(<|«),(<|«)$)

Each pattern, in order, is matched against all links in the page with the first match being used.
The patterns are case insensitive regular expressions.
'previouspattern'

'scroll'
'scr'
Number of lines to scroll with C-u and C-d commands
number (default: 0)

The number of lines scrolled defaults to half the window size. When a {count} is specified to the <C-u> or <C-d> commands this is used to set the value of 'scroll' and also used for the current command. The value can be reset to half the window height with :set scroll=0.
'scroll'
'scr'

'showmode'
'smd'
Show the current mode in the command line
boolean (default: on)

'showmode'
'noshowmode'
'smd'
'nosmd'

'showstatuslinks'
'ssli'
Show the destination of the link under the cursor in the status bar
number (default: 1)

Also links which are focused by keyboard commands like <Tab> are shown. Possible values:
  • 0: Don't show link destination
  • 1: Show the link in the status line
  • 2: Show the link in the command line

'showstatuslinks'
'ssli'

'showtabline'
'stal'
Control when to show the tab bar of opened web pages
number (default: 2)

Possible values:
  • 0: Never show tab bar
  • 1: Show tab bar only if more than one tab is open
  • 2: Always show tab bar

'showtabline'
'stal'

'smartcase'
'scs'
Override the 'ignorecase' option if the pattern contains uppercase characters
boolean (default: on)

This is only used if the 'ignorecase' option is set.
'smartcase'
'nosmartcase'
'scs'
'noscs'

'titlestring'
Change the title of the browser window
string (default: Vimperator)

Vimperator changes the browser title from "Title of web page - Mozilla Firefox" to "Title of web page - Vimperator".
If you don't like that, you can restore it with: :set titlestring=Mozilla Firefox.
'titlestring'

'usermode'
'um'
Show current website with a minimal style sheet to make it easily accessible
boolean (default: off)

Note that this is a local option for now, later it may be split into a global and :setlocal part
'usermode'
'nousermode'
'um'
'noum'

'verbose'
'vbs'
Define which type of messages are logged
number (default: 0)

When bigger than zero, Vimperator will give messages about what it is doing. They are printed to the error console which can be shown with :javascript!.
The highest value is 9, being the most verbose mode.
'verbose'
'vbs'

'visualbell'
'vb'
Use visual bell instead of beeping on errors
boolean (default: off)

'visualbell'
'novisualbell'
'vb'
'novb'

'wildmode'
'wim'
Define how command line completion works
stringlist (default: list:full)

It is a comma-separated list of parts, where each part specifies what to do for each consecutive use of the completion key. The first part specifies the behavior for the first use of the completion key, the second part for the second use, etc.
These are the possible values for each part:
''Complete only the first match
'full'Complete the next full match. After the last, the original string is used.
'longest'Complete till the longest common string.
'list'When more than one match, list all matches.
'list:full'When more than one match, list all matches and complete first match.
'list:longest'When more than one match, list all matches and complete till the longest common string.
When there is only a single match, it is fully completed regardless of the case.
'wildmode'
'wim'

'wildoptions'
'wop'
Change how command line completion is done
stringlist (default: '')

A list of words that change how command line completion is done.
Currently only one word is allowed:
sortAlways sorts completion list, overriding the 'complete' option.

'wildoptions'
'wop'
- - - diff --git a/locale/en-US/xhtml11.css b/locale/en-US/xhtml11.css index a2c4a65d..ac6839a8 100644 --- a/locale/en-US/xhtml11.css +++ b/locale/en-US/xhtml11.css @@ -51,7 +51,7 @@ body h1 { } body h2 { - /*margin: 0.5em 0 0 -4%;*/ + margin-top: 30px; line-height: 1.3; border-bottom: 2px solid silver; } @@ -157,6 +157,12 @@ div.bibliomixed { margin: 0.5em 5% 0.5em 1em; } +#footer { + margin: 15px; + text-align: center; + color: gray; +} + div.glossary dt { font-weight: bold; } @@ -276,9 +282,13 @@ span.tag { font-weight: bold; color: rgb(255, 0, 255); /* magenta */ padding-left: 15px; - padding-top: 5px; + padding-top: -5px; float: right; } +span.section { + padding-top: 22px !important; /* NOTE: needs change when you change

's margin */ +} + div.key { color: rgb(255, 0, 255); /* magenta */ min-width: 140px;