diff options
author | Stuart Rackham <srackham@methods.co.nz> | 2012-12-29 08:41:53 +1300 |
---|---|---|
committer | Stuart Rackham <srackham@methods.co.nz> | 2012-12-29 08:41:53 +1300 |
commit | b6a42208641810a87eb34c9c609636137c063044 (patch) | |
tree | d4a483949347d3afd75c574c90b688f72b746e3c | |
parent | 128fb493ab6502cac2f5ec053e06dc88eea2c0ed (diff) | |
download | asciidoc-b6a42208641810a87eb34c9c609636137c063044.tar.gz |
- Vim syntax file: closing quote character cannot be immediately
followed by same closing quote character.
- Documentation updates.
-rw-r--r-- | doc/asciidoc.txt | 2 | ||||
-rw-r--r-- | examples/website/index.txt | 5 | ||||
-rw-r--r-- | vim/syntax/asciidoc.vim | 14 |
3 files changed, 13 insertions, 8 deletions
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt index 165fb61..0ada785 100644 --- a/doc/asciidoc.txt +++ b/doc/asciidoc.txt @@ -1288,7 +1288,7 @@ line by itself: following block element -- the attributes are made available to the block's markup template. - Multiple contiguous 'AttributeList' elements are additively combined - in the order they appear.. + in the order they appear. - The first positional attribute in the list is often used to specify the ensuing element's <<X23,style>>. diff --git a/examples/website/index.txt b/examples/website/index.txt index d116ba3..104edf2 100644 --- a/examples/website/index.txt +++ b/examples/website/index.txt @@ -326,6 +326,11 @@ github] that converts DocBook to AsciiDoc. https://code.google.com/p/asciidoc-diag-filter/[blockdiag filter for Asciidoc] which embeds http://blockdiag.com/[blockdiag] images in AsciiDoc documents. +- Dan Allen has written a + https://github.com/mojavelinux/asciidoc-bootstrap-docs-backend[Bootstrap + backend] for AsciiDoc. +- Steven Boscarine has written + https://github.com/StevenBoscarine/JavaAsciidocWrapper[Maven wrapper for AsciiDoc]. Please let me know if any of these links need updating. diff --git a/vim/syntax/asciidoc.vim b/vim/syntax/asciidoc.vim index 678e699..a0c53ea 100644 --- a/vim/syntax/asciidoc.vim +++ b/vim/syntax/asciidoc.vim @@ -47,21 +47,21 @@ syn match asciidocQuotedAttributeList /\\\@<!\[[a-zA-Z0-9_-][a-zA-Z0-9 _-]*\][+_ syn match asciidocQuotedSubscript /\\\@<!\~\S\_.\{-}\(\~\|\n\s*\n\)/ contains=asciidocEntityRef syn match asciidocQuotedSuperscript /\\\@<!\^\S\_.\{-}\(\^\|\n\s*\n\)/ contains=asciidocEntityRef -syn match asciidocQuotedMonospaced /\(^\|[| \t([.,=\]]\)\@<=+\([ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(+\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef -syn match asciidocQuotedMonospaced2 /\(^\|[| \t([.,=\]]\)\@<=`\([ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(`\([| \t)[\],.?!;:=]\|$\)\@=\)/ +syn match asciidocQuotedMonospaced /\(^\|[| \t([.,=\]]\)\@<=+\([+ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(+\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef +syn match asciidocQuotedMonospaced2 /\(^\|[| \t([.,=\]]\)\@<=`\([` )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(`\([| \t)[\],.?!;:=]\|$\)\@=\)/ syn match asciidocQuotedUnconstrainedMonospaced /[\\+]\@<!++\S\_.\{-}\(++\|\n\s*\n\)/ contains=asciidocEntityRef -syn match asciidocQuotedEmphasized /\(^\|[| \t([.,=\]]\)\@<=_\([ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(_\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef -syn match asciidocQuotedEmphasized2 /\(^\|[| \t([.,=\]]\)\@<='\([ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\('\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef +syn match asciidocQuotedEmphasized /\(^\|[| \t([.,=\]]\)\@<=_\([_ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(_\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef +syn match asciidocQuotedEmphasized2 /\(^\|[| \t([.,=\]]\)\@<='\([' )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\('\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef syn match asciidocQuotedUnconstrainedEmphasized /\\\@<!__\S\_.\{-}\(__\|\n\s*\n\)/ contains=asciidocEntityRef -syn match asciidocQuotedBold /\(^\|[| \t([.,=\]]\)\@<=\*\([ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(\*\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef +syn match asciidocQuotedBold /\(^\|[| \t([.,=\]]\)\@<=\*\([* )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(\*\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef syn match asciidocQuotedUnconstrainedBold /\\\@<!\*\*\S\_.\{-}\(\*\*\|\n\s*\n\)/ contains=asciidocEntityRef " Don't allow ` in single quoted (a kludge to stop confusion with `monospaced`). -syn match asciidocQuotedSingleQuoted /\(^\|[| \t([.,=\]]\)\@<=`\([ )\n\t]\)\@!\([^`]\|\n\(\s*\n\)\@!\)\{-}[^` \t]\('\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef +syn match asciidocQuotedSingleQuoted /\(^\|[| \t([.,=\]]\)\@<=`\([` )\n\t]\)\@!\([^`]\|\n\(\s*\n\)\@!\)\{-}[^` \t]\('\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef -syn match asciidocQuotedDoubleQuoted /\(^\|[| \t([.,=\]]\)\@<=``\([ )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(''\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef +syn match asciidocQuotedDoubleQuoted /\(^\|[| \t([.,=\]]\)\@<=``\([` )\n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(''\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef syn match asciidocDoubleDollarPassthrough /\\\@<!\(^\|[^0-9a-zA-Z$]\)\@<=\$\$..\{-}\(\$\$\([^0-9a-zA-Z$]\|$\)\@=\|^$\)/ syn match asciidocTriplePlusPassthrough /\\\@<!\(^\|[^0-9a-zA-Z$]\)\@<=+++..\{-}\(+++\([^0-9a-zA-Z$]\|$\)\@=\|^$\)/ |