diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-13 22:13:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-13 22:13:54 +0000 |
commit | 9fa66805b3c7cfd28651d9ba7f8e8a68560bab67 (patch) | |
tree | bdb5e3e848d630fe5b484d3c0b82f95bfae71143 /Master/texmf-dist/scripts | |
parent | fc0e8097d4dc1f19295fd1b0a7c3bca573b4b12e (diff) |
bib2gls (13feb20)
git-svn-id: svn://tug.org/texlive/trunk@53770 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-x | Master/texmf-dist/scripts/bib2gls/bib2gls.jar | bin | 263324 -> 271912 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar | bin | 26396 -> 39240 bytes | |||
-rw-r--r-- | Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml | 84 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/bib2gls/texparserlib.jar | bin | 966352 -> 992103 bytes |
4 files changed, 69 insertions, 15 deletions
diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar Binary files differindex 65f155ba5ba..94843925432 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/convertgls2bib.jar b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar Binary files differindex 4c2af98a482..b13ebbe48e5 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 de36c1eac03..524ba7ca257 100644 --- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml +++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml @@ -55,7 +55,7 @@ See the manual for further details.</entry> Don''t warn if internal non-bib fields are found in .bib file.</entry> <entry key="syntax.warn.unknown.entry.types">{0} Warn if unknown entry types are found in .bib file.</entry> -<entry key="syntax.no-warn.unknown.entry.types">{0} +<entry key="syntax.no.warn.unknown.entry.types">{0} Don''t warn if unknown entry types are found in .bib file.</entry> <entry key="syntax.merge.nameref.on">{0} <rule> @@ -140,6 +140,12 @@ See the manual for further details.</entry> <entry key="syntax.no.trim.fields">{0} Don''t trim leading and trailing spaces from fields (default).</entry> +<entry key="syntax.trim.only.fields">{0} <list> + Only trim leading and trailing spaces from listed fields. + (Cumulative.)</entry> +<entry key="syntax.trim.except.fields">{0} <list> + Trim leading and trailing spaces from all fields except those listed. + (Cumulative.)</entry> <entry key="syntax.expand.fields">{0} Don''t write \glsnoexpandfields to the .glstex file.</entry> <entry key="syntax.no.expand.fields">{0} @@ -189,6 +195,7 @@ See the manual for further details.</entry> <entry key="message.field.notset">Field {0} not set for entry {1}</entry> <entry key="message.selection.mode">Selection mode: {0}</entry> <entry key="message.ignore.fields">Ignoring fields:</entry> +<entry key="message.ignore.field">Ignoring field ''{0}'' for entry ''{1}''</entry> <entry key="message.sort.mode">Sort mode: {0}</entry> <entry key="message.sort.field">Sort field: {0}</entry> <entry key="message.sort.date.locale">Date/time sort locale: {0}</entry> @@ -244,6 +251,7 @@ See the manual for further details.</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> +<entry key="message.parsing.fields">Parsing fields for entry ''{0}''</entry> <entry key="message.setting.sort">Initialising collation keys (strength={0}, decomposition={1})</entry> <entry key="message.non_unique_sort">Sort value ''{0}'' (entry ''{1}'') not unique for the entry''s hierarchical level.</entry> <entry key="message.sort_suffix">Appending suffix ''{0}'' to the sort value ''{1}'' for entry ''{2}''.</entry> @@ -292,6 +300,11 @@ Defaulting to: {0}. <entry key="message.created.missing.parent">Created missing parent ''{0}'' for entry ''{1}''</entry> <entry key="message.found_entry_in_resource">Found entry ''{0}'' in resource set: {1}</entry> <entry key="message.spawning">Spawning ''{0}'' (from ''{1}'')</entry> +<entry key="message.append.prefix.space">Appending {0} for prefix field ''{1}''</entry> +<entry key="message.append.prefix.nospace">Not appending anything for prefix field ''{0}'' (ends with exception character code {1})</entry> +<entry key="message.append.prefix.cs.nospace">Not appending anything for prefix field ''{0}'' (ends with exception control sequence \{1})</entry> +<entry key="message.append.prefix.no.excp">Appending {0} for prefix field ''{1}'' (''{2}'' doesn''t fit exception rules)</entry> +<entry key="message.append.prefix.nbsp.match">Append nbsp for prefix field ''{0}'': matched ''{1}'' in ''{2}'' (pattern ''{3}'')</entry> <entry key="tag.page">Page</entry> <entry key="tag.pages">Pages</entry> @@ -337,6 +350,10 @@ Falling back on ID.</entry> <entry key="warning.missing.field">Entry ''{0}'' missing required field: {1}</entry> <entry key="warning.potential.nested.link">Entry ''{0}'' has potentially nested link text in field: {1} Consider using \glsps'{'{3}'}' or \glspt'{'{3}'}' instead of {2}'{'{3}'}'</entry> +<entry key="warning.glsadd.in.field">Entry ''{0}'' contains \glsadd in field: {1} +Consider using a dual entry or add ''{2}'' to one of the cross-referencing fields instead. +(With a dual entry type, you don''t need to link a primary to its dual +with \glsadd. They are automatically dependent on each other.)</entry> <entry key="warning.dir.no.write">Directory not writable: {0} Using TEXMFOUTPUT instead: {1}</entry> <entry key="warning.conflicting.range.format">Entry location conflict for formats: {0} and {1} @@ -379,6 +396,8 @@ Aliased entries must be in the same resource set as their target entries with op <entry key="warning.identical">Identical sort values for ''{0}'' and ''{1}''</entry> <entry key="warning.identical.id">Falling back on ID</entry> <entry key="warning.identical.original_id">Falling back on original ID</entry> +<entry key="warning.identical.def">Falling back on order of definition</entry> +<entry key="warning.identical.use">Falling back on order of use</entry> <entry key="warning.identical.none">No fallback</entry> <entry key="warning.identical.field">Falling back on ''{0}'' field (''{1}'' <=> ''{2}'' = {3})</entry> <entry key="warning.unknown.widest.fortype">Can''t determine widest level {0} entry for glossary type ''{1}''. Using fallback method.</entry> @@ -423,8 +442,12 @@ Value must be a list of size {2,number}</entry> <entry key="error.invalid.opt.keylist.value">Invalid ''{0}'' value ''{1}'' (within option ''{2}'')</entry> <entry key="error.invalid.opt.keylist.key">Invalid key ''{0}'' within option ''{1}''</entry> <entry key="error.invalid.opt.keylist.pattern">Invalid pattern ''{1}'' in {0}='{'{1}'}' (within option ''{2}'')</entry> +<entry key="error.invalid.opt.pattern">Invalid pattern ''{0}'' in option ''{1}''</entry> <entry key="error.missing.value">Missing value for: {0}</entry> <entry key="error.option.clash">Option clash: {0} and {1}</entry> +<entry key="error.append.prefix.field">Invalid {0} found in {1} (value should be a sequence of characters only)</entry> +<entry key="error.append.prefix.field.cs">Invalid {0} found in {1} (value should be a sequence of commands only)</entry> +<entry key="error.append.prefix.field.spacecs">Invalid value ''{0}'' for option {1} (value should be a single command)</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> @@ -490,23 +513,51 @@ Use {1} for help.</entry> <entry key="gls2bib.syntax">{0} [<options>] <tex file> <bib file></entry> <entry key="gls2bib.syntax.options">Options:</entry> -<entry key="gls2bib.syntax.version">{0} (or {1}) Display version information</entry> -<entry key="gls2bib.syntax.help">{0} (or {1}) Display help</entry> -<entry key="gls2bib.syntax.texenc">{0} <encoding> .tex file encoding</entry> -<entry key="gls2bib.syntax.bibenc">{0} <encoding> .bib file encoding</entry> -<entry key="gls2bib.syntax.ignore-sort">{0} Ignore sort field (default)</entry> -<entry key="gls2bib.syntax.no-ignore-sort">{0} Don''t ignore sort field</entry> -<entry key="gls2bib.syntax.space-sub">{0} <value> Substitute spaces in labels with <value></entry> -<entry key="gls2bib.syntax.locale">{0} <lang tag> Use language resource file given by <lang tag> for messages.</entry> -<entry key="gls2bib.syntax.silent">{0} Suppress messages.</entry> -<entry key="gls2bib.syntax.verbose">{0} Normal messages.</entry> -<entry key="gls2bib.syntax.debug">{0} Debug mode.</entry> +<entry key="gls2bib.syntax.options.general">General:</entry> +<entry key="gls2bib.syntax.options.locale">Encoding and Localisation:</entry> +<entry key="gls2bib.syntax.options.filter">Filtering:</entry> +<entry key="gls2bib.syntax.options.io">Output Files:</entry> +<entry key="gls2bib.syntax.options.adjust">Adjustments:</entry> +<entry key="gls2bib.syntax.version">{0} (or {1}) Display version information</entry> +<entry key="gls2bib.syntax.help">{0} (or {1}) Display help</entry> +<entry key="gls2bib.syntax.texenc">{0} <encoding> .tex file encoding</entry> +<entry key="gls2bib.syntax.bibenc">{0} <encoding> .bib file encoding</entry> +<entry key="gls2bib.syntax.ignore-sort">{0} Ignore sort field (default)</entry> +<entry key="gls2bib.syntax.no-ignore-sort">{0} Don''t ignore sort field</entry> +<entry key="gls2bib.syntax.ignore-type">{0} Omit type field</entry> +<entry key="gls2bib.syntax.no-ignore-type">{0} Don''t omit type field (default)</entry> +<entry key="gls2bib.syntax.split-on-type">{0} or {1} Split entries into separate files according to type field</entry> +<entry key="gls2bib.syntax.no-split-on-type">{0} Don''t split entries according to type field (default)</entry> +<entry key="gls2bib.syntax.ignore-category">{0} Omit category field</entry> +<entry key="gls2bib.syntax.no-ignore-category">{0} Don''t omit category field (default)</entry> +<entry key="gls2bib.syntax.split-on-category">{0} or {1} Split entries into separate files according to category field</entry> +<entry key="gls2bib.syntax.no-split-on-category">{0} Don''t split entries according to category field (default)</entry> +<entry key="gls2bib.syntax.ignore-fields">{0} <list> or {1} <list> + Ignore the fields contained in the comma-separated <list></entry> +<entry key="gls2bib.syntax.overwrite">{0} Overwrite files (default unless {1} or {2})</entry> +<entry key="gls2bib.syntax.no-overwrite">{0} Don''t overwrite files</entry> +<entry key="gls2bib.syntax.preamble-only">{0} or {1} Only parse the preamble</entry> +<entry key="gls2bib.syntax.no-preamble-only">{0} Parse the entire document (default).</entry> +<entry key="gls2bib.syntax.space-sub">{0} <val> or {1} <val> Substitute spaces in labels with <val></entry> +<entry key="gls2bib.syntax.index-conversion">{0} or {1} Convert @entry to @index if no description.</entry> +<entry key="gls2bib.syntax.no-index-conversion">{0} Don''t convert @entry to @index.</entry> +<entry key="gls2bib.syntax.absorb-see">{0} Absorb \glssee and \glsxtrindexseealso into the data (default).</entry> +<entry key="gls2bib.syntax.no-absorb-see">{0} Don''t absorb \glssee and \glsxtrindexseealso into the data.</entry> +<entry key="gls2bib.syntax.locale">{0} <iso tag> Use language resource file given by <iso tag> for messages.</entry> +<entry key="gls2bib.syntax.silent">{0} Suppress messages.</entry> +<entry key="gls2bib.syntax.verbose">{0} Normal messages.</entry> +<entry key="gls2bib.syntax.debug">{0} Debug mode.</entry> <entry key="gls2bib.override.newdualentry">Overriding default definition of \newdualentry with custom definition. (Change \newcommand to \providecommand if you want \newdualentry[options]'{'label'}{'short'}{'long'}{'description'}' converted to @dualabbreviationentry.)</entry> +<entry key="gls2bib.absorbsee">Absorbing {0}</entry> +<entry key="gls2bib.absorbsee.entryundef">Unable to absorb {0}: can''t find entry ''{1}''</entry> +<entry key="gls2bib.absorbsee.failed">Unable to absorb {0} into {1}</entry> +<entry key="gls2bib.discarding.field">Discarding field ''{0}={1}'' for entry {2}</entry> + <!-- The following messages are used by various parts of texparserlib.jar only a few of them may actually be generated by @@ -529,6 +580,7 @@ converted to @dualabbreviationentry.)</entry> <entry key="error.syntax.batch.missing_out">Output directory required for batch mode</entry> <entry key="error.syntax.batch.unknown_format">Unknown format ''{0}''</entry> <entry key="error.exists">{0} already exists</entry> +<entry key="error.file_exists.nooverwrite">Can''t write to ''{0}'': file already exists (use {1} to force overwrite)</entry> <entry key="tex.error.bad_param">Parameter digit 1 to 9 expected. Found ''{0}''</entry> <entry key="tex.error.no_eg">Missing end group</entry> @@ -546,9 +598,9 @@ converted to @dualabbreviationentry.)</entry> <entry key="tex.error.dimen_expected">Dimension expected</entry> <entry key="tex.error.missing_unit">Missing unit</entry> <entry key="tex.error.expected">Expected {0}</entry> -<entry key="tex.error.undefined">Undefined command \{0}</entry> +<entry key="tex.error.undefined">Undefined command {0}</entry> <entry key="tex.error.undefined_char">Undefined active character ''{0}''</entry> -<entry key="tex.error.cs_expected">Control sequence expected (found ''{0}'')</entry> +<entry key="tex.error.cs_expected">Control sequence expected (found ''{0}'', class ''{1}'')</entry> <entry key="tex.error.number_expected">Number expected (found ''{0}'')</entry> <entry key="tex.error.register_undef">Unknown register ''{0}''</entry> <entry key="tex.error.syntax">Invalid syntax for {0}</entry> @@ -585,6 +637,8 @@ converted to @dualabbreviationentry.)</entry> <entry key="latex.class.error">Class {0} Error: {1}</entry> <entry key="latex.illegal.argtype">Illegal argument type {0}</entry> <entry key="latex.package.not.loaded">Package ''{0}'' has not been loaded</entry> +<entry key="latex.error.counter.too.large">Counter too large</entry> +<entry key="latex.error.counter.out.of.range">Counter value {0} out of valid range ({1})</entry> <entry key="bibtex.error.missing_value">Missing value</entry> <entry key="bibtex.error.expecting">Expecting ''{0}''</entry> @@ -599,7 +653,7 @@ converted to @dualabbreviationentry.)</entry> <entry key="bibtex.error.illegal_end">Illegal end</entry> <entry key="bibtex.error.missing">Missing</entry> <entry key="bibtex.error.too_many_commas">Too many commas in name ''{0}''</entry> -<entry key="bibtex.error.string_name_undefined">String name ''{0}'' undefined</entry> +<entry key="bibtex.error.string_name_undefined">String name ''{0}'' undefined (did you forget braces or quotes?)</entry> <entry key="bibtex.error.repeated_entry">Repeated entry ''{0}''</entry> <!-- Package messages --> diff --git a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar Binary files differindex c70d894ad0d..5d651f9e4a1 100755 --- a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar +++ b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar |