Merge branch 'master' into patch-syntax-highlighting

alerque · web-flow · commit 6cf167150a3c · 2025-03-15T12:45:25.000+03:00
diff --git a/doc/pandoc-syntax.txt b/doc/pandoc-syntax.txt
@@ -38,6 +38,7 @@ CONFIGURATION				       *vim-pandoc-syntax-configuration*
   - ellipses
   - quotes
   - inlinecode
+  - inlinemath
 
   To review what are the rules for, look for the call to |s:WithConceal| in
   syntax/pandoc.vim that takes the corresponding  rulename as first argument.
@@ -75,7 +76,7 @@ CONFIGURATION				       *vim-pandoc-syntax-configuration*
   you couldn't tell where the styles are applied.
 
 + *g:pandoc#syntax#style#underline_special*
-  Undeline subscript, superscript and strikeout text styles. Default = 1
+  Underline subscript, superscript and strikeout text styles. Default = 1
 
 + *g:pandoc#syntax#style#use_definition_lists*
   Detect and highlight definition lists. Disabling this can improve
diff --git a/syntax/pandoc.vim b/syntax/pandoc.vim
@@ -51,7 +51,9 @@ if &encoding ==# 'utf-8'
                 \'definition': ' ',
                 \'li': '•',
                 \'html_c_s': '‹',
-                \'html_c_e': '›'}
+                \'html_c_e': '›',
+                \'quote_s': '“',
+                \'quote_e': '”'}
 else
     " ascii defaults
     let s:cchars = {
@@ -170,6 +172,9 @@ function! EnableEmbedsforCodeblocksWithLang(entry)
         let s:langsyntaxfile = matchstr(a:entry, '[^=]*$')
         unlet! b:current_syntax
         exe 'syn include @'.toupper(s:langname).' syntax/'.s:langsyntaxfile.'.vim'
+        " We might have just turned off spellchecking by including the file,
+        " so we turn it back on here.
+        exe 'syntax spell toplevel'
         exe 'syn region pandocDelimitedCodeBlock_' . s:langname . ' start=/\(\_^\([ ]\{4,}\|\t\)\=\(`\{3,}`*\|\~\{3,}\~*\)\s*\%({[^.]*[.=]\)\=' . s:langname . '\>.*\n\)\@<=\_^/' .
                     \' end=/\_$\n\(\([ ]\{4,}\|\t\)\=\(`\{3,}`*\|\~\{3,}\~*\)\_$\n\_$\)\@=/ contained containedin=pandocDelimitedCodeBlock' .
                     \' contains=@' . toupper(s:langname)
@@ -258,8 +263,13 @@ call s:WithConceal('html_c_e', 'syn match pandocHTMLCommentEnd /-->/ contained',
 " Unset current_syntax so the 2nd include will work
 unlet b:current_syntax
 syn include @LATEX syntax/tex.vim
-syn region pandocLaTeXInlineMath start=/\v\\@<!\$\S@=/ end=/\v\\@<!\$\d@!/ keepend contains=@LATEX
-syn region pandocLaTeXInlineMath start=/\\\@<!\\(/ end=/\\\@<!\\)/ keepend contains=@LATEX
+if index(g:pandoc#syntax#conceal#blacklist, 'inlinemath') == -1
+    " Can't use WithConceal here because it will mess up all other conceals
+    " when dollar signs are used normally. It must be skipped entirely if
+    " inlinemath is blacklisted
+    syn region pandocLaTeXInlineMath start=/\v\\@<!\$\S@=/ end=/\v\\@<!\$\d@!/ keepend contains=@LATEX
+    syn region pandocLaTeXInlineMath start=/\\\@<!\\(/ end=/\\\@<!\\)/ keepend contains=@LATEX
+endif
 syn match pandocEscapedDollar /\\\$/ conceal cchar=$
 syn match pandocProtectedFromInlineLaTeX /\\\@<!\${.*}\(\(\s\|[[:punct:]]\)\([^$]*\|.*\(\\\$.*\)\{2}\)\n\n\|$\)\@=/ display
 " contains=@LATEX
@@ -313,7 +323,7 @@ call s:WithConceal('image', 'syn match pandocImageIcon /!\[\@=/ display', 'conce
 " }}}3
 
 " Definitions: {{{3
-syn region pandocReferenceDefinition start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" keepend
+syn region pandocReferenceDefinition start=/\[.\{-}\]:/ end=/\(\n\s*".*"$\|$\)/ keepend
 syn match pandocReferenceDefinitionLabel /\[\zs.\{-}\ze\]:/ contained containedin=pandocReferenceDefinition display
 syn match pandocReferenceDefinitionAddress /:\s*\zs.*/ contained containedin=pandocReferenceDefinition
 syn match pandocReferenceDefinitionTip /\s*".\{-}"/ contained containedin=pandocReferenceDefinition,pandocReferenceDefinitionAddress contains=@Spell,pandocAmpersandEscape
@@ -438,9 +448,9 @@ syn match pandocTableHeaderWord /\<.\{-}\>/ contained containedin=pandocGridTabl
 
 " Delimited Code Blocks: {{{2
 " this is here because we can override strikeouts and subscripts
-syn region pandocDelimitedCodeBlock start=/^\(>\s\)\?\z(\([ ]\{4,}\|\t\)\=\~\{3,}\~*\)/ end=/^\z1\~*/ skipnl contains=pandocDelimitedCodeBlockStart,pandocDelimitedCodeBlockEnd keepend
-syn region pandocDelimitedCodeBlock start=/^\(>\s\)\?\z(\([ ]\{4,}\|\t\)\=`\{3,}`*\)/ end=/^\z1`*/ skipnl contains=pandocDelimitedCodeBlockStart,pandocDelimitedCodeBlockEnd keepend
-call s:WithConceal('codeblock_start', 'syn match pandocDelimitedCodeBlockStart /\(\(\_^\n\_^\|\%^\)\(>\s\)\?\([ ]\{4,}\|\t\)\=\)\@<=\(\~\{3,}\~*\|`\{3,}`*\)/ contained containedin=pandocDelimitedCodeBlock nextgroup=pandocDelimitedCodeBlockLanguage', 'conceal cchar='.s:cchars['codelang'])
+syn region pandocDelimitedCodeBlock start=/^\(>\s\)\?\z(\([ ]\+\|\t\)\=\~\{3,}\~*\)/ end=/^\z1\~*/ skipnl contains=pandocDelimitedCodeBlockStart,pandocDelimitedCodeBlockEnd keepend
+syn region pandocDelimitedCodeBlock start=/^\(>\s\)\?\z(\([ ]\+\|\t\)\=`\{3,}`*\)/ end=/^\z1`*/ skipnl contains=pandocDelimitedCodeBlockStart,pandocDelimitedCodeBlockEnd keepend
+call s:WithConceal('codeblock_start', 'syn match pandocDelimitedCodeBlockStart /\(\(\_^\n\_^\|\%^\)\(>\s\)\?\( \+\|\t\)\=\)\@<=\(\~\{3,}\~*\|`\{3,}`*\)/ contained containedin=pandocDelimitedCodeBlock nextgroup=pandocDelimitedCodeBlockLanguage', 'conceal cchar='.s:cchars['codelang'])
 syn match pandocDelimitedCodeBlockLanguage /\(\s\?\)\@<=.\+\(\_$\)\@=/ contained
 call s:WithConceal('codeblock_delim', 'syn match pandocDelimitedCodeBlockEnd /\(`\{3,}`*\|\~\{3,}\~*\)\(\_$\n\(>\s\)\?\_$\)\@=/ contained containedin=pandocDelimitedCodeBlock', 'conceal cchar='.s:cchars['codeend'])
 syn match pandocBlockQuoteinDelimitedCodeBlock '^>' contained containedin=pandocDelimitedCodeBlock
@@ -540,8 +550,8 @@ endif
 
 " Quotes: {{{3
 if &encoding ==# 'utf-8'
-    call s:WithConceal('quotes', 'syn match pandocBeginQuote /"\</  containedin=pandocEmphasis,pandocStrong,pandocListItem,pandocListItemContinuation,pandocUListItem display', 'conceal cchar=“')
-    call s:WithConceal('quotes', 'syn match pandocEndQuote /\(\>[[:punct:]]*\)\@<="[[:blank:][:punct:]\n]\@=/  containedin=pandocEmphasis,pandocStrong,pandocUListItem,pandocListItem,pandocListItemContinuation display', 'conceal cchar=”')
+    call s:WithConceal('quotes', 'syn match pandocBeginQuote /"\</  containedin=pandocEmphasis,pandocStrong,pandocListItem,pandocListItemContinuation,pandocUListItem display', 'conceal cchar='.s:cchars['quote_s'])
+    call s:WithConceal('quotes', 'syn match pandocEndQuote /\(\>[[:punct:]]*\)\@<="[[:blank:][:punct:]\n]\@=/  containedin=pandocEmphasis,pandocStrong,pandocUListItem,pandocListItem,pandocListItemContinuation display', 'conceal cchar='.s:cchars['quote_e'])
 endif
 " }}}3
 
@@ -571,130 +581,163 @@ syn region pandocYAMLHeader start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/
 " }}}1
 
 " Styling: {{{1
-hi link pandocOperator Operator
-
-" override this for consistency
-hi pandocTitleBlock term=italic gui=italic
-hi link pandocTitleBlockTitle Directory
-hi link pandocAtxHeader Title
-hi link pandocAtxStart Operator
-hi link pandocSetexHeader Title
-hi link pandocHeaderAttr Comment
-hi link pandocHeaderID Identifier
-
-hi link pandocLaTexSectionCmd texSection
-hi link pandocLaTeXDelimiter texDelimiter
-
-hi link pandocHTMLComment Comment
-hi link pandocHTMLCommentStart Delimiter
-hi link pandocHTMLCommentEnd Delimiter
-hi link pandocBlockQuote Comment
-hi link pandocBlockQuoteMark Comment
-hi link pandocAmpersandEscape Special
-
-" if the user sets g:pandoc#syntax#codeblocks#ignore to contain
-" a codeblock type, don't highlight it so that it remains Normal
-if index(g:pandoc#syntax#codeblocks#ignore, 'definition') == -1
-  hi link pandocCodeBlockInsideIndent String
-endif
-
-if index(g:pandoc#syntax#codeblocks#ignore, 'delimited') == -1
-  hi link pandocDelimitedCodeBlock Special
-endif
-
-hi link pandocDelimitedCodeBlockStart Delimiter
-hi link pandocDelimitedCodeBlockEnd Delimiter
-hi link pandocDelimitedCodeBlockLanguage Comment
-hi link pandocBlockQuoteinDelimitedCodeBlock pandocBlockQuote
-hi link pandocCodePre String
-
-hi link pandocLineBlockDelimiter Delimiter
-
-hi link pandocListItemBullet Operator
-hi link pandocUListItemBullet Operator
-hi link pandocListItemBulletId Identifier
-
-hi link pandocReferenceLabel Label
-hi link pandocReferenceURL Underlined
-hi link pandocLinkTip Identifier
-hi link pandocImageIcon Operator
-
-hi link pandocReferenceDefinition Operator
-hi link pandocReferenceDefinitionLabel Label
-hi link pandocReferenceDefinitionAddress Underlined
-hi link pandocReferenceDefinitionTip Identifier
-
-hi link pandocAutomaticLink Underlined
-
-hi link pandocDefinitionBlockTerm Identifier
-hi link pandocDefinitionBlockMark Operator
-
-hi link pandocSimpleTableDelims Delimiter
-hi link pandocSimpleTableHeader pandocStrong
-hi link pandocTableMultilineHeader pandocStrong
-hi link pandocTableDelims Delimiter
-hi link pandocGridTableDelims Delimiter
-hi link pandocGridTableHeader Delimiter
-hi link pandocPipeTableDelims Delimiter
-hi link pandocPipeTableHeader Delimiter
-hi link pandocTableHeaderWord pandocStrong
-
-hi link pandocAbbreviationHead Type
-hi link pandocAbbreviation Label
-hi link pandocAbbreviationTail Type
-hi link pandocAbbreviationSeparator Identifier
-hi link pandocAbbreviationDefinition Comment
-
-hi link pandocFootnoteID Label
-hi link pandocFootnoteIDHead Type
-hi link pandocFootnoteIDTail Type
-hi link pandocFootnoteDef Comment
-hi link pandocFootnoteDefHead Type
-hi link pandocFootnoteDefTail Type
-hi link pandocFootnoteBlock Comment
-hi link pandocFootnoteBlockSeparator Operator
-
-hi link pandocPCite Operator
-hi link pandocICite Operator
-hi link pandocCiteKey Label
-hi link pandocCiteAnchor Operator
-hi link pandocCiteLocator Operator
-
-if g:pandoc#syntax#style#emphases == 1
-    hi pandocEmphasis gui=italic cterm=italic
-    hi pandocStrong gui=bold cterm=bold
-    hi pandocStrongEmphasis gui=bold,italic cterm=bold,italic
-    hi pandocStrongInEmphasis gui=bold,italic cterm=bold,italic
-    hi pandocEmphasisInStrong gui=bold,italic cterm=bold,italic
-    if !exists('s:hi_tail')
-        let s:fg = '' " Vint can't figure ou these get set dynamically
-        let s:bg = '' " so initialize them manually first
-        for s:i in ['fg', 'bg']
-            let s:tmp_val = synIDattr(synIDtrans(hlID('String')), s:i)
-            let s:tmp_ui =  has('gui_running') || (has('termguicolors') && &termguicolors) ? 'gui' : 'cterm'
-            if !empty(s:tmp_val) && s:tmp_val != -1
-                exe 'let s:'.s:i . ' = "'.s:tmp_ui.s:i.'='.s:tmp_val.'"'
-            else
-                exe 'let s:'.s:i . ' = ""'
-            endif
-        endfor
-        let s:hi_tail = ' '.s:fg.' '.s:bg
-    endif
-    exe 'hi pandocNoFormattedInEmphasis gui=italic cterm=italic'.s:hi_tail
-    exe 'hi pandocNoFormattedInStrong gui=bold cterm=bold'.s:hi_tail
-endif
-hi link pandocNoFormatted String
-hi link pandocNoFormattedAttrs Comment
-hi link pandocSubscriptMark Operator
-hi link pandocSuperscriptMark Operator
-hi link pandocStrikeoutMark Operator
-if g:pandoc#syntax#style#underline_special == 1
-    hi pandocSubscript gui=underline cterm=underline
-    hi pandocSuperscript gui=underline cterm=underline
-    hi pandocStrikeout gui=underline cterm=underline
-endif
-hi link pandocNewLine Error
-hi link pandocHRule Delimiter
+function! s:SetupPandocHighlights()
+
+  hi link pandocOperator Operator
+
+  " override this for consistency
+  hi pandocTitleBlock term=italic gui=italic
+  hi link pandocTitleBlockTitle Directory
+  hi link pandocAtxHeader Title
+  hi link pandocAtxStart Operator
+  hi link pandocSetexHeader Title
+  hi link pandocHeaderAttr Comment
+  hi link pandocHeaderID Identifier
+
+  hi link pandocLaTexSectionCmd texSection
+  hi link pandocLaTeXDelimiter texDelimiter
+
+  hi link pandocHTMLComment Comment
+  hi link pandocHTMLCommentStart Delimiter
+  hi link pandocHTMLCommentEnd Delimiter
+  hi link pandocBlockQuote Comment
+  hi link pandocBlockQuoteMark Comment
+  hi link pandocAmpersandEscape Special
+
+  " if the user sets g:pandoc#syntax#codeblocks#ignore to contain
+  " a codeblock type, don't highlight it so that it remains Normal
+  if index(g:pandoc#syntax#codeblocks#ignore, 'definition') == -1
+    hi link pandocCodeBlockInsideIndent String
+  endif
+
+  if index(g:pandoc#syntax#codeblocks#ignore, 'delimited') == -1
+    hi link pandocDelimitedCodeBlock Special
+  endif
+
+  hi link pandocDelimitedCodeBlockStart Delimiter
+  hi link pandocDelimitedCodeBlockEnd Delimiter
+  hi link pandocDelimitedCodeBlockLanguage Comment
+  hi link pandocBlockQuoteinDelimitedCodeBlock pandocBlockQuote
+  hi link pandocCodePre String
+
+  hi link pandocLineBlockDelimiter Delimiter
+
+  hi link pandocListItemBullet Operator
+  hi link pandocUListItemBullet Operator
+  hi link pandocListItemBulletId Identifier
+
+  hi link pandocReferenceLabel Label
+  hi link pandocReferenceURL Underlined
+  hi link pandocLinkTip Identifier
+  hi link pandocImageIcon Operator
+
+  hi link pandocReferenceDefinition Operator
+  hi link pandocReferenceDefinitionLabel Label
+  hi link pandocReferenceDefinitionAddress Underlined
+  hi link pandocReferenceDefinitionTip Identifier
+
+  hi link pandocAutomaticLink Underlined
+
+  hi link pandocDefinitionBlockTerm Identifier
+  hi link pandocDefinitionBlockMark Operator
+
+  hi link pandocSimpleTableDelims Delimiter
+  hi link pandocSimpleTableHeader pandocStrong
+  hi link pandocTableMultilineHeader pandocStrong
+  hi link pandocTableDelims Delimiter
+  hi link pandocGridTableDelims Delimiter
+  hi link pandocGridTableHeader Delimiter
+  hi link pandocPipeTableDelims Delimiter
+  hi link pandocPipeTableHeader Delimiter
+  hi link pandocTableHeaderWord pandocStrong
+
+  hi link pandocAbbreviationHead Type
+  hi link pandocAbbreviation Label
+  hi link pandocAbbreviationTail Type
+  hi link pandocAbbreviationSeparator Identifier
+  hi link pandocAbbreviationDefinition Comment
+
+  hi link pandocFootnoteID Label
+  hi link pandocFootnoteIDHead Type
+  hi link pandocFootnoteIDTail Type
+  hi link pandocFootnoteDef Comment
+  hi link pandocFootnoteDefHead Type
+  hi link pandocFootnoteDefTail Type
+  hi link pandocFootnoteBlock Comment
+  hi link pandocFootnoteBlockSeparator Operator
+
+  hi link pandocPCite Operator
+  hi link pandocICite Operator
+  hi link pandocCiteKey Label
+  hi link pandocCiteAnchor Operator
+  hi link pandocCiteLocator Operator
+
+  if g:pandoc#syntax#style#emphases == 1
+      hi pandocEmphasis gui=italic cterm=italic
+      hi pandocStrong gui=bold cterm=bold
+      hi pandocStrongEmphasis gui=bold,italic cterm=bold,italic
+      hi pandocStrongInEmphasis gui=bold,italic cterm=bold,italic
+      hi pandocEmphasisInStrong gui=bold,italic cterm=bold,italic
+      if !exists('s:hi_tail')
+          let s:fg = '' " Vint can't figure ou these get set dynamically
+          let s:bg = '' " so initialize them manually first
+          for s:i in ['fg', 'bg']
+              let s:tmp_val = synIDattr(synIDtrans(hlID('String')), s:i)
+              let s:tmp_ui =  has('gui_running') || (has('termguicolors') && &termguicolors) ? 'gui' : 'cterm'
+              if !empty(s:tmp_val) && s:tmp_val != -1
+                  exe 'let s:'.s:i . ' = "'.s:tmp_ui.s:i.'='.s:tmp_val.'"'
+              else
+                  exe 'let s:'.s:i . ' = ""'
+              endif
+          endfor
+          let s:hi_tail = ' '.s:fg.' '.s:bg
+      endif
+      exe 'hi pandocNoFormattedInEmphasis gui=italic cterm=italic'.s:hi_tail
+      exe 'hi pandocNoFormattedInStrong gui=bold cterm=bold'.s:hi_tail
+  endif
+  hi link pandocNoFormatted String
+  hi link pandocNoFormattedAttrs Comment
+  hi link pandocSubscriptMark Operator
+  hi link pandocSuperscriptMark Operator
+  hi link pandocStrikeoutMark Operator
+  if g:pandoc#syntax#style#underline_special == 1
+      hi pandocSubscript gui=underline cterm=underline
+      hi pandocSuperscript gui=underline cterm=underline
+      hi pandocStrikeout gui=underline cterm=underline
+  endif
+  hi link pandocNewLine Error
+  hi link pandocHRule Delimiter
+
+endfunction
+
+" Whenever the colorscheme changes, all highlights are cleared.
+"
+" The most common circumstance is that the vimrc picks a colorscheme *at
+" startup*, then a file is opened and the syntax is set based on that file. So
+" the most common situation is that the colorscheme runs, then the syntax
+" runs, and that's that. So if the code for the syntax (e.g., this code here
+" in vim-pandoc-syntax) *adds* new highlighting groups that weren't defined in
+" the colorscheme, that's almost always fine because the colorscheme rarely
+" changes after startup.
+"
+" But the colorscheme *can* change after startup. This happens for example any
+" time the user toggles their background (:set bg=light or :set bg=dark), or
+" picks another colorscheme (:colorscheme something_else). In these cases, the
+" new colorscheme calls `:highlight clear`, clearing any custom pandoc
+" highlighting groups.
+"
+" The solution is to register an autocommand that runs whenever the
+" ColorScheme changes, so that we can re-register vim-pandoc-syntax's custom
+" highlighting groups, after the new colorscheme has cleared them.
+"
+" (This also affects popular plugins like goyo.vim, which call `:colorscheme`
+" with your chosen colorscheme to approximate undoing any custom highlighting
+" modifications that they've made.)
+augroup vim-pandoc-syntax
+  autocmd!
+  autocmd ColorScheme * call s:SetupPandocHighlights()
+augroup end
+call s:SetupPandocHighlights()
 
 " }}}1
 
