From 929a3b1359b05c06e836863e42a20a80f38f4322 Mon Sep 17 00:00:00 2001
From: Dae Houlihan <daeda@mit.edu>
Date: Mon, 7 Mar 2022 17:31:07 -0500
Subject: [PATCH] reformat pref planes, add option to specify custom tag string

---
 chrome/content/options.xul              | 178 ++++++++++++++++--------
 chrome/content/scripts/zoteroobscite.js | 124 ++++++++++++-----
 chrome/locale/en-US/options.dtd         |  43 ++++--
 defaults/preferences/prefs.js           |   3 +-
 4 files changed, 242 insertions(+), 106 deletions(-)

diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index 42d9c80..16c0419 100644
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero-platform/content/preferences.css"?>
+<?xml-stylesheet href="chrome://zotero-platform-version/content/style.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://zoteroobscite/locale/options.dtd">
 
@@ -9,6 +10,7 @@
   <stringbundleset id="stringbundleset">
     <stringbundle id="id-obscite-options" src="chrome://zotero-obscite/locale/options.properties"/>
   </stringbundleset>
+
   <prefpane id="id-obscite-prefpane" label="&obscite.preferences;">
     <preferences>
       <preference id="pref-obscite-source_dir" name="extensions.obscite.source_dir" type="string"/>
@@ -17,85 +19,149 @@
       <preference id="pref-obscite-matchstrategy" name="extensions.obscite.matchstrategy" type="string"/>
       <preference id="pref-obscite-zotkeyregex" name="extensions.obscite.zotkeyregex" type="string"/>
       <preference id="pref-obscite-metadatakeyword" name="extensions.obscite.metadatakeyword" type="string"/>
+      <preference id="pref-obscite-tagstr" name="extensions.obscite.tagstr" type="string"/>
     </preferences>
 
+    <tabbox id="zotfile-tabbox">
+      <tabs id="zotfile-tabs">
+        <tab label="&general-settings;"/>
+        <tab label="&advanced-settings;"/>
+        <!-- <tab label="&renaming-rules;"/>
+        <tab label="&advanced-settings;"/> -->
+      </tabs>
+
+      <!-- GENERAL SETTINGS -->
+      <tabpanels id="obscite-tabpanels">
+        <tabpanel orient="vertical">
+
+
+          <groupbox>
+            <caption label="&obscite.preferences.locate-mdfiles;"/>
+            <description style="width: 420px">&obscite.preferences.locate-mdfiles-desc;</description>
+
+            <separator/>
+
+            <label style="font-size: 14px" value="&obscite.preferences.vault-source-folder;"/>
+            <hbox  style="margin: 0"  align="center">
+              <textbox id="id-obscite-source_dir" preference="pref-obscite-source_dir" flex="1" />
+              <button id="id-obscite-source_dir-button" label="&obscite.preferences.choose-button-label;" oncommand="Zotero.ObsCite.chooseVaultFolder();"/>
+            </hbox>
+            <label value="&obscite.preferences.vault-source-folder-desc;"/>
+            
+            <separator/>
+
+            <!-- <label style="font-size: 14px" value="&obscite.preferences.filefilterstrategy-title;"/> -->
+            <radiogroup id="id-obscite-filefilterstrategy" preference="pref-obscite-filefilterstrategy">
+
+              <radio label="&obscite.preferences.filefilterstrategy-default-label;" value="default" />
+              <label id="id-obscite-filefilterstrategy-default-desc1" style="font-size: 10px" value="&obscite.preferences.filefilterstrategy-default-desc1;"/>
+              <label id="id-obscite-filefilterstrategy-default-desc2" style="font-size: 10px" value="&obscite.preferences.filefilterstrategy-default-desc2;"/>
+              <label style="font-size: 10px" value="&obscite.preferences.spacer;"/>
+
+              <radio label="&obscite.preferences.filefilterstrategy-customfileregex-label;" value="customfileregex" />
+              <hbox style="margin: 0"  align="center">
+                <label id="id-obscite-filepattern-label" value="&obscite.preferences.filepattern-label;"/>
+                <textbox id="id-obscite-filepattern" preference="pref-obscite-filepattern" flex="1" />
+                <label id="id-obscite-filepattern-label-end" value="&obscite.preferences.filepattern-label-end;"/>
+              </hbox>
+              <label id="id-obscite-filefilterstrategy-customfileregex-desc" style="font-size: 11px" value="&obscite.preferences.filefilterstrategy-customfileregex-desc;"/>
+
+            </radiogroup>
+
+
+          </groupbox>
+
+          <separator/>
+
+          <radiogroup id="id-obscite-matchstrategy" preference="pref-obscite-matchstrategy">
+
+            <groupbox>
+              <caption label="&obscite.preferences.matchstrategy-bbtcitekey-label;"/>
+              <radio label="&obscite.preferences.matchstrategy-bbtcitekey-label;" value="bbtcitekey" />
+              <description style="width: 420px">&obscite.preferences.matchstrategy-bbtcitekey-desc;</description>
+
+              <separator/>
+
+              <label id="id-obscite-metadatakeyword-title" value="&obscite.preferences.metadata-keyword-title;"/>
+              <hbox style="margin: 0"  align="center">
+                <label id="id-obscite-metadatakeyword-label" value="&obscite.preferences.metadata-keyword-label;"/>
+                <textbox id="id-obscite-metadatakeyword" preference="pref-obscite-metadatakeyword" onchange="Zotero.ObsCite.checkMetadataFormat();"/>
+              </hbox>
+              <label id="id-obscite-metadatakeyword-desc1" style="font-size: 10px" value="&obscite.preferences.metadata-keyword-desc1;"/>
+              <label id="id-obscite-metadatakeyword-desc2" style="font-size: 10px" value="&obscite.preferences.metadata-keyword-desc2;"/>
+
+            </groupbox>
+
+
+            <groupbox>
+              <caption label="&obscite.preferences.matchstrategy-zotitemkey-label;"/>
+              <radio label="&obscite.preferences.matchstrategy-zotitemkey-label;" value="zotitemkey" />
+              <description style="width: 420px">&obscite.preferences.matchstrategy-zotitemkey-desc;</description>
 
-    <groupbox>
-      <caption label="&obscite.preferences.vault-source-folder;"/>
-      <description style="width: 420px">&obscite.preferences.vault-source-folder-desc;</description>
-      <hbox  style="margin: 0"  align="center">
-        <textbox id="id-obscite-source_dir" preference="pref-obscite-source_dir" flex="1" />
-        <button id="id-obscite-source_dir-button" label="&obscite.preferences.choose-button-label;" oncommand="Zotero.ObsCite.chooseVaultFolder();"/>
-      </hbox>
-      
-      <separator/>
+              <separator/>
 
-      <label style="font-size: 14px" value="&obscite.preferences.filefilterstrategy-title;"/>
-      <radiogroup id="id-obscite-filefilterstrategy" preference="pref-obscite-filefilterstrategy">
+              <label id="id-obscite-preferences-zotkeyregex-title1" value="&obscite.preferences.zotkeyregex-title1;"/>
+              <label id="id-obscite-preferences-zotkeyregex-title2" value="&obscite.preferences.zotkeyregex-title2;"/>
+              <hbox style="margin: 0"  align="center">
+                <label id="id-obscite-preferences-zotkeyregex-label" value="&obscite.preferences.zotkeyregex-label;"/>
+                <textbox id="id-obscite-zotkeyregex" preference="pref-obscite-zotkeyregex" flex="1" />
+                <label id="id-obscite-preferences-zotkeyregex-label-end" value="&obscite.preferences.zotkeyregex-label-end;"/>
+              </hbox>
+              <label id="id-obscite-preferences-zotkeyregex-desc1" style="font-size: 10px" value="&obscite.preferences.zotkeyregex-desc1;"/>
 
-      <radio label="&obscite.preferences.filefilterstrategy-default-label;" value="default" />
-      <label id="id-obscite-filefilterstrategy-default-desc" style="font-size: 10px" value="&obscite.preferences.filefilterstrategy-default-desc;"/>
+            </groupbox>
 
-      <radio label="&obscite.preferences.filefilterstrategy-customfileregex-label;" value="customfileregex" />
-      <hbox style="margin: 0"  align="center">
-        <label id="id-obscite-filepattern-label" value="&obscite.preferences.zotkey-regex-label;"/>
-        <textbox id="id-obscite-filepattern" preference="pref-obscite-filepattern" flex="1" />
-      </hbox>
-      <label id="id-obscite-filefilterstrategy-customfileregex-desc" style="font-size: 11px" value="&obscite.preferences.filefilterstrategy-customfileregex-desc;"/>
+          </radiogroup>
 
-      </radiogroup>
+        </tabpanel>
 
+        <!-- ADVANCED SETTINGS -->
+        <tabpanel orient="vertical">
 
-    </groupbox>
-    <separator/>
+          <!-- tag name -->
+          <groupbox>
+              <label value="&obscite.preferences.customtag-title;"/>
+              <hbox style="margin: 0"  align="center">
+                <label value="&obscite.preferences.customtag-label;"/>
+                <textbox preference="pref-obscite-tagstr" onchange="Zotero.ObsCite.checkTagStr();"/>
+              </hbox>
+          </groupbox>
 
+          <!-- generate debugging log -->
+          <groupbox>
+            <caption label="&obscite.preferences.rundebug-label;"/>
+            <description style="width: 420px">&obscite.preferences.rundebug-desc;</description>
+            <button id="id-obscite-rundebug-button" label="&obscite.preferences.rundebug-button-label;" oncommand="Zotero.ObsCite.runAndSaveDebug();"/>
+            <separator/>
+          </groupbox>
+        </tabpanel>
 
+      <!-- File name or file path -->
+            <!-- <radiogroup id="id-obscite-uri-strategy" preference="pref-uri-strategy"> -->
 
-    <radiogroup id="id-obscite-matchstrategy" preference="pref-obscite-matchstrategy">
+            <!-- <radio label="&obscite.preferences.filefilterstrategy-default-label;" value="default" />
+            <label id="id-obscite-filefilterstrategy-default-desc" style="font-size: 10px" value="&obscite.preferences.filefilterstrategy-default-desc;"/>
 
-      <groupbox>
-        <caption label="&obscite.preferences.matchstrategy-bbtcitekey-label;"/>
-        <radio label="&obscite.preferences.matchstrategy-bbtcitekey-label;" value="bbtcitekey" />
-        <description style="width: 420px">&obscite.preferences.matchstrategy-bbtcitekey-desc;</description>
+            <radio label="&obscite.preferences.filefilterstrategy-customfileregex-label;" value="customfileregex" />
+            <hbox style="margin: 0"  align="center">
+              <label id="id-obscite-filepattern-label" value="&obscite.preferences.zotkeyregex-label;"/>
+              <textbox id="id-obscite-filepattern" preference="pref-obscite-filepattern" flex="1" />
+            </hbox>
+            <label id="id-obscite-filefilterstrategy-customfileregex-desc" style="font-size: 11px" value="&obscite.preferences.filefilterstrategy-customfileregex-desc;"/> -->
 
-        <separator/>
+            <!-- </radiogroup> -->
 
-        <label id="id-obscite-metadatakeyword-title" value="&obscite.preferences.metadata-keyword-title;"/>
-        <hbox style="margin: 0"  align="center">
-          <label id="id-obscite-metadatakeyword-label" value="&obscite.preferences.metadata-keyword-label;"/>
-          <textbox id="id-obscite-metadatakeyword" preference="pref-obscite-metadatakeyword" onchange="Zotero.ObsCite.checkMetadataFormat();"/>
-        </hbox>
-        <label id="id-obscite-metadatakeyword-desc" style="font-size: 10px" value="&obscite.preferences.metadata-keyword-desc;"/>
-        <label id="id-obscite-metadatakeyword-subdesc" style="font-size: 10px" value="&obscite.preferences.metadata-keyword-subdesc;"/>
+      <!-- vault name -->
 
-      </groupbox>
 
 
-      <groupbox>
-        <caption label="&obscite.preferences.matchstrategy-zotitemkey-label;"/>
-        <radio label="&obscite.preferences.matchstrategy-zotitemkey-label;" value="zotitemkey" />
-        <description style="width: 420px">&obscite.preferences.matchstrategy-zotitemkey-desc;</description>
 
-        <separator/>
 
-        <label id="id-obscite-preferences-zotkeyregex-title" value="&obscite.preferences.zotkeyregex-title;"/>
-        <label id="id-obscite-preferences-zotkeyregex-desc" value="&obscite.preferences.zotkeyregex-desc;"/>
-        <hbox style="margin: 0"  align="center">
-          <label id="id-obscite-preferences-zotkey-regex-label" value="&obscite.preferences.zotkey-regex-label;"/>
-          <textbox id="id-obscite-zotkeyregex" preference="pref-obscite-zotkeyregex" flex="1" />
-        </hbox>
-        <label id="id-obscite-preferences-zotkey-regex-subdesc" style="font-size: 10px" value="&obscite.preferences.zotkey-regex-subdesc;"/>
 
-      </groupbox>
+      </tabpanels>
+    </tabbox>
 
-      <groupbox>
-        <caption label="&obscite.preferences.rundebug-label;"/>
-        <description style="width: 420px">&obscite.preferences.rundebug-desc;</description>
-        <button id="id-obscite-rundebug-button" label="&obscite.preferences.rundebug-button-label;" oncommand="Zotero.ObsCite.runAndSaveDebug();"/>
-        <separator/>
-      </groupbox>
 
-    </radiogroup>
 
   </prefpane>
 
diff --git a/chrome/content/scripts/zoteroobscite.js b/chrome/content/scripts/zoteroobscite.js
index eaed238..4f1218f 100644
--- a/chrome/content/scripts/zoteroobscite.js
+++ b/chrome/content/scripts/zoteroobscite.js
@@ -122,6 +122,27 @@ Zotero.ObsCite = {
         }
     },
 
+    checkTagStr: function () {
+        const tagstr = this.getPref('tagstr');
+        if (typeof tagstr === 'string' && tagstr.length > 0) {
+            let found = [];
+            const notallowed = ["'", '"', ":", "\n", "/", "\\", "?", "*", "|", ">", "<", ",", ";", "=", "`", "~", "!", "#", "$", "%", "^", "&", "(", ")", "[", "]", "{", "}", " "];
+            notallowed.forEach(char => {
+                if (tagstr.includes(char)) {
+                    found.push(char);
+                }
+            });
+            if (found.length > 0) {
+                this.showNotification("Invalid tag string", "tag cannot contain: " + found.join(" or ") + ".", false);
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            return true;
+        }
+    },
+
     _getParam_matchstrategy: function () {
         const matchstrategy = this.getPref('matchstrategy');
         if (['bbtcitekey', 'zotitemkey'].includes(matchstrategy)) {
@@ -223,6 +244,21 @@ Zotero.ObsCite = {
         }
     },
 
+    _getParam_tagstr: function () {
+        const tagstr = this.getPref('tagstr');
+        if (typeof tagstr === 'string' && tagstr.length > 0) {
+            if (this.checkTagStr()) {
+                return tagstr;
+            } else {
+                return null;
+                /// checkTagStr() will show a notification
+            }
+        } else {
+            this.setPref('tagstr', 'ObsCite');
+            return 'ObsCite';
+        }
+    },
+
     checkSettings: async function () {
         let checkSettings_trace = {
             _getParam_matchstrategy: 'none',
@@ -231,6 +267,7 @@ Zotero.ObsCite = {
             _getParam_filepattern: 'none',
             _checkBBTinstalled: 'none',
             _getParam_metadatakeyword: 'none',
+            _getParam_tagstr: 'none',
             _getParam_zotkeyregex: 'none',
             matchstrategy: 'none'
         };
@@ -255,6 +292,13 @@ Zotero.ObsCite = {
             }
         }
 
+        const tagstr = this._getParam_tagstr();
+        if (tagstr == null) {
+            checkSettings_trace._getParam_tagstr = 'null';
+            this.debugSettingsFail = checkSettings_trace;
+            return false;
+        }
+
         if (matchstrategy === 'bbtcitekey') {
             const bbtactive = await this._checkBBTinstalled();
             if (!bbtactive || !bbtactive[0]) {
@@ -378,19 +422,21 @@ Zotero.ObsCite = {
      */
 
     findTaggedItems: async function () {
+        const tagstr = this._getParam_tagstr();
         let s = new Zotero.Search();
         s.libraryID = Zotero.Libraries.userLibraryID;
-        s.addCondition('tag', 'is', 'ObsCite');
+        s.addCondition('tag', 'is', tagstr);
         let itemIDs = await s.search();
         let items_preexisting = await Zotero.Items.getAsync(itemIDs);
         return items_preexisting;
     },
 
     removeAllTags: async function () {
+        const tagstr = this._getParam_tagstr();
         let items_preexisting = await this.findTaggedItems();
         /// remove tag
         items_preexisting.forEach(item => {
-            item.removeTag('ObsCite');
+            item.removeTag(tagstr);
             item.saveTx();
         });
         return true;
@@ -645,38 +691,38 @@ Zotero.ObsCite = {
     },
 
 
-    mapCitekeysBBTJSON: async function () {
-        /* 
-         * make dict of BBTcitekey:zoteroID for every item in the BBTJSON file
-         */
-        let citekeymap = {};
-        let citekeymaperr = {};
-
-        const bbtjson = this._getParam_bbtjson();
-
-        const contents = JSON.parse(await Zotero.File.getContentsAsync(bbtjson));
-        const items = contents.items;
-        items.forEach(item => {
-            try {
-                const citekey = item.citekey;
-                const citationKey = item.citationKey;
-                const itemID = item.itemID;
-                const itemKey = item.itemKey;
-                citekeymap[citekey] = itemID;
-            } catch (e) {
-                citekeymaperr.push(item);
-            }
-        });
-
-        if (citekeymaperr.length > 0) {
-            this.cleanrun = false;
-            const nerr = citekeymaperr.length;
-            Zotero.debug(`${nerr} Read ObsVault Read Errors`);
-            Zotero.debug(`${citekeymaperr[0]}`);
-            this.showNotification("mapCitekeysBBTJSON", "Error: " + nerr.toString() + ".", false);
-        }
-        return citekeymap;
-    },
+    // mapCitekeysBBTJSON: async function () {
+    //     /* 
+    //      * make dict of BBTcitekey:zoteroID for every item in the BBTJSON file
+    //      */
+    //     let citekeymap = {};
+    //     let citekeymaperr = {};
+
+    //     const bbtjson = this._getParam_bbtjson();
+
+    //     const contents = JSON.parse(await Zotero.File.getContentsAsync(bbtjson));
+    //     const items = contents.items;
+    //     items.forEach(item => {
+    //         try {
+    //             const citekey = item.citekey;
+    //             const citationKey = item.citationKey;
+    //             const itemID = item.itemID;
+    //             const itemKey = item.itemKey;
+    //             citekeymap[citekey] = itemID;
+    //         } catch (e) {
+    //             citekeymaperr.push(item);
+    //         }
+    //     });
+
+    //     if (citekeymaperr.length > 0) {
+    //         this.cleanrun = false;
+    //         const nerr = citekeymaperr.length;
+    //         Zotero.debug(`${nerr} Read ObsVault Read Errors`);
+    //         Zotero.debug(`${citekeymaperr[0]}`);
+    //         this.showNotification("mapCitekeysBBTJSON", "Error: " + nerr.toString() + ".", false);
+    //     }
+    //     return citekeymap;
+    // },
 
     mapZoteroIDkeysInternalSearch: async function () {
         /* 
@@ -1011,6 +1057,7 @@ Zotero.ObsCite = {
     /////////
 
     updateItems: async function (citekeyids) {
+        const tagstr = this._getParam_tagstr();
 
         /// find all item already tagged
         let items_withtags = await this.findTaggedItems();
@@ -1032,14 +1079,14 @@ Zotero.ObsCite = {
 
         /// remove tag from items that should not be tagged
         items_removetag.forEach(item => {
-            item.removeTag('ObsCite');
+            item.removeTag(tagstr);
             item.saveTx();
         });
 
         ///NB this doesn't run successfully as soon as zotero is started, needs to wait for schema to load
         /// add tag to items that should be tagged
         items_totag.forEach(item => {
-            item.addTag('ObsCite');
+            item.addTag(tagstr);
             item.saveTx();
         });
         ///TODO set color :: https://github.com/zotero/zotero/blob/52932b6eb03f72b5fb5591ba52d8e0f4c2ef825f/chrome/content/zotero/tagColorChooser.js
@@ -1294,7 +1341,7 @@ Zotero.ObsCite = {
         this.addDebugLog('prefs', prefs);
 
         let config = {};
-        for (let pref of ['matchstrategy', 'source_dir', 'filefilterstrategy', 'filepattern', 'zotkeyregex', 'metadatakeyword']) {
+        for (let pref of ['matchstrategy', 'source_dir', 'filefilterstrategy', 'filepattern', 'zotkeyregex', 'metadatakeyword', 'tagstr']) {
             try {
                 switch (pref) {
                     case 'matchstrategy':
@@ -1315,6 +1362,9 @@ Zotero.ObsCite = {
                     case 'metadatakeyword':
                         config[pref] = this._getParam_metadatakeyword();
                         break;
+                    case 'tagstr':
+                        config[pref] = this._getParam_tagstr();
+                        break;
                 }
             } catch (e) {
                 config[pref] = "Error (" + e.name + ") " + e.message;
diff --git a/chrome/locale/en-US/options.dtd b/chrome/locale/en-US/options.dtd
index 26ce590..e4001e3 100644
--- a/chrome/locale/en-US/options.dtd
+++ b/chrome/locale/en-US/options.dtd
@@ -1,31 +1,50 @@
 <!ENTITY obscite.name "Zotero Obsidian Citations">
 <!ENTITY obscite.preferences "Zotero Obsidian Citations Preferences">
 
+<!ENTITY general-settings "General">
+<!ENTITY advanced-settings "Advanced">
+
+<!ENTITY obscite.preferences.locate-mdfiles "Location of Markdown Reading Notes">
+<!ENTITY obscite.preferences.locate-mdfiles-desc "Specify how ZoteroObsidianCitations should find the markdown files">
+
 <!ENTITY obscite.preferences.vault-source-folder "Folder Containing Markdown Reading Notes">
 <!ENTITY obscite.preferences.vault-source-folder-desc "ZoteroObsidianCitations will search this directory recursively for markdown files">
+
 <!ENTITY obscite.preferences.filefilterstrategy-title "File Filter">
-<!ENTITY obscite.preferences.filefilterstrategy-default-label "Default (looks for markdown files beginning with @ )">
-<!ENTITY obscite.preferences.filefilterstrategy-default-desc "Markdown files should begin with '@citekey', e.g. '@shepard1987science Universal Law.md', where 'shepard1987science' is the BetterBibTex citekey.">
-<!ENTITY obscite.preferences.filefilterstrategy-customfileregex-label "Custom RegEx pattern to match reading note files (case insensitive)">
+<!ENTITY obscite.preferences.filefilterstrategy-default-label "Default File Filter: recursively find markdown files beginning with @">
+<!ENTITY obscite.preferences.filefilterstrategy-default-desc1 "Markdown files should begin with @{{citekey}}, where {{citekey}} is the BetterBibTeX citekey,">
+<!ENTITY obscite.preferences.filefilterstrategy-default-desc2 "e.g. a filename could be '@shepard1987science Universal Law.md', where 'shepard1987science' is the BetterBibTeX citekey.">
+
+<!ENTITY obscite.preferences.filefilterstrategy-customfileregex-label "Custom File Filter: recursively find files matching this RegEx pattern">
+<!ENTITY obscite.preferences.filepattern-label "regex (case insensitive): /">
+<!ENTITY obscite.preferences.filepattern-label-end "/i">
 <!ENTITY obscite.preferences.filefilterstrategy-customfileregex-desc "Default pattern is:   ^@.+\.md$">
 
-<!ENTITY obscite.preferences.matchstrategy-bbtcitekey-label "Match notes based on BetterBibTex citekey">
-<!ENTITY obscite.preferences.matchstrategy-bbtcitekey-desc "ZoteroObsidianCitations will search the Markdown files for BetterBibTex citekeys.">
+<!ENTITY obscite.preferences.matchstrategy-bbtcitekey-title "Use BetterBibTeX citekeys to link markdown files to Zotero items (Option 1)">
+<!ENTITY obscite.preferences.matchstrategy-bbtcitekey-label "Match notes based on BetterBibTeX citekey">
+<!ENTITY obscite.preferences.matchstrategy-bbtcitekey-desc "ZoteroObsidianCitations will search the markdown files for BetterBibTeX citekeys.">
 
 <!ENTITY obscite.preferences.metadata-keyword-title "(Optional) Markdown Metadata Keyword">
 <!ENTITY obscite.preferences.metadata-keyword-label "yaml keyword:">
-<!ENTITY obscite.preferences.metadata-keyword-desc "If you want to extract the citekey from a Markdown note's metadata, indicate the keyword here. A common value is: 'citekey'.">
-<!ENTITY obscite.preferences.metadata-keyword-subdesc "If no value is given, the citekey will be taken from the note's title.">
+<!ENTITY obscite.preferences.metadata-keyword-desc1 "If you want to extract the citekey from a markdown note's metadata, indicate the keyword here. A common value is: 'citekey'.">
+<!ENTITY obscite.preferences.metadata-keyword-desc2 "If no value is given, the citekey will be taken from the filename.">
 
+<!ENTITY obscite.preferences.matchstrategy-zotitemkey-title "Use Zotero-Item-Keys to link markdown files to Zotero items (Option 2)">
 <!ENTITY obscite.preferences.matchstrategy-zotitemkey-label "Match notes based on Zotero-Item-Key">
-<!ENTITY obscite.preferences.matchstrategy-zotitemkey-desc "ZoteroObsidianCitations will search the Markdown files for Zotero Item Keys.">
+<!ENTITY obscite.preferences.matchstrategy-zotitemkey-desc "ZoteroObsidianCitations will search the markdown file contents for Zotero-Item-Keys.">
 
-<!ENTITY obscite.preferences.zotkeyregex-title "Required: Specify a RegEx to match the Zotero-Item-Key from the Markdown contents,">
-<!ENTITY obscite.preferences.zotkeyregex-desc  "              e.g. match 'ABCD1234' in 'zotero://select/library/items/ABCD1234'">
-<!ENTITY obscite.preferences.zotkey-regex-label "regex:">
-<!ENTITY obscite.preferences.zotkey-regex-subdesc "N.B. this is not the same as the BetterBibTex citekey you assigned an item (e.g. 'shepard1987science' in 'zotero://select/items/@shepard1987science')">
+<!ENTITY obscite.preferences.zotkeyregex-title1 "Required: Specify a RegEx to match the Zotero-Item-Key from the markdown contents">
+<!ENTITY obscite.preferences.zotkeyregex-title2  "               ( e.g. match 'ABCD1234' in 'zotero://select/library/items/ABCD1234' )">
+<!ENTITY obscite.preferences.zotkeyregex-label "regex: /">
+<!ENTITY obscite.preferences.zotkeyregex-label-end "/">
+<!ENTITY obscite.preferences.zotkeyregex-desc1 "N.B. this is not the same as the BetterBibTeX citekey you assigned an item.">
+<!ENTITY obscite.preferences.zotkeyregex-desc2 "(e.g. it is not 'shepard1987science' in 'zotero://select/items/@shepard1987science')">
 
 <!ENTITY obscite.preferences.choose-button-label "Choose…">
+<!ENTITY obscite.preferences.spacer " ">
+
+<!ENTITY obscite.preferences.customtag-title "Specify a custom tag string">
+<!ENTITY obscite.preferences.customtag-label "(Default is 'ObsCite')">
 
 <!ENTITY obscite.preferences.rundebug-label "Save Debugging Log">
 <!ENTITY obscite.preferences.rundebug-desc "If you're encounternig errors, you can generate a debugging file to examine yourself and/or to include in a github issue.">
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 135c639..e089e51 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -3,4 +3,5 @@ pref("extensions.obscite.matchstrategy", "bbtcitekey");
 pref("extensions.obscite.zotkeyregex", "");
 pref("extensions.obscite.metadatakeyword", "");
 pref("extensions.obscite.filefilterstrategy", "default");
-pref("extensions.obscite.filepattern", "^@.+\\.md$");
\ No newline at end of file
+pref("extensions.obscite.filepattern", "^@.+\\.md$");
+pref("extensions.obscite.tagstr", "ObsCite");
\ No newline at end of file