Add new macro ref2

docs/index.html

@@ -504,6 +504,8 @@
 
 <li>demo/ref-macro</li>
 
+<li>demo/ref2-macro</li>
+
 <li>demo/refmanager/transclusion</li>
 
 <li>demo/refrencemanager/intro</li>
@@ -825,7 +827,7 @@
 {"title":"$:/favorites/folder-008","caption":"Keep old","created":"20211107081728911","list":"[[keep $:/plugins/kookma/refnotes/viewtemplates/bibtex old]] [[keep $:/plugins/kookma/refnotes/templates/reflist/default old]] [[keep $:/plugins/kookma/refnotes/macros/bibtex/showrefs old]] [[keep $:/plugins/kookma/refnotes/macros/footnote old]]","modified":"20211107081746868","tags":"$:/tags/Favorites/Folder","type":"text/vnd.tiddlywiki"},
 {"title":"$:/favorites/folder-009","caption":"APA Styles by Andres","created":"20211107081800232","list":"[[keep - $:/plugins/kookma/refnotes/macros/apa/showrefsAPA -old]] [[keep $:/plugins/kookma/refnotes/macros/apa/refAPA - old]] [[demo/bibtex/01 showrefsAPA - delete]]","modified":"20211107081814781","tags":"$:/tags/Favorites/Folder","type":"text/vnd.tiddlywiki"},
 {"title":"$:/favorites/folder-010","caption":"Styles and Types","created":"20211107081856060","list":"[[Bibtex Main Styles]] [[BibTeX Entry the General Structure]] demo/tools-generating-bibtex-entry [[BibTeX Standard File Format]]","modified":"20220603124618842","tags":"$:/tags/Favorites/Folder","type":"text/vnd.tiddlywiki"},
-{"title":"$:/Import","text":"The following tiddlers were imported:\n\n# [[image.png]]","status":"complete"},
+{"title":"$:/Import","text":"The following tiddlers were imported:\n\n# [[demo/ref2-macro]]","status":"complete"},
 {"title":"$:/isEncrypted","text":"no"},
 {"text":"{\n    \"New Task\": \"color:#155724;background-color:#d4edda;\",\n    \"Conditionally Display Fields\": \"color:#155724;background-color:#d4edda;\",\n    \"Refnotes Plugin Questions\": \"color:#155724;background-color:#d4edda;\",\n    \"Show Footnotes Conditionally using ViewTemplate\": \"color:#155724;background-color:#d4edda;\",\n    \"Support for Book Citation\": \"color:#155724;background-color:#d4edda;\",\n    \"Pretty display citation\": \"color:#155724;background-color:#d4edda;\",\n    \"Multipart Names\": \"color:#155724;background-color:#d4edda;\",\n    \"Use regex to format author name\": \"color:#155724;background-color:#d4edda;\",\n    \"Quotes\": \"color:#155724;background-color:#d4edda;\",\n    \"Content on hover\": \"color:#155724;background-color:#d4edda;\",\n    \"Reference List Order of Reference\": \"color:#155724;background-color:#d4edda;\",\n    \"APA Style Reference\": \"color:#155724;background-color:#d4edda;\",\n    \"Check showrefs correctly displays different entries\": \"color:#155724;background-color:#d4edda;\",\n    \"Add APA Style\": \"color:#155724;background-color:#d4edda;\"\n}","type":"application/json","created":"20211024055019867","modified":"20220604131523166","title":"$:/keepstate/dynamictables/your-state-tid/style"},
 {"title":"$:/palette","created":"20211024054202548","modified":"20211024054206148","type":"text/vnd.tiddlywiki","text":"$:/palettes/Vanilla"},
@@ -845,7 +847,7 @@
 {"created":"20220822224849063","title":"$:/state/search-list/selected-item--874113614","text":"demo/bibtex/zotero-workflow-primaryList","modified":"20220822224849063"},
 {"created":"20220822224834413","title":"$:/state/tab--730919242","text":"Tutorial Reference Manager","modified":"20220822224837559"},
 {"title":"$:/status/RequireReloadDueToPluginChange","text":"no"},
-{"title":"$:/StoryList","created":"20220822224850229","text":"","list":"$:/Import 20220603182019.png demo/troubleshooting-bibliography demo/tools-generating-bibtex-entry demo/bibtex/zotero-workflow [[Refnotes Plugin]] [[Refnotes Tutorial]] [[Tools for Generating BibTeX Entry]] [[Style and Bibtex Guides]] [[Refnotes Advanced Topics]] Discussions [[Idea and Todo List]] [[Image and Icons]]","modified":"20220822225535799"},
+{"title":"$:/StoryList","text":"","list":"$:/Import [[Refnotes Plugin]] [[Refnotes Tutorial]] [[Tools for Generating BibTeX Entry]] [[Style and Bibtex Guides]] [[Refnotes Advanced Topics]] Discussions [[Idea and Todo List]] [[Image and Icons]]"},
 {"title":"$:/tabs/template","created":"20210810194646428","modified":"20210810194659536","tags":"","type":"text/vnd.tiddlywiki","text":"\u003C$tiddler tiddler=\u003C\u003CcurrentTab>>>\n\u003C$transclude mode=\"block\" />\n\u003C/$tiddler>"},
 {"title":"$:/tags/Favorites/Folder","created":"20201210113307911","list":"$:/favorites/folder-009 $:/favorites/folder-007 $:/favorites/folder-008 $:/favorites/folder-006 $:/favorites/folder-010 $:/favorites/folder-002 $:/favorites/folder-001 $:/favorites/folder-003 $:/favorites/folder-005","modified":"20211107091750233","type":"text/vnd.tiddlywiki"},
 {"title":"$:/tags/PageControls","created":"20210513200022918","list":"$:/core/ui/Buttons/home $:/core/ui/Buttons/close-all $:/core/ui/Buttons/fold-all $:/core/ui/Buttons/unfold-all $:/core/ui/Buttons/permaview $:/core/ui/Buttons/new-tiddler $:/core/ui/Buttons/new-journal $:/core/ui/Buttons/new-image $:/core/ui/Buttons/import $:/core/ui/Buttons/export-page $:/core/ui/Buttons/control-panel $:/core/ui/Buttons/advanced-search $:/plugins/kookma/commander/buttons/pagecontrol $:/core/ui/Buttons/manager $:/core/ui/Buttons/tag-manager $:/core/ui/Buttons/language $:/core/ui/Buttons/palette $:/core/ui/Buttons/theme $:/core/ui/Buttons/storyview $:/core/ui/Buttons/encryption $:/core/ui/Buttons/timestamp $:/core/ui/Buttons/full-screen $:/core/ui/Buttons/print $:/core/ui/Buttons/save-wiki $:/core/ui/Buttons/refresh $:/core/ui/Buttons/more-page-actions $:/plugins/kookma/utility/pagecontrol/view-fields-button $:/plugins/kookma/shiraz/ui/Button/SwitchPalette","modified":"20210513200022967","type":"text/vnd.tiddlywiki"},
@@ -933,6 +935,7 @@
 {"title":"demo/footnotes-exmp03","created":"20210408201731978","modified":"20210917161925604","tags":"doc literature","type":"text/vnd.tiddlywiki","text":"This is a text.\u003C\u003Cfnote \"This is a simple footnote.\">> Here you see another footnote. Use your mouse hover to see the tooltip. Look at the bottom of tiddler \u003C\u003Cfnote \"Tiddler is the smallest meaningful usint of data in [[Tiddlywiki|https://tiddlywiki.com/]].\">> to see the list of footnotes."},
 {"title":"demo/footnotes-transclusion","caption":"Transclusion example","created":"20181217212529766","modified":"20210917161925611","tags":"footnote doc [[Tutorial Footnotes]]","type":"text/vnd.tiddlywiki","text":"! Transcluding tiddlers contain footnotes\nThe below examples shows how the footnotes from several transcluded tiddlers can be displayed. Here this text includes two transcluded tiddlers, each has some footnotes.\n\n''Note'': The same filter is used for transclusion shall be used for `showfnotes`. Do not try to use a mixed form of footnotes.\n\n!! Transcluded tiddlers\nThis part shows how tiddlers are transcluded.\n\n\u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\">\u003C$list filter=\"[tag[exmp02]]\">\n\n\u003C$link to=\u003C\u003CcurrentTiddler>> >\u003C\u003CcurrentTiddler>>\u003C/$link>\n\u003C$transclude mode=block/>\n\u003C/$list>\n\"\"\"/>\n\n!! Display footnotes\nNow call the `showfnotes` with the same filter used for transclusion. If several diffrenet transclusion are used, the the filter used in `showfnotes` shall include all the above transcluded tiddlers. \n\n\n\u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\"\u003C\u003Cshowfnotes filter:\"[tag[exmp02]]\" class:\"fnote-pretty\" title:\"Footenotes\">>\n\"\"\"/>\n"},
 {"title":"demo/ref-macro","caption":"Ref macro","created":"20181220090955749","modified":"20220603124838815","tags":"BibTeX doc [[Tutorial Reference Manager]]","type":"text/vnd.tiddlywiki","text":"! The ref macro\nThe `ref` is a macro to cite references inside a text. It gets the reference key, here is the tiddler title contains the BibTeX data of that reference (e.g. reference tiddler). The `ref` macro from revision 1.8.0+ uses APA7 style as default. The `ref` supports\n\n* Narrative in-text citation\n* Parenthetical in-text citation\n* Multiple citations\n\n\u003C\u003Calert warning \"''Note'': To use `ref` macro, you need to have reference tiddlers, or some BibTeX entries. See [[Tutorial Bibliography with BibTeX]] for details.\">>\n\n\n!! Syntax\n\n```\n\u003C\u003Cref tid>>\n```\n\n!! Content and attributes\n|!Attributes |!Type |!Description |\n|tid |required |also called citation key, is the title of tiddler contains the bibliography data of the mentioned reference|\n|type |optional |type of citation, `n` for narrative, and `p` for parenthetical. The default value is `p`. Also `m` for multi works citation which returns output like parenthetical with no parenthesis|\n|pages |optional |page number. This is an extra parameter allows you to set the page number like `p. 124` or pages number like `pp. 127-145`. It can also be used to pass any extra information like `Emergencies section, para. 4`|\n\n\n''Note 1'': On mouse hover on cited reference, a tooltip is opened and shows some minimum information (authors, year, title) and a hyperlink to the reference tiddler (bibliography data).\n\n''Note 2'': Refnotes is very flexible to create a citation for a reference. The `ref` macro can be called using any of below forms:\n\n* `\u003C\u003Cref tid>>`, \n* `\u003C\u003Cref \"tid with space in title\">>`,\n* `\u003C\u003Cref [[tid with space in title]]>>` \n\nBoth single quotes, double quotes, and double square brackets are allowed.\n\n''Note 3'': Using extra parameters, the `ref` can create citation in narrative format and add page numbers, for example\n\n* `\u003C\u003Cref 'tid' n>>`\n* `\u003C\u003Cref [[tid with space in title]] p \"pp. 127-132\">>`\n* `\u003C\u003Cref \"tidname\" n \"p. 1286\">>`\n\n\n\n!! Example\n\n> \u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\"''Parenthetical'':\nHere a citation is made to \u003C\u003Cref \"leal-2018\">>. Another reference is made to \u003C\u003Cref \"bosse-2018\">> and the third reference is made to \u003C\u003Cref [[amadeo1995949]] pages:\"pp. 987-1007\">>.\n\n''Narrative'': \n\u003C\u003Cref 'rostami-2022' n 'p. 16'>> in their recent publication presented a CFD model for oil drop process in micro-channels.\n\"\"\"/>\n\n\n!! Remarks\n* Normally citation keys are lowercase words with no spaces if they imported by [[BibTeX Importer Plugin]] and then processed by Refnotes. For citation key with space and nasty characters see [[Citation keys with space|demo/bibtex/title-with-space]]\n* There are several online tools to generate bibliographic data and export as `.bib` file. These files can be imported to Refnotes. See [[Tutorial Bibliography with BibTeX]] and [[demo/tools-generating-bibtex-entry]] for more information.\n\n\n!! More examples\n* [[demo/bibtex/example-basic]]\n* [[Transclusion example|demo/refmanager/transclusion]]\n* [[Narrative citation|demo/bibtex/citing-multiple-works/narrative]]\n* [[Parenthetical citation|demo/bibtex/citing-multiple-works/parenthetical]]\n\n"},
+{"created":"20220829044909128","text":"! The ref2 macro\nThe anlternative macro `ref2` is same as [[ref macro|demo/ref-macro]] to direectly link to reference tiddler, instead of list generated by macro `showrefs`.\n\n\n!! Syntax\n\n```\n\u003C\u003Cref2 tid>>\n```\n\n!! Example\n\n> \u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\"''Parenthetical'':\nHere a citation is made to \u003C\u003Cref2 \"leal-2018\">>. Another reference is made to \u003C\u003Cref2 \"bosse-2018\">> and the third reference is made to \u003C\u003Cref2 [[amadeo1995949]] pages:\"pp. 987-1007\">>.\n\n''Narrative'': \n\u003C\u003Cref2 'rostami-2022' n 'p. 16'>> in their recent publication presented a CFD model for oil drop process in micro-channels.\n\"\"\"/>\n\n","title":"demo/ref2-macro","caption":"Ref macro","modified":"20220829045350827","tags":"BibTeX doc [[Tutorial Reference Manager]]","type":"text/vnd.tiddlywiki"},
 {"title":"demo/refmanager/transclusion","caption":"Transclusion example","created":"20210409175044546","modified":"20220603124601930","tags":"doc BibTeX [[Tutorial Reference Manager]]","type":"text/vnd.tiddlywiki","text":"! Transcluding tiddlers contain citations\nThis tiddler itself has no citation, but a reference list is created from other tiddlers. The intresting point is that, the duplicates will be removed, and the `sfowrefs` will display the correct reference list.\n\n\nHere this text includes two transcluded tiddlers, each has some citations.\n\n''Note'': The same filter is used for transclusion shall be used for `showrefs`. Do not try to use a mixed form of footnotes.\n\n!! Transcluded tiddlers\nThis part shows how tiddlers are transcluded.\n\n\u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\">\u003C$list filter=\"[tag[exmp06]]\">\n\n\u003C$link />\n\u003C$transclude mode=block/>\n\u003C/$list>\n\"\"\"/>\n\n!! Display references\nNow call the `showrefs` with the same filter used for transclusion. If several diffrenet transclusion are used, the the filter used in `showrefs` shall include all the above transcluded tiddlers. \n\n\n\u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\"\u003C\u003Cshowrefs filter:\"[tag[exmp06]]\" class:\"ref-nonumber\" title:\"References\">>\n\"\"\"/>\n"},
 {"title":"demo/refrencemanager/intro","caption":"Introduction","created":"20220526135735357","modified":"20220603124601930","tags":"BibTeX doc [[Tutorial Reference Manager]]","type":"text/vnd.tiddlywiki","text":"!! Refnotes reference manager\nThe Refnotes implements a basic academic reference manager using Bibtex and APA7 style.\n\nThe reference manager in Refnotes contains\n\n* tools for importing bibliography data (only Bibtex supported)\n* macro (`ref`) to cite a reference in text \n** APA7 parenthetical citation is supported\n** APA7 narrative citation is supported\n* macro (`showref`) ro generate reference list\n\n\u003C\u003Calert info \"To use Reference manager in Refnotes, you need to have some bibliography data (bibtex entries or reference tiddlers). See for more details: [[Tutorial Bibliography with BibTex]]\">>"},
 {"title":"demo/showabbrs-macro","caption":"Showabbrs macro","created":"20181220102634268","modified":"20210917161925635","tags":"doc abbreviation [[Tutorial Abbreviations]]","type":"text/vnd.tiddlywiki","text":"! The showabbrs macro\nThe `showabbrs` macro lists the abbreviations found in a tiddler, or tiddlers are given through a filter.\n\n!! Syntax\n```\n\u003C\u003Cshowabbrs filter dtiddler title emptyMessage>>\n```\n\n!! Content and attributes\n|!Attributes |!Type |!Description |\n|filter |optional|a Tiddlywiki filter expression which results in a list of tiddler titles to be searched for abbreviations. The default value is `currentTiddler`|\n|dtiddler |optional|the name of data tiddler from that the definition of terms should be read. The default value is `Glossary`|\n|title |optional|a title to be used for output (glossary table), for example ''Abbreviation''. The default value is Empty (means no title will be displayed).|\n|emptyMessage |optional|an optional message to be displayed if no abbreviation (glossary term) is found|\n\n----------------------\n!! Example\nThe below example first shows a text contains abbreviations, then in the next part `showabbrs` is called to generate a glossary table (list).\n\n!!! A text contains abbreviations\n>\u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\"The \u003C\u003Cabbr CSS \"demo/webtechnology\">>, \u003C\u003Cabbr HTML demo/webtechnology>>, \u003C\u003Cabbr \"CDN\" demo/webtechnology>>, and \u003C\u003Cabbr 'ISP' demo/webtechnology>> are terminology related to web technology. The \u003C\u003Cabbr LOLI demo/glossary>> is not related and NOT EXISTED!!\n\"\"\"/>\n\n!!! Generate the glossary table\nThe below code lists all abbreviations in the current tiddler.\n\n>\u003C$macrocall $name=\"wikitext-example-without-html\" \nsrc=\"\"\"\u003C\u003Cshowabbrs dtiddler:\"demo/webtechnology\" title:\"My Glossary Table\">>\"\"\"/>\n\n\n!! Important notes\n* The `showabbrs` can list abbreviations in a single tiddler or a tiddler created by transclusion from other tiddlers\n* `filter` can accept any combination of filter expressions like `[tag[xx]] -[tag[yy]]` or `[search:title[new]]`\n* Preview large tiddlers in edit mode, when having a call to `showabbrs` with many abbreviations, causes TW scans the tiddler continuously which may result in slow down TW. To prevent this, you can use `filter=\"[\u003CcurrentTiddler>!has[draft.of]]\"` to stop updating glossary table during edit and preview.\n* If several data tiddlers are used for inserting abbreviations, then `showabbrs` shall be called several times to show all terms from those data tiddlers.\n"},

source/refnotes/macros/APA/ref.tid

@@ -27,6 +27,27 @@ type: text/vnd.tiddlywiki
 
 
 
+\define ref2(tid, type:"p", pages:"")
+\import $:/plugins/kookma/refnotes/macros/apa/authors
+\whitespace trim
+<$set name="ref-tid" tiddler=<<__tid__>> field="title" emptyValue="RefNotFound">
+<div class="">
+<$reveal type="match" default=<<ref-tid>> text="RefNotFound">
+<$link overrideClass="link-refcls">[<$view tiddler=<<__tid__>> field="title"/>]</$link>
+<div class="refnotes-tooltiptext ref-notfound"><b>Warning</b>: Reference Not Found.<br>Click to create it:<<create-notexisted-ref "$tid$">></div>
+</$reveal>
+<$reveal type="nomatch" default=<<ref-tid>> text="RefNotFound">
+<$link to=<<__tid__>> >
+<$list filter="[[$type$]lowercase[]match[p]]" variable=null><<pranthetical>></$list>
+<$list filter="[[$type$]lowercase[]match[n]]" variable=null><<narrative>></$list>
+<$list filter="[[$type$]lowercase[]match[m]]" variable=null><<multiwork-pranthetical>></$list>
+</$link>
+</$reveal>
+</div>
+</$set>
+\end
+
+
 <!-- pranthetical in text citation -->
 \define pranthetical()
 <$wikify name=authors text=<<show-authors-in-citation>> >