r1311 - in /trunk/packages/vim-scripts: debian/changelog debian/patches/mkd-preformatted.dpatch debian/vim-scripts.status html/index.html html/syntax_mkd.vim.html syntax/mkd.vim

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sat Jun 6 05:40:36 UTC 2009


Author: jamessan
Date: Sat Jun  6 05:40:36 2009
New Revision: 1311

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1311
Log:
Update markdown-syntax addon


Removed:
    trunk/packages/vim-scripts/debian/patches/mkd-preformatted.dpatch
Modified:
    trunk/packages/vim-scripts/debian/changelog
    trunk/packages/vim-scripts/debian/vim-scripts.status
    trunk/packages/vim-scripts/html/index.html
    trunk/packages/vim-scripts/html/syntax_mkd.vim.html
    trunk/packages/vim-scripts/syntax/mkd.vim

Modified: trunk/packages/vim-scripts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1311&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/changelog (original)
+++ trunk/packages/vim-scripts/debian/changelog Sat Jun  6 05:40:36 2009
@@ -1,7 +1,13 @@
 vim-scripts (20090211-1) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * add patch lbdbq-detect-lbdbq to detect whether the lbdbq executable is
     missing (Closes: #514796)
+
+  [ James Vega ]
+  * addons upgrades:
+    - markdown-syntax
+  * remove patch mkd-preformatted, merged upstream.
 
  -- Stefano Zacchiroli <zack at debian.org>  Wed, 11 Feb 2009 09:24:04 +0100
 

Modified: trunk/packages/vim-scripts/debian/vim-scripts.status
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1311&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/vim-scripts.status (original)
+++ trunk/packages/vim-scripts/debian/vim-scripts.status Sat Jun  6 05:40:36 2009
@@ -388,7 +388,7 @@
 author_url:  http://www.vim.org/account/profile.php?user_id=5655
 email:       benw at plasticboy.com
 license:     no license
-version:     8
+version:     9
 
 script_name: plugin/detectindent.vim
 addon:       detectindent

Modified: trunk/packages/vim-scripts/html/index.html
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1311&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/index.html (original)
+++ trunk/packages/vim-scripts/html/index.html Sat Jun  6 05:40:36 2009
@@ -51,7 +51,7 @@
    <li><a href="syntax_mkd.vim.html">syntax/mkd.vim.html</a></li>
   </ul>
   <p>
-  Page generated on Fri, 05 Dec 2008 21:13:33 -0500
+  Page generated on Sat, 06 Jun 2009 01:28:15 -0400
 .
   </p>
  </body>

Modified: trunk/packages/vim-scripts/html/syntax_mkd.vim.html
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/syntax_mkd.vim.html?rev=1311&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/syntax_mkd.vim.html (original)
+++ trunk/packages/vim-scripts/html/syntax_mkd.vim.html Sat Jun  6 05:40:36 2009
@@ -46,6 +46,19 @@
     <tr>
         <td><small>not logged in (<a href="/login.php">login</a>)</small></td>
     </tr>
+    <tr><td>
+<small>&nbsp;</small>
+<form action="http://www.google.com/cse" id="cse-search-box">
+  <div>
+    <input type="hidden" name="cx" value="partner-pub-3005259998294962:bvyni59kjr1" />
+    <input type="hidden" name="ie" value="ISO-8859-1" />
+    <input type="text" name="q" size="20" />
+    <br>
+    <input type="submit" name="sa" value="Search" />
+  </div>
+</form>
+<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&amp;lang=en"></script>
+    </td></tr>
     <tr>
         <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="1"></td>
     </tr>
@@ -59,7 +72,7 @@
             <td class="sidebarheader"><a href="/index.php">Home</a></td>
         </tr>
         <tr>
-            <td class="sidebarheader"><a href="/search.php">Search</a></td>
+            <td class="sidebarheader"><a href="/search.php">Advanced search</a></td>
         </tr>
     <tr>
         <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
@@ -153,8 +166,8 @@
 <tr>
   <td class="lightbg"><b>&nbsp;script karma&nbsp;</b></td>
   <td>
-    Rating <b>33/23</b>,
-    Downloaded by 1192  </td>
+    Rating <b>43/32</b>,
+    Downloaded by 1946  </td>
 </tr>
 </table>
 <p>
@@ -167,7 +180,7 @@
 <tr><td>syntax</td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">description</td></tr>
-<tr><td>A syntax file for the Markdown text-to-HTML tool <a target="_blank" href="http://daringfireball.net/projects/markdown/">http://daringfireball.net/projects/markdown/</A></td></tr>
+<tr><td>A syntax file for the Markdown text-to-HTML tool <a target="_blank" href="http://daringfireball.net/projects/markdown/">http://daringfireball.net/projects/markdown/</A>
<br>
<br>The latest development version is available on Github at <a target="_blank" href="http://github.com/plasticboy/vim-markdown/">http://github.com/plasticboy/vim-markdown/</A>
<br>Please submit patches there.</td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">install details</td></tr>
 <tr><td>See <a target="_blank" href="http://plasticboy.com/markdown-vim-mode/">http://plasticboy.com/markdown-vim-mode/</A></td></tr>
@@ -204,60 +217,68 @@
     <th valign="top">release notes</th>
 </tr>
 <tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8622">mkd.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>8</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2008-04-30</i></td>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=10630">mkd.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>9</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2009-05-18</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Really fix matching bold and underline characters inside of words.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8375">mkd.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>7</b></td>
-    <td class="roweven" valign="top" nowrap><i>2008-03-01</i></td>
+    <td class="rowodd" valign="top" width="2000">Numerous link and emphasis fixes.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8622">mkd.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>8</b></td>
+    <td class="roweven" valign="top" nowrap><i>2008-04-30</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixes several bugs, most thanks to David Wolever:
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Don’t match bold and underline characters inside of words.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Don’t match code blocks that aren’t preceded by a blank line.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Fix double back-tick code blocks without a back-tick inside of them.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Fix # headings being matched anywhere in the line.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Match &lt;pre&gt; and &lt;code&gt; tags.
<br>
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6127">mkd.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>6</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2006-09-01</i></td>
+    <td class="roweven" valign="top" width="2000">Really fix matching bold and underline characters inside of words.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8375">mkd.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>7</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2008-03-01</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Enables spellchecking in Vim 7 and adds highlighting for reference-style links thanks to Will Norris.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4845">mkd.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>5</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-12-01</i></td>
+    <td class="rowodd" valign="top" width="2000">Fixes several bugs, most thanks to David Wolever:
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Don’t match bold and underline characters inside of words.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Don’t match code blocks that aren’t preceded by a blank line.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Fix double back-tick code blocks without a back-tick inside of them.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Fix # headings being matched anywhere in the line.
<br>&nbsp;&nbsp;&nbsp;&nbsp;* Match &lt;pre&gt; and &lt;code&gt; tags.
<br>
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6127">mkd.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>6</b></td>
+    <td class="roweven" valign="top" nowrap><i>2006-09-01</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixes numbered headings being highlighted as list items and horizontal rules being highlighted as headings. Thanks to Stephen Haberman.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4515">mkd.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>4</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-08-24</i></td>
+    <td class="roweven" valign="top" width="2000">Enables spellchecking in Vim 7 and adds highlighting for reference-style links thanks to Will Norris.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4845">mkd.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>5</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-12-01</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixes stuff in parentheses being highlighted when not part of a link structure. </td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4245">mkd.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>3</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-05-05</i></td>
+    <td class="rowodd" valign="top" width="2000">Fixes numbered headings being highlighted as list items and horizontal rules being highlighted as headings. Thanks to Stephen Haberman.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4515">mkd.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>4</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-08-24</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixes a problem with indented lists being highlighted as code blocks.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4050">mkd.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-03-21</i></td>
+    <td class="roweven" valign="top" width="2000">Fixes stuff in parentheses being highlighted when not part of a link structure. </td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4245">mkd.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>3</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-05-05</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Initial upload</td>
+    <td class="rowodd" valign="top" width="2000">Fixes a problem with indented lists being highlighted as code blocks.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4050">mkd.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-21</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=5655">Ben Williams</a></i></td>
+    <td class="roweven" valign="top" width="2000">Initial upload</td>
 </tr>
 </table>
 <!-- finish off the framework -->
@@ -265,6 +286,7 @@
         </tr>
       </table>
     </td>
+
   </tr>
 </table>
 
@@ -303,7 +325,7 @@
           </td>
 
     <td align="right" valign="top">
-      		<a href="http://sourceforge.net" rel="nofollow"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=8&type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+      		<a href="http://sourceforge.net/projects/vim" rel="nofollow"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=8&type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
     </td>
 
     <td><img src="/images/spacer.gif" width="5" height="1" alt=""></td>

Modified: trunk/packages/vim-scripts/syntax/mkd.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/syntax/mkd.vim?rev=1311&op=diff
==============================================================================
--- trunk/packages/vim-scripts/syntax/mkd.vim (original)
+++ trunk/packages/vim-scripts/syntax/mkd.vim Sat Jun  6 05:40:36 2009
@@ -2,12 +2,11 @@
 " Language:	Markdown
 " Maintainer:	Ben Williams <benw at plasticboy.com>
 " URL:		http://plasticboy.com/markdown-vim-mode/
-" Version:	8
-" Last Change:  2008 April 29 
+" Version:	9
+" Last Change:  2009 May 18 
 " Remark:	Uses HTML syntax file
 " Remark:	I don't do anything with angle brackets (<>) because that would too easily
 "		easily conflict with HTML syntax
-" TODO: 	Do something appropriate with image syntax
 " TODO: 	Handle stuff contained within stuff (e.g. headings within blockquotes)
 
 
@@ -37,13 +36,23 @@
 syn sync linebreaks=1
 
 "additions to HTML groups
-syn region htmlBold     start=/\(^\|\s\)\*\@<!\*\*\*\@!/     end=/\*\@<!\*\*\*\@!\($\|\s\)/   contains=@Spell,htmlItalic
-syn region htmlItalic   start=/\(^\|\s\)\*\@<!\*\*\@!/       end=/\*\@<!\*\*\@!\($\|\s\)/      contains=htmlBold, at Spell
-syn region htmlBold     start=/\(^\|\s\)_\@<!___\@!/         end=/_\@<!___\@!\($\|\s\)/       contains=htmlItalic, at Spell
-syn region htmlItalic   start=/\(^\|\s\)_\@<!__\@!/          end=/_\@<!__\@!\($\|\s\)/        contains=htmlBold, at Spell
-syn region htmlString   start="]("ms=s+2             end=")"me=e-1
-syn region htmlLink     start="\["ms=s+1            end="\]"me=e-1 contains=@Spell
-syn region htmlString   start="\(\[.*]: *\)\@<=.*"  end="$"
+syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!/     end=/\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/   contains=@Spell,htmlItalic
+syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!/       end=/\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/      contains=htmlBold, at Spell
+syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=_\@<!___\@!/         end=/\\\@<!_\@<!___\@!\($\|\A\)\@=/       contains=htmlItalic, at Spell
+syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/          end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/        contains=htmlBold, at Spell
+
+" [link](URL) | [link][id] | [link][]
+syn region mkdLink matchgroup=mkdDelimiter      start="\!\?\[" end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite oneline
+syn region mkdID matchgroup=mkdDelimiter        start="\["    end="\]" contained
+syn region mkdURL matchgroup=mkdDelimiter       start="("     end=")"  contained
+
+" Link definitions: [id]: URL (Optional Title)
+" TODO handle automatic links without colliding with htmlTag (<URL>)
+syn region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
+syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
 
 "define Markdown groups
 syn match  mkdLineContinue ".$" contained
@@ -54,10 +63,11 @@
 syn match  mkdRule      /^\s*\*\{3,5}$/
 syn match  mkdListItem  "^\s*[-*+]\s\+"
 syn match  mkdListItem  "^\s*\d\+\.\s\+"
-syn match  mkdCode      /^\s*\n\(\(\s\{4,}\|[\t]\+\)[^*-+ ].*\n\)\+/
-syn region mkdCode      start=/`/                   end=/`/
+syn match  mkdCode      /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+syn match  mkdLineBreak /  \+$/
+syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
 syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
-syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineContinue, at Spell
+syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineBreak,mkdLineContinue, at Spell
 syn region mkdCode      start="<pre[^>]*>"         end="</pre>"
 syn region mkdCode      start="<code[^>]*>"        end="</code>"
 
@@ -78,7 +88,15 @@
 HtmlHiLink mkdLineContinue  Comment
 HtmlHiLink mkdListItem      Identifier
 HtmlHiLink mkdRule          Identifier
+HtmlHiLink mkdLineBreak     Todo
+HtmlHiLink mkdLink          htmlLink
+HtmlHiLink mkdURL           htmlString
+HtmlHiLink mkdID            Identifier
+HtmlHiLink mkdLinkDef       mkdID
+HtmlHiLink mkdLinkDefTarget mkdURL
+HtmlHiLink mkdLinkTitle     htmlString
 
+HtmlHiLink mkdDelimiter     Delimiter
 
 let b:current_syntax = "mkd"
 




More information about the pkg-vim-maintainers mailing list