mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-04 15:29:56 +00:00
Code Issues Releases Wiki Activity

move captionField in front of tagField

Browse Source
This commit is contained in:
pmario 2024-02-07 13:17:38 +01:00
parent ce0df075dd
commit f0d7c8bbd6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/wiki/macros/toc.tid
View File

@ -104,7 +104,7 @@ Simple toc macro which alwayse shows the full tree
This macro is _not_ used by other toc-macros This macro is _not_ used by other toc-macros
v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
================================================================== --> ================================================================== -->
\procedure toc(tag, sort:"", itemClassFilter, exclude, tagField, parentField, captionField, itemTemplate) \procedure toc(tag,sort:"",itemClassFilter,exclude,captionField,tagField,parentField,itemTemplate)
<$macrocall $name="toc-body" tag=<<tag>> sort=<<sort>> exclude=<<exclude>>/> <$macrocall $name="toc-body" tag=<<tag>> sort=<<sort>> exclude=<<exclude>>/>
\end \end
@ -133,7 +133,7 @@ v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
\function tf.toc-stateTitle() [[$:/state/toc]] [<path>] "/" [<currentTiddler>] +[join[]] \function tf.toc-stateTitle() [[$:/state/toc]] [<path>] "/" [<currentTiddler>] +[join[]]
\procedure toc-linked-expandable-body(tag,sort:"",itemClassFilter,exclude,path,tagField,parentField,captionField,itemTemplate) \procedure toc-linked-expandable-body(tag,sort:"",itemClassFilter,exclude,path,captionField,tagField,parentField,itemTemplate)
<$qualify name="toc-state" title=<<tf.toc-stateTitle>> > <$qualify name="toc-state" title=<<tf.toc-stateTitle>> >
<li class=<<tf.toc-itemClass>>> <li class=<<tf.toc-itemClass>>>
<!-- v5.1.23 use target-field if present in tiddler --> <!-- v5.1.23 use target-field if present in tiddler -->
@ -145,7 +145,7 @@ v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall $name="toc-expandable" <$macrocall $name="toc-expandable"
tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% endif %> <% endif %>
@ -153,7 +153,7 @@ v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
</$qualify> </$qualify>
\end \end
\procedure toc-unlinked-expandable-body(tag,sort:"",itemClassFilter,exclude,path,tagField,parentField,captionField,itemTemplate) \procedure toc-unlinked-expandable-body(tag,sort:"",itemClassFilter,exclude,path,captionField,tagField,parentField,itemTemplate)
<$qualify name="toc-state" title=<<tf.toc-stateTitle>>> <$qualify name="toc-state" title=<<tf.toc-stateTitle>>>
<li class=<<tf.toc-itemClass>>> <li class=<<tf.toc-itemClass>>>
<<toc-item isUnlinked:"yes">> <<toc-item isUnlinked:"yes">>
@ -161,7 +161,7 @@ v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall $name="toc-expandable" <$macrocall $name="toc-expandable"
tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% endif %> <% endif %>
@ -172,7 +172,7 @@ v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
<!-- ========================================================== <!-- ==========================================================
Shows an expandable toc. Item always have an open/close chevron Shows an expandable toc. Item always have an open/close chevron
=============================================================== --> =============================================================== -->
\procedure toc-expandable(tag,sort:"",itemClassFilter:"",exclude,path,tagField,parentField,captionField,itemTemplate) \procedure toc-expandable(tag,sort:"",itemClassFilter:"",exclude,path,captionField,tagField,parentField,itemTemplate)
<$set name=currentTiddler filter="[<parentField>!is[blank]then<tag>else<currentTiddler>]"> <$set name=currentTiddler filter="[<parentField>!is[blank]then<tag>else<currentTiddler>]">
<ol class="tc-toc toc-expandable"> <ol class="tc-toc toc-expandable">
<!-- text substitution is needed for backwards compatibility --> <!-- text substitution is needed for backwards compatibility -->
@ -185,13 +185,13 @@ Shows an expandable toc. Item always have an open/close chevron
<% if [all[current]toc-link[no]] %> <% if [all[current]toc-link[no]] %>
<$macrocall $name="toc-unlinked-expandable-body" <$macrocall $name="toc-unlinked-expandable-body"
tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% else %> <% else %>
<$macrocall $name="toc-linked-expandable-body" <$macrocall $name="toc-linked-expandable-body"
tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% endif %> <% endif %>
@ -205,7 +205,7 @@ Shows an expandable toc. Item always have an open/close chevron
\function tf.toc-curTidInclude() [<currentTiddler>get<toc-includeField>] \function tf.toc-curTidInclude() [<currentTiddler>get<toc-includeField>]
\procedure toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path,tagField,parentField,captionField,itemTemplate) \procedure toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path,captionField,tagField,parentField,itemTemplate)
<$qualify name="toc-state" title=<<tf.toc-stateTitle>>> <$qualify name="toc-state" title=<<tf.toc-stateTitle>>>
<li class=<<tf.toc-itemClass>>> <li class=<<tf.toc-itemClass>>>
<!-- v5.1.23 use target-field if present in tiddler --> <!-- v5.1.23 use target-field if present in tiddler -->
@ -226,7 +226,7 @@ Shows an expandable toc. Item always have an open/close chevron
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall $name="toc-selective-expandable" <$macrocall $name="toc-selective-expandable"
tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
@ -235,7 +235,7 @@ Shows an expandable toc. Item always have an open/close chevron
</$qualify> </$qualify>
\end \end
\procedure toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path,tagField,parentField,captionField,itemTemplate) \procedure toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path,captionField,tagField,parentField,itemTemplate)
<$qualify name="toc-state" title=<<tf.toc-stateTitle>> > <$qualify name="toc-state" title=<<tf.toc-stateTitle>> >
<li class=<<tf.toc-itemClass>>> <li class=<<tf.toc-itemClass>>>
<% if [has<parentField>] :filter[get<parentField>match<..currentTiddler>] +[limit[1]] %> <% if [has<parentField>] :filter[get<parentField>match<..currentTiddler>] +[limit[1]] %>
@ -254,7 +254,7 @@ Shows an expandable toc. Item always have an open/close chevron
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall $name="toc-selective-expandable" <$macrocall $name="toc-selective-expandable"
tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% endif %> <% endif %>
@ -266,7 +266,7 @@ Shows an expandable toc. Item always have an open/close chevron
Shows a selctive expandable toc. Shows a selctive expandable toc.
If an item has no children, there is no open/close chevron If an item has no children, there is no open/close chevron
========================================================== --> ========================================================== -->
\procedure toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path,tagField,parentField,captionField,itemTemplate) \procedure toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path,captionField,tagField,parentField,itemTemplate)
<$set name=currentTiddler filter="[<parentField>!is[blank]then<tag>else<currentTiddler>]"> <$set name=currentTiddler filter="[<parentField>!is[blank]then<tag>else<currentTiddler>]">
<ol class="tc-toc toc-selective-expandable"> <ol class="tc-toc toc-selective-expandable">
<!-- text substitution is needed for backwards compatibility --> <!-- text substitution is needed for backwards compatibility -->
@ -279,13 +279,13 @@ If an item has no children, there is no open/close chevron
<% if [all[current]toc-link[no]] %> <% if [all[current]toc-link[no]] %>
<$macrocall $name="toc-unlinked-selective-expandable-body" <$macrocall $name="toc-unlinked-selective-expandable-body"
tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% else %> <% else %>
<$macrocall $name="toc-linked-selective-expandable-body" <$macrocall $name="toc-linked-selective-expandable-body"
tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
<% endif %> <% endif %>
@ -301,7 +301,7 @@ If an item has no children, there is no open/close chevron
Shows a tabbed toc. Shows a tabbed toc.
If a toc-item link is clicked it will open the tiddler in the story If a toc-item link is clicked it will open the tiddler in the story
=================================================================== --> =================================================================== -->
\procedure toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude,tagField,parentField,captionField,itemTemplate) \procedure toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude,captionField,tagField,parentField,itemTemplate)
<$tiddler tiddler={{{ [<selectedTiddler>get[text]] }}}> <$tiddler tiddler={{{ [<selectedTiddler>get[text]] }}}>
<div class="tc-tabbed-table-of-contents"> <div class="tc-tabbed-table-of-contents">
<$linkcatcher to=<<selectedTiddler>>> <$linkcatcher to=<<selectedTiddler>>>
@ -309,7 +309,7 @@ If a toc-item link is clicked it will open the tiddler in the story
<!-- v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter --> <!-- v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter -->
<$macrocall $name="toc-selective-expandable" <$macrocall $name="toc-selective-expandable"
tag=<<tag>> sort=<<sort>> exclude=<<exclude>> tag=<<tag>> sort=<<sort>> exclude=<<exclude>>
tagField=<<tagField>> parentField=<<parentField>> captionField=<<captionField>> captionField=<<captionField>> tagField=<<tagField>> parentField=<<parentField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
</div> </div>
@ -333,7 +333,7 @@ If a toc-item link is clicked it will open the tiddler in the story
Shows a tabbed toc. If a toc-item link is clicked Shows a tabbed toc. If a toc-item link is clicked
it will open the tiddler in the view area of the same tiddler it will open the tiddler in the view area of the same tiddler
============================================================= --> ============================================================= -->
\procedure toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude,tagField,parentField,captionField,itemTemplate) \procedure toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude,captionField,tagField,parentField,itemTemplate)
<$linkcatcher to=<<selectedTiddler>>> <$linkcatcher to=<<selectedTiddler>>>
<$macrocall $name="toc-tabbed-external-nav" <$macrocall $name="toc-tabbed-external-nav"
tag=<<tag>> tag=<<tag>>
@ -343,9 +343,9 @@ it will open the tiddler in the view area of the same tiddler
missingText=<<missingText>> missingText=<<missingText>>
template=<<template>> template=<<template>>
exclude=<<exclude>> exclude=<<exclude>>
captionField=<<captionField>>
tagField=<<tagField>> tagField=<<tagField>>
parentField=<<parentField>> parentField=<<parentField>>
captionField=<<captionField>>
itemTemplate=<<itemTemplate>> itemTemplate=<<itemTemplate>>
/> />
</$linkcatcher> </$linkcatcher>