Merge remote-tracking branch 'origin/v4' into v4

content/templates/zotero_template.md

@@ -11,52 +11,82 @@ archive-location: "{{archiveLocation}}"{% endif %}
 citekey: {{citekey}}
 tags:
 - research
-- paper
+- {{itemType}}
 ---
-{{bibliography}}
+
+> [!Cite]
+> {{bibliography}}
+
+>[!Synth]
+>**Contribution**:: 
+>
+>**Related**:: {% for relation in relations | selectattr("citekey") %} [[@{{relation.citekey}}]]{% if not loop.last %}, {% endif%} {% endfor %}
+>
+
 [online]({{uri}}) [local]({{desktopURI}}) {%- for attachment in attachments | filterby("path", "endswith", ".pdf") %} [pdf](file://{{attachment.path | replace(" ", "%20")}})
 {% if loop.last %} 
 {% endif %}{%- endfor %}
  
-{% if tags.length > 0 -%}{% for t in tags -%}#{% if t.tag == "secondary" %}source/secondary{% if not loop.last %}{% endif %}{% elif t.tag == "primary" %}source/primary{% if not loop.last %}{% endif %}{% elif "-project" in t.tag %}project/{{t.tag | lower | replace(" ", "-") | replace("-project", "")}}{% else %}subject/{{t.tag | lower | replace(" ", "-")}}{% endif %}{% if not loop.last %}
-{% endif %}{%- endfor %}{%- endif %}
+>[!md]
+{% for type, creators in creators | groupby("creatorType") -%}
+{%- for creator in creators -%}
+> **{{"First" if loop.first}}{{type | capitalize}}**::
+{%- if creator.name %} {{creator.name}}  
+{%- else %} {{creator.lastName}}, {{creator.firstName}}  
+{%- endif %}  
+{% endfor %}~ 
+{%- endfor %}    
+> **Title**:: {{title}}  
+> **Year**:: {{date | format("YYYY")}}   
+> **Citekey**:: {{citekey}} {%- if itemType %}  
+> **itemType**:: {{itemType}}{%- endif %}{%- if itemType == "journalArticle" %}  
+> **Journal**:: *{{publicationTitle}}* {%- endif %}{%- if volume %}  
+> **Volume**:: {{volume}} {%- endif %}{%- if issue %}  
+> **Issue**:: {{issue}} {%- endif %}{%- if itemType == "bookSection" %}  
+> **Book**:: {{publicationTitle}} {%- endif %}{%- if publisher %}  
+> **Publisher**:: {{publisher}} {%- endif %}{%- if place %}  
+> **Location**:: {{place}} {%- endif %}{%- if pages %}   
+> **Pages**:: {{pages}} {%- endif %}{%- if DOI %}  
+> **DOI**:: {{DOI}} {%- endif %}{%- if ISBN %}  
+> **ISBN**:: {{ISBN}} {%- endif %}    
 
-### Index
+> [!LINK] 
+> {%- for attachment in attachments | filterby("path", "endswith", ".pdf") %}
+>  [{{attachment.title}}](file://{{attachment.path | replace(" ", "%20")}})  {%- endfor -%}.
 
-start-date:: {% if date %}{{date | format("YYYY-MM-DD")}}{% endif %}
-end-date::
-page-no:: {% for annotation in annotations %}{% if loop.first %}{{annotation.pageLabel}}{% endif %}{% endfor %}
+> [!Abstract]
+> {%- if abstractNote %}
+> {{abstractNote}}
+> {%- endif -%}.
+> 
+# Notes
 
-### Connections
+> {%- if markdownNotes %}
+>{{markdownNotes}}{%- endif -%}.
 
-comment:: 
 
-### Note
+# Annotations
 
-{% macro calloutHeader(color) -%}
-{%- if color == "#ff6666" -%}
-Important
-{%- endif -%}
-{%- if color == "#5fb236" -%}
-Reference
-{%- endif -%}
-{%- if color == "#2ea8e5" -%}
-Undefined - Blue
-{%- endif -%}
-{%- if color == "#a28ae5" -%}
-Undefined - Purple
+{%- macro calloutHeader(type, color) -%}  
+{%- if type == "highlight" -%}  
+<mark style="background-color: {{color}}">Quote</mark>  
 {%- endif -%}
+
+{%- if type == "text" -%}  
+Note  
+{%- endif -%}  
 {%- endmacro -%}
 
 {% persist "annotations" %}
-{% set annotations = annotations | filterby("date", "dateafter", lastImportDate) -%}
-{% if annotations.length > 0 %}
-### Imported on {{importDate | format("YYYY-MM-DD h:mm a")}}
+{% set newAnnotations = annotations | filterby("date", "dateafter", lastImportDate) %}
+{% if newAnnotations.length > 0 %}
 
-{%- for annotation in annotations %}
-{% if annotation.color !== "#ffd400" %}
->[!quote{% if annotation.color %}|{{annotation.color}}{% endif %}] {{calloutHeader(annotation.color)}}
->{%- endif -%}{% if annotation.imageRelativePath %}
-![[{{annotation.imageRelativePath}}]] {% endif %}{% if annotation.annotatedText %}
-{{annotation.annotatedText}} [(p. {{annotation.pageLabel}})](zotero://open-pdf/library/items/{{annotation.attachment.itemKey}}?page={{annotation.pageLabel}}&annotation={{annotation.id}}){%- endif %}{%- if annotation.comment%}
-%%{{annotation.comment}}%%{%- endif %}{%- endfor %}{% endif %} {% endpersist %}
+### Imported: {{importDate | format("YYYY-MM-DD h:mm a")}}
+
+
+{% for a in newAnnotations %}
+{{calloutHeader(a.type, a.color)}}
+> {{a.annotatedText}}
+{% endfor %}
+{% endif %}
+{% endpersist %}