r1241 - in /trunk/packages/vim-scripts: debian/changelog 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
Tue Apr 8 20:21:47 UTC 2008


Author: jamessan
Date: Tue Apr  8 20:21:47 2008
New Revision: 1241

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

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=1241&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/changelog (original)
+++ trunk/packages/vim-scripts/debian/changelog Tue Apr  8 20:21:47 2008
@@ -7,10 +7,9 @@
       being run in other buffers.  Thanks to Marvin Renich for the patch fix.
       (Closes: #465330)
   * Updated addons:
-    - xmledit, surround, debPlugin
+    - xmledit, surround, debPlugin, Markdown syntax
   * New addons:
     - DetectIndent: Automatically detect indent settings (Closes: #471890)
-  * 
 
  -- James Vega <jamessan at debian.org>  Tue, 05 Feb 2008 17:06:54 -0500
 

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=1241&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/vim-scripts.status (original)
+++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr  8 20:21:47 2008
@@ -387,7 +387,7 @@
 author_url:  http://www.vim.org/account/profile.php?user_id=5655
 email:       benw at plasticboy.com
 license:     no license
-version:     6
+version:     7
 
 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=1241&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/index.html (original)
+++ trunk/packages/vim-scripts/html/index.html Tue Apr  8 20:21:47 2008
@@ -49,7 +49,7 @@
    <li><a href="syntax_mkd.vim.html">syntax/mkd.vim.html</a></li>
   </ul>
   <p>
-  Page generated on Tue, 08 Apr 2008 16:07:28 -0400
+  Page generated on Tue, 08 Apr 2008 16:15:47 -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=1241&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/syntax_mkd.vim.html (original)
+++ trunk/packages/vim-scripts/html/syntax_mkd.vim.html Tue Apr  8 20:21:47 2008
@@ -154,7 +154,7 @@
   <td class="lightbg"><b>&nbsp;script karma&nbsp;</b></td>
   <td>
     Rating <b>31/19</b>,
-    Downloaded by 896  </td>
+    Downloaded by 1048  </td>
 </tr>
 </table>
 <p>
@@ -204,44 +204,52 @@
     <th valign="top">release notes</th>
 </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="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 -->
@@ -287,8 +295,7 @@
           </td>
 
     <td align="right" valign="top">
-      	<a href="http://www.webconceptgroup.net"><img src="/images/logo_sponsor_wcg.jpg" width="131" height="30" border="0" alt="Sponsored by Web Concept Group Inc."></a>
-	<a href="http://sourceforge.net"><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" 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=1241&op=diff
==============================================================================
--- trunk/packages/vim-scripts/syntax/mkd.vim (original)
+++ trunk/packages/vim-scripts/syntax/mkd.vim Tue Apr  8 20:21:47 2008
@@ -2,8 +2,8 @@
 " Language:	Markdown
 " Maintainer:	Ben Williams <benw at plasticboy.com>
 " URL:		http://plasticboy.com/markdown-vim-mode/
-" Version:	6
-" Last Change:  2006 September 1
+" Version:	7
+" Last Change:  2008 March 1
 " Remark:	Uses HTML syntax file
 " Remark:	I don't do anything with angle brackets (<>) because that would too easily
 "		easily conflict with HTML syntax
@@ -38,11 +38,11 @@
 
 "additions to HTML groups
 syn region htmlBold     start=/\*\@<!\*\*\*\@!/     end=/\*\@<!\*\*\*\@!/   contains=@Spell,htmlItalic
-syn region htmlItalic   start=/\*\@<!\*\*\@!/       end=/*\@<!\*\*\@!/      contains=htmlBold 
-syn region htmlBold     start=/_\@<!___\@!/         end=/_\@<!___\@!/       contains=htmlItalic
-syn region htmlItalic   start=/_\@<!__\@!/          end=/_\@<!__\@!/        contains=htmlBold 
+syn region htmlItalic   start=/\*\@<!\*\*\@!/       end=/*\@<!\*\*\@!/      contains=htmlBold, at Spell
+syn region htmlBold     start=/_\@<!___\@!/         end=/_\@<!___\@!/       contains=htmlItalic, at Spell
+syn region htmlItalic   start=/_\@<!__\@!/          end=/_\@<!__\@!/        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
+syn region htmlLink     start="\["ms=s+1            end="\]"me=e-1 contains=@Spell
 syn region htmlString   start="\(\[.*]: *\)\@<=.*"  end="$"
 
 "define Markdown groups
@@ -54,20 +54,22 @@
 syn match  mkdRule      /^\s*\*\{3,5}$/
 syn match  mkdListItem  "^\s*[-*+]\s\+"
 syn match  mkdListItem  "^\s*\d\+\.\s\+"
-syn match  mkdCode      /^\(\s\{4,}\|[\t]\+\)[^*-+ ].*$/
+syn match  mkdCode      /^\s*\n\(\(\s\{4,}\|[\t]\+\)[^*-+ ].*\n\)\+/
 syn region mkdCode      start=/`/                   end=/`/
-syn region mkdCode      start=/\s*``[^`]*/ skip=/`/ end=/[^`]*``\s*/
-syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineContinue
+syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
+syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineContinue, at Spell
+syn region mkdCode      start="<pre[^>]*>"         end="</pre>"
+syn region mkdCode      start="<code[^>]*>"        end="</code>"
 
 "HTML headings
-syn region htmlH1       start="#"                   end="\($\|#\+\)"
-syn region htmlH2       start="##"                  end="\($\|#\+\)"
-syn region htmlH3       start="###"                 end="\($\|#\+\)"
-syn region htmlH4       start="####"                end="\($\|#\+\)"
-syn region htmlH5       start="#####"               end="\($\|#\+\)"
-syn region htmlH6       start="######"              end="\($\|#\+\)"
-syn match  htmlH1       /^.\+\n=\+$/
-syn match  htmlH2       /^.\+\n-\+$/
+syn region htmlH1       start="^\s*#"                   end="\($\|#\+\)" contains=@Spell
+syn region htmlH2       start="^\s*##"                  end="\($\|#\+\)" contains=@Spell
+syn region htmlH3       start="^\s*###"                 end="\($\|#\+\)" contains=@Spell
+syn region htmlH4       start="^\s*####"                end="\($\|#\+\)" contains=@Spell
+syn region htmlH5       start="^\s*#####"               end="\($\|#\+\)" contains=@Spell
+syn region htmlH6       start="^\s*######"              end="\($\|#\+\)" contains=@Spell
+syn match  htmlH1       /^.\+\n=\+$/ contains=@Spell
+syn match  htmlH2       /^.\+\n-\+$/ contains=@Spell
 
 "highlighting for Markdown groups
 HtmlHiLink mkdString	    String




More information about the pkg-vim-maintainers mailing list