Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 72792615e7 | |||
| 5cca07970c | |||
| 705ad1e0dd | |||
| 7ad424ea42 | |||
| 69318e74c8 |
@@ -262,11 +262,20 @@ function! vimwiki#base#resolve_link(link_text, ...) abort
|
|||||||
\ vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
\ vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
" append extension iff one not already present or it's not the targeted
|
" append extension if one not already present or it's not the targeted
|
||||||
" wiki extension - https://github.com/vimwiki/vimwiki/issues/950
|
" wiki extension - https://github.com/vimwiki/vimwiki/issues/950
|
||||||
let ext = fnamemodify(link_text, ':e')
|
let ext = fnamemodify(link_text, ':e')
|
||||||
let ext_with_dot = '.' . ext
|
let ext_with_dot = '.' . ext
|
||||||
if ext ==? '' || ext_with_dot !=? vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
|
||||||
|
" Check if a .md must be added
|
||||||
|
" See #1271 to modify files with a "."
|
||||||
|
let do_add_ext = ext ==? ''
|
||||||
|
if vimwiki#vars#get_syntaxlocal('open_link_add_ext')
|
||||||
|
let do_add_ext = do_add_ext || ext_with_dot !=? vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Add the dot
|
||||||
|
if do_add_ext
|
||||||
let link_infos.filename .= vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
let link_infos.filename .= vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -100,7 +100,8 @@ function! s:normalize_link_syntax_n() abort
|
|||||||
let sub = vimwiki#base#normalize_link_in_diary(lnk)
|
let sub = vimwiki#base#normalize_link_in_diary(lnk)
|
||||||
else
|
else
|
||||||
let sub = vimwiki#base#normalize_link_helper(lnk,
|
let sub = vimwiki#base#normalize_link_helper(lnk,
|
||||||
\ vimwiki#vars#get_global('rxWord'), '',
|
\ vimwiki#vars#get_global('rxWord'),
|
||||||
|
\ vimwiki#vars#get_global('rxWord'),
|
||||||
\ vimwiki#vars#get_syntaxlocal('Link1'))
|
\ vimwiki#vars#get_syntaxlocal('Link1'))
|
||||||
endif
|
endif
|
||||||
call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
|
call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
|
||||||
|
|||||||
@@ -851,6 +851,10 @@ function! s:get_common_syntaxlocal() abort
|
|||||||
" HTML comment
|
" HTML comment
|
||||||
let res.comment_regex = {'type': type(''), 'default': '\%(^\s*%%.*$\|<!--\%([^>]\|\n\)*-->\)'}
|
let res.comment_regex = {'type': type(''), 'default': '\%(^\s*%%.*$\|<!--\%([^>]\|\n\)*-->\)'}
|
||||||
|
|
||||||
|
" Opening link with dot in the ref, see #1271 and ref and Brennen comment:
|
||||||
|
" -- https://github.com/vimwiki/vimwiki/issues/1271#issuecomment-1482207680
|
||||||
|
let res.open_link_add_ext = {'type': type(1), 'default': 1}
|
||||||
|
|
||||||
return res
|
return res
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1521,7 +1521,7 @@ In this case, <mathjax_folder> would be "../mathjax" (without quotes).
|
|||||||
2. Loading MathJax from a CDN-server (needs internet connection).
|
2. Loading MathJax from a CDN-server (needs internet connection).
|
||||||
Add to your HTML template the following lines:
|
Add to your HTML template the following lines:
|
||||||
|
|
||||||
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
<script src="https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=es6"></script>
|
||||||
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
||||||
|
|
||||||
|
|
||||||
@@ -3282,7 +3282,7 @@ cannot otherwise convert the link. A customized handler might look like this: >
|
|||||||
let str = a:value
|
let str = a:value
|
||||||
|
|
||||||
" complete URL
|
" complete URL
|
||||||
let url_0 = matchstr(str, g:vimwiki_rxWikiInclMatchUrl)
|
let url_0 = matchstr(str, g:vimwiki_global_vars.rxWikiInclMatchUrl)
|
||||||
" URL parts
|
" URL parts
|
||||||
let link_infos = vimwiki#base#resolve_link(url_0)
|
let link_infos = vimwiki#base#resolve_link(url_0)
|
||||||
let arg1 = matchstr(str, VimwikiWikiInclMatchArg(1))
|
let arg1 = matchstr(str, VimwikiWikiInclMatchArg(1))
|
||||||
|
|||||||
+1
-1
@@ -257,7 +257,7 @@ Expect (Correctly formatted tags file):
|
|||||||
!_TAG_PROGRAM_AUTHOR Vimwiki
|
!_TAG_PROGRAM_AUTHOR Vimwiki
|
||||||
!_TAG_PROGRAM_NAME Vimwiki Tags
|
!_TAG_PROGRAM_NAME Vimwiki Tags
|
||||||
!_TAG_PROGRAM_URL https://github.com/vimwiki/vimwiki
|
!_TAG_PROGRAM_URL https://github.com/vimwiki/vimwiki
|
||||||
!_TAG_PROGRAM_VERSION 2023.05.12
|
!_TAG_PROGRAM_VERSION 2024.01.24
|
||||||
second-tag Test-Tag.md 13;" vimwiki:Test-Tag\tTest-Tag#second-tag\tTest-Tag#second-tag
|
second-tag Test-Tag.md 13;" vimwiki:Test-Tag\tTest-Tag#second-tag\tTest-Tag#second-tag
|
||||||
test-tag Test-Tag.md 5;" vimwiki:Test-Tag\tTest-Tag#a-header\tA header
|
test-tag Test-Tag.md 5;" vimwiki:Test-Tag\tTest-Tag#a-header\tA header
|
||||||
top-tag Test-Tag.md 1;" vimwiki:Test-Tag\tTest-Tag\tTest-Tag
|
top-tag Test-Tag.md 1;" vimwiki:Test-Tag\tTest-Tag\tTest-Tag
|
||||||
|
|||||||
Reference in New Issue
Block a user