From 100a41c51a5e00c950e97e33c955b2641439c08b Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Fri, 11 Jan 2008 03:35:19 +0000 Subject: [PATCH] :Help updates, still far from finished --- content/completion.js | 2 +- locale/en-US/asciidoc.conf | 60 ++++++++++++----- locale/en-US/intro.txt | 91 +++++++++++++++++++++++++ locale/en-US/introduction.xhtml | 49 -------------- locale/en-US/motion.txt | 114 ++++++++------------------------ locale/en-US/xhtml11.css | 46 +++++++++++-- 6 files changed, 206 insertions(+), 156 deletions(-) create mode 100644 locale/en-US/intro.txt delete mode 100644 locale/en-US/introduction.xhtml diff --git a/content/completion.js b/content/completion.js index ae55e647..116c5384 100644 --- a/content/completion.js +++ b/content/completion.js @@ -300,7 +300,7 @@ vimperator.Completion = function () //{{{ Help: function (filter) { var res = []; - var files = ["introduction.xhtml", "options.xhtml", "motion.html"]; + var files = ["intro.html", "options.xhtml", "motion.html"]; for (var file in files) { try diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf index 93b9b709..cc28c38f 100644 --- a/locale/en-US/asciidoc.conf +++ b/locale/en-US/asciidoc.conf @@ -1,3 +1,5 @@ +[miscellaneous] + [glossary] author=Martin Stubenschrott email=stubenschrott@gmx.net @@ -8,28 +10,54 @@ email=stubenschrott@gmx.net # # # -# -# +# +# # {doctitle} # # -# +#
#

{doctitle}

- - +# [replacements] -HEADER=image:chrome://vimperator/content/logo_white.png[Vimperator] +LOGO=
image:chrome://vimperator/content/logo_white.png[Vimperator]
+HEADER=
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 +# [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} -[tag-inlinemacro] -{target} -[atag-inlinemacro] - -{target} +[quotes] +|=tag +||=key +[o]=option +[c]=command +[m]=mapping +[a]=argument +# disable monospaced text as all our text is monospaced and it causes problems for some things ++= +'= + +[tags] +tag=| +key=
|
+option='|' +command=| +mapping=| +argument=| + +[specialwords] +warningwords=Warning: + +[warningwords] +{words} diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt new file mode 100644 index 00000000..27f48f0f --- /dev/null +++ b/locale/en-US/intro.txt @@ -0,0 +1,91 @@ +LOGO + ++++
+++ +*First there was a Navigator, then there was an Explorer. +Later it was time for a Konqueror. Now it's time for an Imperator, the +VIMperator :)* ++++
+++ + +|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: +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. + +If you don't like Vimperator at all, you can uninstall it by typing +[c]:addons[c] and remove/disable it. + +If you like it, but can't remember the shortcuts, press [m]F1[m] or +[c]:help[c] to get this help window back. + +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: + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +
+
+ + + + +
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +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 :) + ++++
+++ + +|overview| + +Help topics +----------- +- file:initialization.xhtml[Initialization]: How vimperator starts up, where it reads the config file... +- file:options.xhtml[Options]: Foo + ++++
+++ + +|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] +* Hit-a-hint like navigation of links (start with [m]f[m] to follow a link) +* Advanced completion of bookmark and history URLs (searching also in title, not only URL) +* Vim-like statusline with a wget-like progress bar +* Minimal GUI (easily hide useless menubar and toolbar with :set guioptions=) +* Ability to :source javascript files, and to use a ~/.vimperatorrc file with syntax highlighting if you install scripts/vimperator.vim +* Easy quick searches (:open foo will search foo in google, :open ebay terminator will search for terminator on ebay) with support for Firefox keyword bookmarks and search engines +* Count supported for many commands (3 will go back 3 pages) +* Beep on errors +* Marks support (ma to set mark 'a' on a webpage, 'a to go there) +* QuickMarks support (quickly go to previously marked web pages with go\{a-zA-Z0-9\}) +* :map support (and feedkeys() for script writers) +* :time support for profiling +* 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. + ++++
+++ + +|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 +sure, you have read the TODO file first, as I am aware of many things which +can be improved when I find time for it or get patches. diff --git a/locale/en-US/introduction.xhtml b/locale/en-US/introduction.xhtml deleted file mode 100644 index 67821b20..00000000 --- a/locale/en-US/introduction.xhtml +++ /dev/null @@ -1,49 +0,0 @@ - - - -Vimperator Help: Introduction - - - - -
-

Vimperator

-

First there was a Navigator, then there was an Explorer. -Later it was time for a Konqueror. Now it's time for an Imperator, the VIMperator :)

- -introduction

Introduction

-

Vimperator is a free browser add-on for Firefox, -which makes it look and behave like the 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: -To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden.
-If you really need them, type: :set guioptions+=mT to get them back.
-If you don't like Vimperator at all, you can uninstall it by typing :addons and remove/disable it.
-If you like it, but can't remember the shortcuts, press F1 or :help to get this help window back. -

-

Vimperator was written by 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:

- - -
- - - - -
- -

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 :)

- -overview

Overview

- -
- - diff --git a/locale/en-US/motion.txt b/locale/en-US/motion.txt index 6263f4fc..9100b06e 100644 --- a/locale/en-US/motion.txt +++ b/locale/en-US/motion.txt @@ -1,19 +1,9 @@ -// The Article Title -// ================= -// Author's Name -// v1.0, Dec 2003 - HEADER -*First there was a Navigator, then there was an Explorer. -Later it was time for a Konqueror. Now it's time for an Imperator, the -VIMperator :)* +This is the playground for testing asciidoc to make it finally +usable for our help system. -This is the optional preamble (an untitled section body). Useful for -writing simple sectionless documents consisting only of a preamble. - -atag:abstract[] tag:beginning[] -anchor:foo[] +[[abstract]] |abstract| Abstract -------- @@ -25,8 +15,33 @@ 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 -atag:section[] +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 ----------------- @@ -59,82 +74,11 @@ Option Description -R 'GROUP' Disables access to 'GROUP'. --------------------------------------------- -atag:anchor[] - [[X1]] Sub-section with Anchor ~~~~~~~~~~~~~~~~~~~~~~~ Sub-section at level 2. -A Nested Sub-section -^^^^^^^^^^^^^^^^^^^^ -Sub-section at level 3. -Yet another nested Sub-section -++++++++++++++++++++++++++++++ -Sub-section at level 4. - -This is the maximum sub-section depth supported by the distributed -AsciiDoc configuration. -footnote:[A second example footnote.] - - -atag:second[] atag:another[] atag:really[] atag:g[] - -The Second Section ------------------- -Article sections are at level 1 and can contain sub-sections nested up -to four deep. - -An example link to anchor at start of the <>. -indexterm:[Second example index entry] - -An example link to a bibliography entry <>. - -Appendix A: Example Appendix ----------------------------- -AsciiDoc article appendices are just just article sections with -'specialsection' titles. - -Appendix Sub-section -~~~~~~~~~~~~~~~~~~~~ -Appendix sub-section at level 2. - - - -Bibliography ------------- -The bibliography list is an example of an AsciiDoc SimpleList, the -AsciiDoc source list items are bulleted with a `+` character. - -+ [[[taoup]]] Eric Steven Raymond. 'The Art of Unix - Programming'. Addison-Wesley. ISBN 0-13-142901-9. -+ [[[walsh-muellner]]] Norman Walsh & Leonard Muellner. - 'DocBook - The Definitive Guide'. O'Reilly & Associates. 1999. - ISBN 1-56592-580-7. - - - -Glossary --------- -Glossaries are optional. Glossaries entries are an example of AsciiDoc -VariableList entries, the AsciiDoc source entry terms are terminated -by the ":-" characters. - -A glossary term:- - The corresponding (indented) definition. - -A second glossary term:- - The corresponding (indented) definition. - - -ifdef::backend-docbook[] -Index ------ -//////////////////////////////////////////////////////////////// -The index is normally left completely empty, it's contents being -generated automatically by the DocBook toolchain. -//////////////////////////////////////////////////////////////// -endif::backend-docbook[] // vim: set syntax=asciidoc: diff --git a/locale/en-US/xhtml11.css b/locale/en-US/xhtml11.css index 479eec77..a2c4a65d 100644 --- a/locale/en-US/xhtml11.css +++ b/locale/en-US/xhtml11.css @@ -14,9 +14,13 @@ body blockquote { } html body { - margin: 1em 5% 1em 5%; + /*margin: 1em 5% 1em 5%;*/ + margin: auto; + padding-left: 25px; + padding-right: 25px; line-height: 1.2; font-family: -moz-fixed; + max-width: 800px; } body div { @@ -37,7 +41,7 @@ div.list-of-figures p:first-child, div.list-of-tables p:first-child, div.example p.title { - margin-bottom: 0.2em; + margin-bottom: 0.1em; } body h1 { @@ -47,7 +51,7 @@ body h1 { } body h2 { - margin: 0.5em 0 0 -4%; + /*margin: 0.5em 0 0 -4%;*/ line-height: 1.3; border-bottom: 2px solid silver; } @@ -271,6 +275,38 @@ div.table p.title span.tag { font-weight: bold; color: rgb(255, 0, 255); /* magenta */ - padding-left: 15px !important; - float: right; + padding-left: 15px; + padding-top: 5px; + float: right; +} +div.key { + color: rgb(255, 0, 255); /* magenta */ + min-width: 140px; + float: left; +} +span.warning { + font-weight: bold; + color: red; +} +fieldset.paypal { + border: none; +} + +.argument { + color: #6A97D4; +} + +.command { + font-weight: bold; + color: #632610; +} + +.mapping { + font-weight: bold; + color: #102663; +} + +.option { + font-weight: bold; + color: #106326; }