bib2gls (25feb18)

git-svn-id: svn://tug.org/texlive/trunk@46742 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 24 insertions, 7 deletions

diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar
index e19edc5510a..ce9f8050835 100755
--- a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar
+++ b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar
diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.sh b/Master/texmf-dist/scripts/bib2gls/bib2gls.sh
index 5f9d7f71e60..124091e7f3b 100755
--- a/Master/texmf-dist/scripts/bib2gls/bib2gls.sh
+++ b/Master/texmf-dist/scripts/bib2gls/bib2gls.sh
@@ -8,5 +8,5 @@ else
  jarpath=`kpsewhich --progname=bib2gls --format=texmfscripts bib2gls.jar`
 fi
 
-java -Djava.locale.providers=CLDR,JRE -jar "$jarpath" "$@"
+java -Djava.locale.providers=CLDR,JRE,SPI -jar "$jarpath" "$@"
 
diff --git a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar
index a54983a120d..0bcfee40d95 100755
--- a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar
+++ b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar
diff --git a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
index 52b02f19c5c..40d63d636de 100644
--- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
+++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
@@ -15,11 +15,10 @@ See the manual for further details.</entry>
 <entry key="syntax.options">Options:</entry>
 <entry key="syntax.version">{0} (or {1})	Display version and exit.</entry>
 <entry key="syntax.help">{0} (or {1})		Display this help message and exit.</entry>
-<entry key="syntax.debug">{0} [&lt;n&gt;]		Switch on debug mode (optionally with the 
-					given level).</entry>
+<entry key="syntax.debug">{0} [&lt;n&gt;]		Switch on debug mode (optionally with the given level).</entry>
 <entry key="syntax.nodebug">{0}		Switch off debug mode. (Default.)</entry>
 <entry key="syntax.nodebug">{0}		Switch off debug mode. (Default.)
-					Synonym: {1}</entry>
+			Synonym: {1}</entry>
 <entry key="syntax.verbose">{0}		Switch on verbose mode.</entry>
 <entry key="syntax.noverbose">{0}		Switch off verbose mode. (Default.)
 			Some messages are displayed.
@@ -38,6 +37,20 @@ See the manual for further details.</entry>
 <entry key="syntax.break.space">{0}		Interpret tilde character as normal space.</entry>
 <entry key="syntax.no.break.space">{0}	Interpret tilde character as a non-breaking space 
 			(default).</entry>
+<entry key="syntax.force.cross.resource.refs">{0} (or {1})
+			Force cross-resource referencing mode on.</entry>
+<entry key="syntax.no.force.cross.resource.refs">{0}
+			Don''t force cross-resource referencing mode on 
+			(default).</entry>
+
+<entry key="syntax.support.unicode.script">{0}
+			Text superscripts or subscripts will use Unicode 
+			superscript or subscript characters if possible
+			(default).</entry>
+<entry key="syntax.no.support.unicode.script">{0}
+			Text superscripts or subscripts won''t use Unicode
+			superscript or subscript characters.</entry>
+
 
 <entry key="syntax.mfirstuc">{0} &lt;fields&gt;|"all" (or {1} &lt;fields&gt;|"all")
 			Insert an empty group if fields start 
@@ -104,7 +117,8 @@ See the manual for further details.</entry>
 <entry key="syntax.trim.fields">{0}
 			Trim leading and trailing spaces from fields.</entry>
 <entry key="syntax.no.trim.fields">{0}
-			Don''t trim leading and trailing spaces from fields (default).</entry>
+			Don''t trim leading and trailing spaces from fields 
+			(default).</entry>
 <entry key="syntax.expand.fields">{0}
 			Don''t write \glsnoexpandfields to the .glstex file.</entry>
 <entry key="syntax.no.expand.fields">{0}
@@ -149,6 +163,7 @@ See the manual for further details.</entry>
 <entry key="message.sort.date.format">Date/time sort format: {0}</entry>
 <entry key="message.sort.numeric.locale">Numeric sort locale: {0}</entry>
 <entry key="message.sort.numeric.format">Numeric sort format: {0}</entry>
+<entry key="message.no.sort.required">No sorting required.</entry>
 <entry key="message.label.prefix">Label prefix: {0}</entry>
 <entry key="message.dual.label.prefix">Dual label prefix: {0}</entry>
 <entry key="message.tertiary.label.prefix">Tertiary label prefix: {0}</entry>
@@ -188,7 +203,8 @@ See the manual for further details.</entry>
 <entry key="message.processing.master">Processing master {0}.</entry>
 <entry key="message.selecting.entries">Selecting entries for resource {0}.</entry>
 <entry key="message.cross-resource.dep.allowed">Cross-resource references allowed.</entry>
-<entry key="message.cross-resource.dep.notallowed">Cross-resource references disabled.</entry>
+<entry key="message.cross-resource.dep.notallowed">Cross-resource references disabled.
+(Use {0} to override if required.)</entry>
 <entry key="message.cross-resource.notallowed">Cross-resource references can''t be supported for resource set {0}.</entry>
 <entry key="message.checking.read">Checking read access for {0}</entry>
 <entry key="message.checking.write">Checking write access for {0}</entry>
@@ -351,8 +367,9 @@ Value must be a list of size {2,number}</entry>
 <entry key="error.invalid.dual.map">Invalid mapping: {0}={1}
 The size of the first list ({2,number}) is not the same as the size of 
 the second list ({3,number}).</entry>
-<entry key="error.invalid.field">Invalid field ''{0}'' provided by option ''{1}''</entry>
+<entry key="error.invalid.field">Invalid field ''{0}'' given in option ''{1}''</entry>
 <entry key="error.invalid.entry.type">Invalid entry type ''{0}'' provided in option ''{1}''</entry>
+<entry key="error.invalid.substitution">Invalid substitution ''{0}'' provided in option ''{1}'' (required syntax: '{'regex'}{'replacement'}')</entry>
 <entry key="error.openin.forbidden">Read access forbidden for file: {0}</entry>
 <entry key="error.openout.forbidden">Write access forbidden for file: {0}</entry>
 <entry key="error.forbidden.ext">Write access forbidden for extension: {0}</entry>
diff --git a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar
index 57802858524..f3ba6dc02ac 100755
--- a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar
+++ b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar