Fix Xulmus, etc.

--HG--
branch : xslt

common/content/bookmarks.js

@@ -702,7 +702,6 @@ function Bookmarks() //{{{
         //          if the search also requires a postData, [url, postData] is returned
         getSearchURL: function getSearchURL(text, useDefsearch)
         {
-            let url = null;
             let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
 
             // we need to make sure our custom alias have been set, even if the user

common/content/commands.js

@@ -1193,7 +1193,7 @@ function Commands() //{{{
             let [, prefix, junk] = context.filter.match(/^(:*\d*)\w*(.?)/) || [];
             context.advance(prefix.length);
             if (!junk)
-                return context.fork("", 0, this, "command");
+                return void context.fork("", 0, this, "command");
 
             // dynamically get completions as specified with the command's completer function
             let command = commands.get(cmd);

common/content/completion.js

@@ -185,6 +185,7 @@ function CompletionContext(editor, name, offset) //{{{
     this.getKey = function (item, key) (typeof self.keys[key] == "function") ? self.keys[key].call(this, item.item) :
             key in self.keys ? item.item[self.keys[key]]
                              : item.item[key];
+    return this;
 }
 
 CompletionContext.Sort = {
@@ -453,13 +454,13 @@ CompletionContext.prototype = {
         let filter = fixCase(this.filter);
         if (this.anchored)
         {
-            function compare(text, s) text.substr(0, s.length) == s;
+            var compare = function compare(text, s) text.substr(0, s.length) == s;
             substrings = util.map(util.range(filter.length, text.length + 1),
                 function (end) text.substring(0, end));
         }
         else
         {
-            function compare(text, s) text.indexOf(s) >= 0;
+            var compare = function compare(text, s) text.indexOf(s) >= 0;
             substrings = [];
             let start = 0;
             let idx;
@@ -1156,12 +1157,12 @@ function Completion() //{{{
                     // Yes. If the [ starts at the beginning of a logical
                     // statement, we're in an array literal, and we're done.
                      if (get(-3, 0, STATEMENTS) == get(-2)[OFFSET])
-                        return;
+                        return null;
 
                     // Beginning of the statement upto the opening [
                     let obj = getObj(-3, get(-2)[OFFSET]);
 
-                    return complete.call(this, obj, getKey(), null, string, last);
+                    return void complete.call(this, obj, getKey(), null, string, last);
                 }
 
                 // Is this a function call?
@@ -1211,7 +1212,7 @@ function Completion() //{{{
                     };
 
                     obj[0][1] += "." + func + "(... [" + args.length + "]";
-                    return complete.call(this, obj, key, compl, string, last);
+                    return void complete.call(this, obj, key, compl, string, last);
                 }
 
                 // In a string that's not an obj key or a function arg.
@@ -1246,7 +1247,7 @@ function Completion() //{{{
             { // FIXME
                 var o = top[OFFSET];
                 top[OFFSET] = offset;
-                return complete.call(this, obj, key);
+                return void complete.call(this, obj, key);
             }
             finally
             {

common/content/editor.js

@@ -178,10 +178,7 @@ function Editor() //{{{
             {
                 let matches = args.string.match(RegExp("^\\s*($|" + abbrevmatch + ")(?:\\s*$|\\s+(.*))"));
                 if (!matches)
-                {
+                    return void liberator.echoerr("E474: Invalid argument");
-                    liberator.echoerr("E474: Invalid argument");
-                    return false;
-                }
                 let [, lhs, rhs] = matches;
                 if (rhs)
                     editor.addAbbreviation(mode, lhs, rhs);

common/content/help.xsl

@@ -31,11 +31,11 @@
         </html:html>
     </xsl:template>
 
-    <xsl:template match="liberator:include">
+    <xsl:template match="liberator:include" mode="pass-2">
         <xsl:apply-templates select="document(@href)/liberator:document/node()"/>
     </xsl:template>
 
-    <xsl:template match="liberator:dl">
+    <xsl:template match="liberator:dl" mode="pass-2">
         <xsl:copy>
             <column/>
             <column/>
@@ -48,7 +48,7 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="liberator:tags">
+    <xsl:template match="liberator:tags" mode="pass-2">
         <xsl:call-template name="parse-tags">
             <xsl:with-param name="text" select="."/>
         </xsl:call-template>
@@ -63,7 +63,7 @@
         </tags>
     </xsl:template>
 
-    <xsl:template match="liberator:default[not(@type='plain')]">
+    <xsl:template match="liberator:default[not(@type='plain')]" mode="pass-2">
         <xsl:variable name="type" select="preceding-sibling::liberator:type[1] | following-sibling::liberator:type[1]"/>
         <xsl:copy>
             <xsl:choose>
@@ -103,28 +103,28 @@
             <xsl:value-of select="$contents"/>
         </html:a>
     </xsl:template>
-    <xsl:template match="liberator:o">
+    <xsl:template match="liberator:o" mode="pass-2">
         <xsl:copy>
             <xsl:call-template name="linkify-tag">
                 <xsl:with-param name="contents" select='concat("&#39;", text(), "&#39;")'/>
             </xsl:call-template>
         </xsl:copy>
     </xsl:template>
-    <xsl:template match="liberator:k|liberator:t">
+    <xsl:template match="liberator:k|liberator:t" mode="pass-2">
         <xsl:copy>
             <xsl:call-template name="linkify-tag">
                 <xsl:with-param name="contents" select="text()"/>
             </xsl:call-template>
         </xsl:copy>
     </xsl:template>
-    <xsl:template match="liberator:k[@name]">
+    <xsl:template match="liberator:k[@name]" mode="pass-2">
         <xsl:copy>
             <xsl:call-template name="linkify-tag">
                 <xsl:with-param name="contents" select="concat('&lt;', @name, '>', .)"/>
             </xsl:call-template>
         </xsl:copy>
     </xsl:template>
-    <xsl:template match="liberator:ex">
+    <xsl:template match="liberator:ex" mode="pass-2">
         <xsl:copy>
             <xsl:call-template name="linkify-tag">
                 <xsl:with-param name="contents" select="."/>
@@ -132,11 +132,11 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="liberator:link">
+    <xsl:template match="liberator:link" mode="pass-2">
         <html:a href="{@topic}"><xsl:apply-templates select="@*|node()"/></html:a>
     </xsl:template>
 
-    <xsl:template match="liberator:tag|@tag">
+    <xsl:template match="liberator:tag|@tag" mode="pass-2">
         <xsl:call-template name="parse-tags">
             <xsl:with-param name="text"><xsl:value-of select="."/></xsl:with-param>
         </xsl:call-template>
@@ -151,12 +151,12 @@
         <xsl:choose>
             <xsl:when test="$localdoc/*[@replace=$tag] and not($elem[@replace])">
                 <xsl:for-each select="$localdoc/*[@replace=$tag]">
-                    <xsl:apply-templates select="."/>
+                    <xsl:apply-templates select="." mode="pass-2"/>
                 </xsl:for-each>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:for-each select="$elem">
-                    <xsl:copy><xsl:apply-templates select="node()"/></xsl:copy>
+                    <xsl:apply-templates select="." mode="pass-2"/>
                 </xsl:for-each>
             </xsl:otherwise>
         </xsl:choose>
@@ -184,11 +184,14 @@
         </xsl:call-template>
     </xsl:template>
 
-    <xsl:template match="@*|node()">
+    <xsl:template match="@*|node()" mode="pass-2">
         <xsl:copy>
             <xsl:apply-templates select="@*|node()"/>
         </xsl:copy>
     </xsl:template>
+    <xsl:template match="@*|node()">
+        <xsl:apply-templates select="." mode="pass-2"/>
+    </xsl:template>
 </xsl:stylesheet>
 
 <!-- vim:se ft=xslt sts=4 sw=4 et: -->

common/content/liberator.js

@@ -215,7 +215,7 @@ const liberator = (function () //{{{
 
         options.add(["helpfile", "hf"],
             "Name of the main help file",
-            "string", "intro");
+            "string", "intro.html");
 
         options.add(["loadplugins", "lpl"],
             "Load plugin scripts when starting up",
@@ -1389,7 +1389,7 @@ const liberator = (function () //{{{
             {
                 let helpFile = options["helpfile"];
                 if (config.helpFiles.indexOf(helpFile) != -1)
-                    liberator.open("liberator://help/" + helpFile, { from: "help" });
+                    liberator.open("liberator://help/" + helpFile.replace(/\.html$/, ""), { from: "help" });
                 else
                     liberator.echomsg("Sorry, help file " + helpFile.quote() + " not found");
                 return;

common/content/style.js

@@ -176,11 +176,10 @@ Highlights.prototype.CSS = <![CDATA[
 
     HelpTab,liberator|dl                        display: table; width: 100%; margin: 1em 0; border-bottom-width: 1px; border-top-width: 1px; padding: .5ex 0; table-layout: fixed;
     HelpTabColumn,liberator|column              display: table-column;
-    HelpTabColumn1,liberator|column:nth-of-type(1) display: table-column; width: 25%;
+    HelpTabColumn:first-child                   width: 25%;
-    HelpTabColumn2,liberator|column:nth-of-type(2) display: table-column; width: 75%;
     HelpTabTitle,liberator|dt                   display: table-cell; padding: .1ex 1ex; font-weight: bold;
     HelpTabDescription,liberator|dd             display: table-cell; padding: .1ex 1ex;
-    HelpTabRow,liberator|dl>*                   display: table-row;
+    HelpTabRow,liberator|dl>tr                  display: table-row;
 
     HelpTag,liberator|tag                       display: inline-block; color: #527BBD; margin-left: 1ex; font-size: 8pt; font-weight: bold;
     HelpTags,liberator|tags                     display: block; float: right; clear: right;
@@ -277,7 +276,7 @@ function Highlights(name, store)
     this.selector = function (class)
     {
         let [, hl, rest] = class.match(/^(\w*)(.*)/);
-        let class = "[liberator|highlight~=" + hl + "]"
+        class = "[liberator|highlight~=" + hl + "]"
         if (highlight[hl] && highlight[hl].class != class)
             class = highlight[hl].selector;
         return class + rest;

common/locale/en-US/autocommands.xml

@@ -43,7 +43,7 @@
 
         <dl tag="autocommand-list"/>
 
-        <p><a>pat</a> is a regular expression, use .* if you want to match all URLs.</p>
+        <p><a>pat</a> is a regular expression, use <tt>.*</tt> if you want to match all URLs.</p>
 
         <note>This differs from Vim which uses a glob rather than a regex for <a>pat</a>.</note>
 
@@ -78,27 +78,20 @@
 
 <p>Enable <em>passthrough</em> mode on all Google sites:</p>
 
-<p>
+<code><ex>:autocmd LocationChange .* js modes.passAllKeys = /google\.com/.test(buffer.URL)</ex></code>
-     <ex>:autocmd LocationChange .* js modes.passAllKeys = /google\.com/.test(buffer.URL)</ex>
-</p>
 
-<p>Enable <em>passthrough</em> mode on *some* Google sites:</p>
+<p>Enable <em>passthrough</em> mode on <em>some</em> Google sites:</p>
 
-<p>
+<code><ex>:autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL)</ex></code>
-     <ex>:autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL)</ex>
-</p>
 
 <p>
     Set the filetype to mail when editing email at Gmail:
 </p>
 
-<p>
+<code>
     <ex>:autocmd LocationChange .* :set editor=<str>gvim -f</str></ex>
-</p>
-
-<p>
     <ex>:autocmd LocationChange mail\\.google\\.com :set editor=<str>gvim -f -c 'set ft=mail'</str></ex>
-</p>
+</code>
 
 </document>
 

common/locale/en-US/marks.xml

@@ -96,7 +96,7 @@
     <spec>:delbm[arks]!</spec>
     <description>
         <p>
-            Delete a bookmark. Deletes *all* bookmarks which match the <oa>url</oa>. If
+            Delete a bookmark. Deletes <em>all</em> bookmarks which match the <oa>url</oa>. If
             omitted, <oa>url</oa> defaults to the URL of the current buffer. Use <k name="Tab"/>
             key on a string to complete the URL which you want to delete.
         </p>

common/locale/en-US/starting.xml

@@ -100,7 +100,7 @@
     <li>
         All directories in <o>runtimepath</o> are searched for a
         "plugin" subdirectory and all yet unloaded plugins are loaded.
-        For each plugin directory, all *.{js,vimp} files (including
+        For each plugin directory, all <tt>*.{js,vimp}</tt> files (including
         those in further subdirectories) are sourced alphabetically. No
         plugins will be sourced if:
 
@@ -117,10 +117,15 @@
 
 The user's ~ (i.e., "home") directory is determined as follows:
 
-* On Unix and Mac, the environment variable  <em>$HOME</em> is used.
+<ul>
-* On Windows, &liberator.appname; checks for the existence of <em>%HOME%</em>, then
+    <li>On Unix and Mac, the environment variable  <em>$HOME</em> is used.</li>
-<em>%USERPROFILE%</em>, and then <em>%HOMEDRIVE%%HOMEPATH%</em>. It uses the first one
+    <li>
-it finds.
+        On Windows, &liberator.appname; checks for the existence of
+        <em>%HOME%</em>, then <em>%USERPROFILE%</em>, and then
+        <em>%HOMEDRIVE%%HOMEPATH%</em>. It uses the first one it
+        finds.
+    </li>
+</ul>
 
 <h2 tag="save-settings">Saving settings</h2>
 

common/locale/en-US/styling.xml

@@ -142,9 +142,9 @@
         </p>
 
         <p>
-            If <a>name</a> (short option: *-n*) is provided, any existing style with the same
+            If <a>name</a> (short option: <em>-n</em>) is provided, any existing style with the same
             name is overridden, and the style may later be deleted using <a>name</a>. If
-            *-append* (short option: *-a*) is provided along with *-name*, <a>css</a> and
+            <em>-append</em> (short option: <em>-a</em>) is provided along with <em>-name</em>, <a>css</a> and
             <a>filter</a> are appended to its current value.
         </p>
 
@@ -165,9 +165,9 @@
         </p>
 
         <ul>
-            <li><em>-name</em>:  The name provided to <ex>:style</ex> (short option: *-n*)</li>
+            <li><em>-name</em>:  The name provided to <ex>:style</ex> (short option: <em>-n</em>)</li>
             <li><em>-index</em>: For unnamed styles, the index listed by <ex>:style</ex>
-                             (short option: *-i*)</li>
+                (short option: <em>-i</em>)</li>
         </ul>
     </description>
 </item>

vimperator/locale/en-US/intro.xml

@@ -53,11 +53,10 @@ web browser, as key bindings differ according to which mode you are in.
     who already did):
 </p>
 
-<html:form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal">
+<html:form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick"/>
 <input type="image" src="chrome://liberator/content/x-click-but21.gif" 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>
 </html:form>
 
 <p>

xulmus/locale/en-US/gui.xml

@@ -8,7 +8,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml">
 
 <dl tag="dialog-list" replace="dialog-list">
-    <dt>about</dt>           <dd>About &liberator.hostapp;</dd>
+    <dt>about</dt>           <dd>About &liberator.host;</dd>
     <dt>addons</dt>          <dd>Manage Add-ons</dd>
     <dt>checkupdates</dt>    <dd>Check for updates</dd>
     <dt>cleardata</dt>       <dd>Clear private data</dd>
@@ -21,7 +21,7 @@
     <dt>openfile</dt>        <dd>Open the file selector dialog</dd>
     <dt>pagesource</dt>      <dd>View page source</dd>
     <dt>places</dt>          <dd>Places Organizer: Manage your bookmarks and history</dd>
-    <dt>preferences</dt>     <dd>Show &liberator.hostapp; preferences dialog</dd>
+    <dt>preferences</dt>     <dd>Show &liberator.host; preferences dialog</dd>
     <dt>printsetup</dt>      <dd>Setup the page size and orientation before printing</dd>
     <dt>print</dt>           <dd>Show print dialog</dd>
     <dt>saveframe</dt>       <dd>Save frame to disk</dd>

xulmus/locale/en-US/intro.xml

@@ -4,8 +4,8 @@
 <!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <document
-    name="gui"
+    name="intro"
-    title="&liberator.appname; GUI"
+    title="&liberator.appname; Intro"
     xmlns="http://vimperator.org/namespaces/liberator"
     xmlns:html="http://www.w3.org/1999/xhtml">
 
@@ -14,14 +14,15 @@
 <h2 tag="intro">Introduction</h2>
 
 <link topic="http://vimperator.org/%liberator.name;">&liberator.appname;</link>
-is a free media player add-on for &liberator.hostapp;, which
+is a free media player add-on for &liberator.host;, which
 combines the best features of the
 <link topic="http://cmus.sourceforge.net">CMus</link>
-music player and the http://www.vim.org[Vim] text editor.
+music player and the 
+<link topic="http://www.vim.org">Vim</link>
+text editor.
 
-|warning| +
 <warning tag="warning">
-    To provide the most authentic CMus/Vim experience, the &liberator.hostapp; toolbar
+    To provide the most authentic CMus/Vim experience, the &liberator.host; toolbar
     is hidden.
     If you really need it, type: <ex>:set guioptions+=T</ex> to get it back.
     If you don't like &liberator.appname; at all, you can uninstall it by typing
@@ -33,7 +34,7 @@ music player and the http://www.vim.org[Vim] text editor.
 <tags>author donation</tags>
 <p>
     &liberator.appname; was written by
-    mailto:prathyushthota@gmail.com[Prathyush Thota].  If you
+    <link topic="prathyushthota@gmail.com">Prathyush Thota</link>.  If you
     appreciate my work on &liberator.appname; and want to encourage
     me working on it more, you can either send me greetings, patches
     or make a donation:
@@ -41,11 +42,11 @@ music player and the http://www.vim.org[Vim] text editor.
 
 <!-- the PAYPAL code -->
 <div xmlns="http://www.w3.org/1999/xhtml">
-<form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal">
+<form style="text-align: center;" action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick"/>
 <input type="image" src="chrome://liberator/content/x-click-but21.gif" 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>
+</form>
 </div>
 <p>
     Of course as a believer in free open source software, only make
@@ -73,7 +74,7 @@ music player and the http://www.vim.org[Vim] text editor.
     <li><link topic="repeat">Repeating commands</link>: Using macros to repeat recurring workflows.</li>
     <li><link topic="autocommands">Automatic commands</link>: Automatically executing code on certain events.</li>
     <li><link topic="print">Printing</link>: Printing pages.</li>
-    <li><link topic="gui">&liberator.appname;'s GUI</link>: Accessing &liberator.hostapp; menus, dialogs and the display panels.</li>
+    <li><link topic="gui">&liberator.appname;'s GUI</link>: Accessing &liberator.host; menus, dialogs and the display panels.</li>
     <li><link topic="styling">Styling the GUI and web pages</link>: Changing the styling of content pages and &liberator.appname; itself.</li>
     <li><link topic="message">Error and informational messages</link>: A description of messages and error messages.</li>
     <li><link topic="developer">Developer information</link>: How to write docs or plugins.</li>
@@ -97,7 +98,7 @@ music player and the http://www.vim.org[Vim] text editor.
     <li>Vim-like statusline with a Wget-like progress bar</li>
     <li>Minimal GUI (easily hide useless menubar and toolbar with <ex>:set guioptions=</ex>)</li>
     <li>Ability to <ex>:source</ex> JavaScript files, and to use a [a]~/.xulmusrc[a] file with syntax highlighting if you install http://code.google.com/p/vimperator-labs/issues/detail?id=50[xulmus.vim]</li>
-    <li>Easy quick searches (<ex>:open foo</ex> will search for "foo" in google, <ex>:open ebay terminator</ex> will search for "terminator" on ebay) with support for &liberator.hostapp; keyword bookmarks and search engines</li>
+    <li>Easy quick searches (<ex>:open foo</ex> will search for "foo" in google, <ex>:open ebay terminator</ex> will search for "terminator" on ebay) with support for &liberator.host; keyword bookmarks and search engines</li>
     <li>Count supported for many commands (<em>3</em><k name="C-o"/> will go back 3 pages)</li>
     <li>Beep on errors</li>
     <li>Marks support (<k>m</k><em>a</em> to set mark a on a web page, <k>'</k><em>a</em> to go there)</li>