diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log new file mode 100644 index 00000000..b2080e92 --- /dev/null +++ b/.vscode/configurationCache.log @@ -0,0 +1 @@ +{"buildTargets":["FORCE","Makefile.in","all","zotfile-5.1.1.9001-fx.xpi","zotfile.xpi"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log new file mode 100644 index 00000000..da43fea3 --- /dev/null +++ b/.vscode/dryrun.log @@ -0,0 +1,11 @@ +make --dry-run --always-make --keep-going --print-directory +make: Entering directory `/Users/work/Development/Plugins/zotfile' +echo "all: zotfile-5.1.1.9001-fx.xpi" > Makefile.in +make: Leaving directory `/Users/work/Development/Plugins/zotfile' + +make: Entering directory `/Users/work/Development/Plugins/zotfile' +rm -rf zotfile.xpi +zip -r zotfile.xpi chrome chrome.manifest defaults install.rdf -x \*.DS_Store +mv zotfile.xpi zotfile-5.1.1.9001-fx.xpi +make: Leaving directory `/Users/work/Development/Plugins/zotfile' + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/.vscode/targets.log b/.vscode/targets.log new file mode 100644 index 00000000..acb5c687 --- /dev/null +++ b/.vscode/targets.log @@ -0,0 +1,274 @@ +make all --print-data-base --no-builtin-variables --no-builtin-rules --question +# GNU Make 3.81 +# Copyright (C) 2006 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. +# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# This program built for i386-apple-darwin11.3.0 + + +# Make data base, printed on Mon Sep 5 09:18:36 2022 + +# Variables + +# automatic +/dev/null || echo /Developer)/Makefiles +# environment +VSCODE_CODE_CACHE_PATH = /Users/work/Library/Application Support/Code/CachedData/e4503b30fc78200f846c62cf8091b76ff5547662 +# environment +LOGNAME = work +# environment +APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 1 +# environment +VSCODE_HANDLES_UNCAUGHT_ERRORS = true +# automatic +^D = $(patsubst %/,%,$(dir $^)) +# environment +XPC_FLAGS = 0x0 +# default +MAKE = $(MAKE_COMMAND) +# default +MAKECMDGOALS := all +# environment +SHLVL = 1 +# default +MAKE_VERSION := 3.81 +# environment +USER = work +# makefile +.DEFAULT_GOAL := all +# automatic +%D = $(patsubst %/,%,$(dir $%)) +# default +MAKE_COMMAND := /Library/Developer/CommandLineTools/usr/bin/make +# default +.VARIABLES := +# environment +TMPDIR = /var/folders/bj/qdt6t6n17771fk3qb401wngr0000gp/T/ +# automatic +*F = $(notdir $*) +# environment +VSCODE_IPC_HOOK = /Users/work/Library/Application Support/Code/1.70.2-main.sock +# environment +MallocNanoZone = 0 +# makefile +MAKEFLAGS = Rrqp +# environment +MFLAGS = -Rrqp +# automatic +*D = $(patsubst %/,%,$(dir $*)) +# environment +XPC_SERVICE_NAME = application.com.microsoft.VSCode.23274738.23274744 +# automatic ++D = $(patsubst %/,%,$(dir $+)) +# automatic ++F = $(notdir $+) +# environment +__CF_USER_TEXT_ENCODING = 0x1F6:0x0:0x2 +# environment +COMMAND_MODE = unix2003 +# default +MAKEFILES := +# automatic + Makefile.in + + +# Not a target: +.DEFAULT: +# Implicit rule search has not been done. +# Modification time never checked. +# File has not been updated. + +# files hash-table stats: +# Load=9/1024=1%, Rehash=0, Collisions=0/33=0% +# VPATH Search Paths + +# No `vpath' search paths. + +# No general (`VPATH' variable) search path. + +# # of strings in strcache: 2 +# # of strcache buffers: 1 +# strcache size: total = 4096 / max = 4096 / min = 4096 / avg = 4096 +# strcache free: total = 4075 / max = 4075 / min = 4075 / avg = 4075 + +# Finished Make data base on Mon Sep 5 09:18:36 2022 + + diff --git a/chrome/content/zotfile/wildcards.js b/chrome/content/zotfile/wildcards.js index 0ffec32b..6165b181 100644 --- a/chrome/content/zotfile/wildcards.js +++ b/chrome/content/zotfile/wildcards.js @@ -68,6 +68,9 @@ Zotero.ZotFile.Wildcards = new function() { if(truncate!=-1) title = title.substr(0,truncate); } + // removing rich text formatting + title = title.replace(/<[\w\s"=\/]+>/g, ''); + // truncate if to long if (title.length > Zotero.ZotFile.getPref("max_titlelength")) { var max_titlelength=Zotero.ZotFile.getPref("max_titlelength"); @@ -91,8 +94,8 @@ Zotero.ZotFile.Wildcards = new function() { // replace forbidden characters with meaningful alternatives (they can only apear in the middle of the text at this point) title = title.replace(/[\/\\]/g, '-'); - title = title.replace(/[\*|"<>]/g, ''); - title = title.replace(/[\?:]/g, ' -'); + title = title.replace(/[\*|"<>,]/g, ''); + title = title.replace(/[\?:;]/g, ' -'); return(title); } diff --git a/install.rdf b/install.rdf index f01eac40..a55aba24 100644 --- a/install.rdf +++ b/install.rdf @@ -5,7 +5,7 @@ zotfile@columbia.edu ZotFile - 5.1.2.999 + 5.1.2.9001 2 true Joscha Legewie