From 6a8c1f1989f77d1cbfb63c938b9a9ad0093803ce Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 1 Dec 2018 22:46:56 +0000 Subject: bib2gls (1dec18) git-svn-id: svn://tug.org/texlive/trunk@49293 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/bib2gls/bib2gls.jar | Bin 210435 -> 243566 bytes Master/texmf-dist/scripts/bib2gls/bib2gls.sh | 24 +++++++++++++++------ .../texmf-dist/scripts/bib2gls/convertgls2bib.jar | Bin 26335 -> 26335 bytes .../scripts/bib2gls/resources/bib2gls-en.xml | 16 ++++++++++++++ Master/texmf-dist/scripts/bib2gls/texparserlib.jar | Bin 940530 -> 951449 bytes 5 files changed, 33 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/scripts') diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar index 5d3db439d82..2141ce3e14c 100755 Binary files a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar and b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar differ diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.sh b/Master/texmf-dist/scripts/bib2gls/bib2gls.sh index 124091e7f3b..2e720ffb545 100755 --- a/Master/texmf-dist/scripts/bib2gls/bib2gls.sh +++ b/Master/texmf-dist/scripts/bib2gls/bib2gls.sh @@ -1,12 +1,22 @@ #!/bin/sh +# Adapted from tlcockpit.sh to ensure the script works with cygwin -kernel=`uname -s` -if test "${kernel#*CYGWIN}" != "$kernel" -then - jarpath=`cygpath -w $(kpsewhich --progname=bib2gls --format=texmfscripts bib2gls.jar)` -else - jarpath=`kpsewhich --progname=bib2gls --format=texmfscripts bib2gls.jar` +scriptname=`basename "$0" .sh` +jar="$scriptname.jar" +jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"` + +kernel=`uname -s 2>/dev/null` +if echo "$kernel" | grep CYGWIN >/dev/null; then + CYGWIN_ROOT=`cygpath -w /` + export CYGWIN_ROOT + jarpath=`cygpath -w "$jarpath"` fi -java -Djava.locale.providers=CLDR,JRE,SPI -jar "$jarpath" "$@" +# User may have globally set their locale provider preference in +# $JAVA_TOOL_OPTIONS so don't override it. +if [ -z "$JAVA_TOOL_OPTIONS" ]; then + exec java -Djava.locale.providers=CLDR,JRE,SPI -jar "$jarpath" "$@" +else + exec java -jar "$jarpath" "$@" +fi diff --git a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar index 4fb33e1a006..a5b5e1dfe19 100755 Binary files a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar and b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar differ diff --git a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml index 9e77be67c94..223c3e6b891 100644 --- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml +++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml @@ -50,6 +50,12 @@ See the manual for further details. Don''t force cross-resource referencing mode on (default). +{0} <rule> + Rule for merging locations with record=nameref + (requires glossaries-extra version 1.37+). + <rule> may be one of: ''hcounter'', ''href'', ''title'' + or ''location''. + {0} Text superscripts or subscripts will use Unicode superscript or subscript characters if possible @@ -156,6 +162,7 @@ See the manual for further details. Entry {0}: found cross-reference ({1}): {2} Entry {0} cross-referenced by {1} Checking cross-references for: {0} +Entry {0}: found custom ''{1}'' dependency ({2}): {3} Field {0} not set. Dual found: {0} (primary {1}) Adding alias {0} as dependency for {1} @@ -181,6 +188,7 @@ See the manual for further details. Numeric sort locale: {0} Numeric sort format: {0} No sorting required. +Label list sort method ''{0}'' on {1,choice,1#field|1<fields}: {2} Label prefix: {0} Dual label prefix: {0} Tertiary label prefix: {0} @@ -247,6 +255,7 @@ Defaulting to: {0}. Detected encoding: {0} Default encoding: {0} not set +Detected font encoding: {0} id missing Default document locale: {0} {1} Adding record {0} to entry {1}''s record list. @@ -268,7 +277,9 @@ Defaulting to: {0}. Entry ''{0}'' missing sort field ''{1}''. Falling back on field ''{2}''. Automatic support for: Support available for: +Support may be quite limited in some cases. Created missing parent ''{0}'' for entry ''{1}'' +Found entry ''{0}'' in resource set: {1} Page Pages @@ -291,6 +302,8 @@ Defaulting to: {0}. Warning: {0} Substituting {0} with {1} Removing {0} +Can''t parse {0} +{1} Ignoring unknown entry type: {0} Ignoring unknown encoding: {0} Ignoring unknown field: {0} @@ -306,6 +319,7 @@ Falling back on ID. Can''t parse {0} value ''{1}'' (pattern: ''{2}'') Entry type ''{0}'' deprecated. Use ''{1}'' instead. Option ''{0}'' deprecated. Use ''{1}'' instead. +Command ''{0}'' deprecated. Use ''{1}'' instead. Entry ''{0}'' missing required field: {1} Entry ''{0}'' has potentially nested link text in field: {1} Consider using \glsps'{'{3}'}' or \glspt'{'{3}'}' instead of {2}'{'{3}'}' @@ -358,6 +372,8 @@ Aliased entries must be in the same resource set as their target entries with op Unrecognised locale: {0}. Using {1} instead. Interpreter needed to obtain fallback contents for field {0} (entry {1}) Multiple supplemental locations not supported with glossaries-extra {1}. Restricting selection to just {0}. Update to at least glossaries-extra version {2} to support multiple supplementary sources. +Unknown entry: {0} +Unknown entry ''{0}'' in current resource set: {1} Error: {0} The 'alias' field can't be mapped. diff --git a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar index ee969c62616..89c1d8fbf70 100755 Binary files a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar and b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar differ -- cgit v1.2.3