diff options
| author | Stuart Rackham <srackham@methods.co.nz> | 2012-08-22 16:11:28 +1200 |
|---|---|---|
| committer | Stuart Rackham <srackham@methods.co.nz> | 2012-08-22 16:11:28 +1200 |
| commit | 44fb1f2bbdc608840ad5c7100586fb15129723e5 (patch) | |
| tree | e15ceb8472d6eb93eae756b0d73af321edf99898 | |
| parent | 3d784d57a2cb9007c30cc8ab079e6d51049c2dbd (diff) | |
| download | asciidoc-44fb1f2bbdc608840ad5c7100586fb15129723e5.tar.gz | |
- Vim syntax highligher: Highlight closing OpenBlock delimiter when it
immediately follows a list.
- Documentation updates.
| -rw-r--r-- | doc/asciidoc.txt | 6 | ||||
| -rw-r--r-- | vim/syntax/asciidoc.vim | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt index b7a98f0..730820f 100644 --- a/doc/asciidoc.txt +++ b/doc/asciidoc.txt @@ -519,8 +519,8 @@ stylesheet and to optionally include additional JavaScript code. locations as <<X35,other CSS and JavaScript files>>. For example, the command-line option `--theme foo` (or `--attribute -theme=foo`) will cause asciidoc(1) to search <<"X27","configuration -file locations 1, 2 and 3">> for a sub-directory called `themes/foo` +theme=foo`) will cause asciidoc(1) to search <<X27,configuration +file locations 1, 2 and 3>> for a sub-directory called `themes/foo` containing the stylesheet `foo.css` and optionally a JavaScript file name `foo.js`. @@ -4020,7 +4020,7 @@ macro name): \\NEW!=NEW! The only difference between the three replacement types is how they -are applied. By default 'replacements' and 'replacement2' are applied +are applied. By default 'replacements' and 'replacements2' are applied in <<X102,normal>> substitution contexts whereas 'replacements3' needs to be configured explicitly and should only be used in backend configuration files. diff --git a/vim/syntax/asciidoc.vim b/vim/syntax/asciidoc.vim index dc5c91a..213ec79 100644 --- a/vim/syntax/asciidoc.vim +++ b/vim/syntax/asciidoc.vim @@ -105,7 +105,7 @@ syn region asciidocListLabel start=/^\s*/ end=/\(:\{2,4}\|;;\)$/ oneline contain " DEPRECATED: Horizontal label. syn region asciidocHLabel start=/^\s*/ end=/\(::\|;;\)\(\s\+\|\\$\)/ oneline contains=asciidocQuoted.*,asciidocMacroAttributes keepend " Starts with any of the above. -syn region asciidocList start=/^\s*\(-\|\*\{1,5}\)\s/ start=/^\s*\(\(\d\+\.\)\|\.\{1,5}\|\(\a\.\)\|\([ivxIVX]\+)\)\)\s\+/ start=/.\+\(:\{2,4}\|;;\)$/ end=/\(^[=*]\{4,}$\)\@=/ end=/\(^+\?\s*$\)\@=/ contains=asciidocList.\+,asciidocQuoted.*,asciidocMacroAttributes,asciidocAttributeRef,asciidocEntityRef,asciidocEmail,asciidocURL,asciidocBackslash,asciidocCommentLine,asciidocAttributeList,asciidocToDo +syn region asciidocList start=/^\s*\(-\|\*\{1,5}\)\s/ start=/^\s*\(\(\d\+\.\)\|\.\{1,5}\|\(\a\.\)\|\([ivxIVX]\+)\)\)\s\+/ start=/.\+\(:\{2,4}\|;;\)$/ end=/\(^[=*]\{4,}$\)\@=/ end=/\(^\(+\|--\)\?\s*$\)\@=/ contains=asciidocList.\+,asciidocQuoted.*,asciidocMacroAttributes,asciidocAttributeRef,asciidocEntityRef,asciidocEmail,asciidocURL,asciidocBackslash,asciidocCommentLine,asciidocAttributeList,asciidocToDo highlight link asciidocAdmonition Special highlight link asciidocAnchorMacro Macro |