From 9fa66805b3c7cfd28651d9ba7f8e8a68560bab67 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 13 Feb 2020 22:13:54 +0000 Subject: bib2gls (13feb20) git-svn-id: svn://tug.org/texlive/trunk@53770 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/bib2gls/CHANGES | 67 +++++++++++++++++ Master/texmf-dist/doc/support/bib2gls/README.md | 3 +- .../doc/support/bib2gls/bib2gls-begin.pdf | Bin 719773 -> 726603 bytes Master/texmf-dist/doc/support/bib2gls/bib2gls.1 | 24 ++++-- Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf | Bin 4449928 -> 4530680 bytes .../doc/support/bib2gls/convertgls2bib.1 | 81 +++++++++++++++++++-- .../support/bib2gls/examples/sample-authors.pdf | Bin 49017 -> 48997 bytes .../support/bib2gls/examples/sample-bacteria.pdf | Bin 50468 -> 50456 bytes .../support/bib2gls/examples/sample-chemical.pdf | Bin 50256 -> 50245 bytes .../support/bib2gls/examples/sample-citations.pdf | Bin 47338 -> 47240 bytes .../support/bib2gls/examples/sample-constants.pdf | Bin 89416 -> 89404 bytes .../bib2gls/examples/sample-markuplanguages.pdf | Bin 56334 -> 56324 bytes .../doc/support/bib2gls/examples/sample-maths.pdf | Bin 110958 -> 110939 bytes .../doc/support/bib2gls/examples/sample-media.pdf | Bin 160811 -> 160838 bytes .../support/bib2gls/examples/sample-msymbols.pdf | Bin 103819 -> 103806 bytes .../doc/support/bib2gls/examples/sample-multi1.pdf | Bin 243192 -> 243258 bytes .../doc/support/bib2gls/examples/sample-multi2.pdf | Bin 317978 -> 318229 bytes .../doc/support/bib2gls/examples/sample-people.pdf | Bin 47760 -> 47742 bytes .../bib2gls/examples/sample-textsymbols.pdf | Bin 69804 -> 69791 bytes .../bib2gls/examples/sample-textsymbols2.pdf | Bin 67012 -> 67002 bytes .../doc/support/bib2gls/examples/sample-units1.pdf | Bin 53015 -> 53003 bytes .../doc/support/bib2gls/examples/sample-units2.pdf | Bin 54758 -> 54745 bytes .../doc/support/bib2gls/examples/sample-units3.pdf | Bin 41133 -> 41124 bytes .../support/bib2gls/examples/sample-usergroups.pdf | Bin 23882 -> 24511 bytes 24 files changed, 163 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/doc/support/bib2gls') diff --git a/Master/texmf-dist/doc/support/bib2gls/CHANGES b/Master/texmf-dist/doc/support/bib2gls/CHANGES index 8d0335622cf..1acb131e0b0 100644 --- a/Master/texmf-dist/doc/support/bib2gls/CHANGES +++ b/Master/texmf-dist/doc/support/bib2gls/CHANGES @@ -1,3 +1,70 @@ +v2.0 (2020-02-12): + + * New command line options: + + --trim-only-fields + --trim-except-fields + + * New resource option: + + interpret-fields-action + prefix-fields + append-prefix-field + append-prefix-field-cs + append-prefix-field-exceptions + append-prefix-field-cs-exceptions + append-prefix-field-nbsp-match + save-sibling-count + + * New values for 'identical-sort-action' option: 'def' and 'use' + + * New value for 'selection' option: 'recorded and deps and see not also' + + * New internal fields: dualprefix, dualprefixplural, + dualprefixfirst, dualprefixfirstplural, siblingcount, + siblinglist + + * Dual prefix mappings now added if the prefix field is defined + (provided by glosssaries-prefix.sty). + + * Interpreter now supports \nobreakspace and it obeys + --break-space and --no-break-space in the same way as ~ + + * Added support for nonumberlist + + * Bug fixes: + + - corrected interpret-fields + - corrected selection={recorded and deps and see} + - corrected plural for entries where the name is inherited from + the parent + + + * convertgls2bib: + + - new command line options: + + --ignore-type + --no-ignore-type + --split-on-type (-p) + --no-split-on-type + --ignore-category + --no-ignore-category + --split-on-category (-c) + --no-split-on-category + --ignore-fields (-f) + --overwrite + --no-overwrite + --preamble-only (-p) + --no-preamble-only + --index-conversion (-i) + --no-index-conversion + --absorb-see + --no-absorb-see + + - added check for see=[\alsoname] in addition to + see=[\seealsoname] + v1.9 (2019-04-09): * manual: diff --git a/Master/texmf-dist/doc/support/bib2gls/README.md b/Master/texmf-dist/doc/support/bib2gls/README.md index ac1077f3081..528c5ac725b 100644 --- a/Master/texmf-dist/doc/support/bib2gls/README.md +++ b/Master/texmf-dist/doc/support/bib2gls/README.md @@ -9,7 +9,8 @@ Application Home Page: http://www.dickimaw-books.com/software/bib2gls # Licence -Copyright (C) 2017-2019 Nicola L. C. Talbot (www.dickimaw-books.com) +Copyright (C) 2017-2020 Nicola L. C. Talbot (www.dickimaw-books.com) + License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf index 7e1e380497d..fb5b191d509 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf and b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 b/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 index b106bdcacf8..42ece34b41e 100644 --- a/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 +++ b/Master/texmf-dist/doc/support/bib2gls/bib2gls.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIB2GLS 1" -.TH BIB2GLS 1 "2019-03-31" "perl v5.28.1" "bib2gls" +.TH BIB2GLS 1 "2020-02-09" "perl v5.30.1" "bib2gls" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -201,10 +201,10 @@ Use the TeX parser library to interpret known (La)TeX commands Don't try interpreting (La)TeX commands. .IP "\fB\-\-break\-space\fR" 4 .IX Item "--break-space" -Interpret tilde character as a normal space. +Interpret tilde character and \enobreakspace as a normal space. .IP "\fB\-\-no\-break\-space\fR" 4 .IX Item "--no-break-space" -Interpret tilde as a non-breaking space (default). +Interpret tilde and \enobreakspace as a non-breaking space (default). .IP "\fB\-\-cite\-as\-record\fR" 4 .IX Item "--cite-as-record" Treat \fB\ecitation\fR as an ignored record. @@ -343,10 +343,24 @@ This option automatically implements \fB\-\-record\-count\fR. Don't add unit record count field to entries (default). .IP "\fB\-\-trim\-fields\fR" 4 .IX Item "--trim-fields" -Trim leading and trailing spaces from fields. +Trim leading and trailing spaces from all fields. +This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-no\-trim\-fields\fR. +.IP "\fB\-\-trim\-only\-fields\fR \fIlist\fR" 4 +.IX Item "--trim-only-fields list" +Trim leading and trailing spaces from only the listed fields. +This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR +and \fB\-\-no\-trim\-fields\fR. This option may not be used with +\&\fB\-\-trim\-except\-fields\fR. +.IP "\fB\-\-trim\-except\-fields\fR \fIlist\fR" 4 +.IX Item "--trim-except-fields list" +Trim leading and trailing spaces from all fields except those listed. +This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR +and \fB\-\-no\-trim\-fields\fR. This option may not be used with +\&\fB\-\-trim\-only\-fields\fR. .IP "\fB\-\-no\-trim\-fields\fR" 4 .IX Item "--no-trim-fields" Don't trim leading and trailing spaces from fields (default). +This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-trim\-fields\fR. .IP "\fB\-\-expand\-fields\fR" 4 .IX Item "--expand-fields" Don't write \fB\eglsnoexpandfields\fR to the \fB.glstex\fR file. diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf index 25ac8ce15bd..2ea65355189 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf and b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 b/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 index f7e3f097b74..c5f2aceaa08 100644 --- a/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 +++ b/Master/texmf-dist/doc/support/bib2gls/convertgls2bib.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "CONVERTGLS2BIB 1" -.TH CONVERTGLS2BIB 1 "2018-03-04" "perl v5.28.1" "convertgls2bib" +.TH CONVERTGLS2BIB 1 "2020-02-11" "perl v5.30.1" "convertgls2bib" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -144,7 +144,7 @@ .SH "DESCRIPTION" .IX Header "DESCRIPTION" Converts a \fB.tex\fR file containing glossary definitions using -commands like \fB\enewglossaryentry\fR and \fB\enewacronym\fR to +commands like \f(CW\*(C`\enewglossaryentry\*(C'\fR and \f(CW\*(C`\enewacronym\*(C'\fR to a \fB.bib\fR file in the format required for \fBbib2gls\fR. .SH "OPTIONS" .IX Header "OPTIONS" @@ -175,8 +175,77 @@ Ignore the \fBsort\fR field (default). .IP "\fB\-\-no\-ignore\-sort\fR" 4 .IX Item "--no-ignore-sort" Don't ignore the \fBsort\fR field. -.IP "\fB\-\-space\-sub\fR \fIvalue\fR" 4 -.IX Item "--space-sub value" +.IP "\fB\-\-ignore\-type\fR" 4 +.IX Item "--ignore-type" +Omit the \fBtype\fR field. Default if \fB\-\-split\-on\-type\fR. +.IP "\fB\-\-no\-ignore\-type\fR" 4 +.IX Item "--no-ignore-type" +Don't omit the \fBtype\fR field. Default unless \fB\-\-split\-on\-type\fR. +.IP "\fB\-\-split\-on\-type\fR or \fB\-t\fR" 4 +.IX Item "--split-on-type or -t" +Split the entries into separate files according to the \fBtype\fR field. +This option automatically implements \fB\-\-ignore\-type\fR and +\&\fB\-\-no\-overwrite\fR. +.IP "\fB\-\-no\-split\-on\-type\fR" 4 +.IX Item "--no-split-on-type" +Don't split the entries into separate files according to the \fBtype\fR +field (default). +.IP "\fB\-\-ignore\-category\fR" 4 +.IX Item "--ignore-category" +Omit the \fBcategory\fR field. Default if \fB\-\-split\-on\-category\fR. +.IP "\fB\-\-no\-ignore\-category\fR" 4 +.IX Item "--no-ignore-category" +Don't omit the \fBcategory\fR field. Default unless \fB\-\-split\-on\-category\fR. +.IP "\fB\-\-split\-on\-category\fR or \fB\-t\fR" 4 +.IX Item "--split-on-category or -t" +Split the entries into separate files according to the \fBcategory\fR field. +This option automatically implements \fB\-\-ignore\-category\fR and +\&\fB\-\-no\-overwrite\fR. +.IP "\fB\-\-no\-split\-on\-category\fR" 4 +.IX Item "--no-split-on-category" +Don't split the entries into separate files according to the \fBcategory\fR +field (default). +.IP "\fB\-\-ignore\-fields\fR \fIlist\fR or \fB\-f\fR \fIlist\fR" 4 +.IX Item "--ignore-fields list or -f list" +Ignore all the fields in the comma-separated \fIlist\fR. If the +list includes \fBsort\fR, \fBtype\fR or \fBcategory\fR it will automatically +implement the corresponding \fB\-\-ignore\-sort\fR, \fB\-\-ignore\-type\fR or +\&\fB\-\-ignore\*(--category\fR option. +.Sp +This option isn't cumulative. An empty list will clear a previously +set list but won't undo the sort, type or category ignore options. +.IP "\fB\-\-overwrite\fR" 4 +.IX Item "--overwrite" +Overwrite existing .bib files. Default unless \fB\-\-split\-on\-type\fR +used. +.IP "\fB\-\-no\-overwrite\fR" 4 +.IX Item "--no-overwrite" +Don't overwrite existing .bib files. Default if \fB\-\-split\-on\-type\fR +used. +.IP "\fB\-\-index\-conversion\fR or \fB\-i\fR" 4 +.IX Item "--index-conversion or -i" +Any entries that would normally be converted to \f(CW@entry\fR that don't +have a description or just have the description set to +\&\f(CW\*(C`\enopostdesc\*(C'\fR or \f(CW\*(C`\eglsxtrnopostpunc\*(C'\fR will be converted to \f(CW@index\fR +and the \fBdescription\fR field will be omitted. +.IP "\fB\-\-no\-index\-conversion\fR" 4 +.IX Item "--no-index-conversion" +Don't use \f(CW@index\fR instead of \f(CW@entry\fR if the description is empty or +just \f(CW\*(C`\enopostdesc\*(C'\fR or \f(CW\*(C`\eglsxtrnopostpunc\*(C'\fR (default). +.IP "\fB\-\-absorb\-see\fR" 4 +.IX Item "--absorb-see" +Absorb \f(CW\*(C`\eglssee\*(C'\fR and \f(CW\*(C`\eglsxtrindexseealso\*(C'\fR into the data (default). +.IP "\fB\-\-no\-absorb\-see\fR" 4 +.IX Item "--no-absorb-see" +Don't absorb \f(CW\*(C`\eglssee\*(C'\fR and \f(CW\*(C`\eglsxtrindexseealso\*(C'\fR into the data. +.IP "\fB\-\-preamble\-only\fR or \fB\-p\fR" 4 +.IX Item "--preamble-only or -p" +Only parse the document preamble. +.IP "\fB\-\-no\-preamble\-only\fR" 4 +.IX Item "--no-preamble-only" +Parse the entire document (default). +.IP "\fB\-\-space\-sub\fR \fIvalue\fR or \fB\-s\fR \fIvalue\fR" 4 +.IX Item "--space-sub value or -s value" Substitute spaces in labels with \fIvalue\fR. .IP "\fB\-\-locale\fR \fIlang tag\fR" 4 .IX Item "--locale lang tag" @@ -185,7 +254,7 @@ tag \fIlang tag\fR. If there isn't an appropriate file, the \fBen\fR (English) file will be used. .SH "REQUIRES" .IX Header "REQUIRES" -Java 7 and a TeX distribution. +Java 8 and a TeX distribution. .SH "LICENSE" .IX Header "LICENSE" License GPLv3+: \s-1GNU GPL\s0 version 3 or later diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf index 391edd5c4c0..acf6537b34f 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf index b42fe0ce034..df886866bea 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf index 415f4aa092b..1faa304fe1d 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf index 26d9b7bb3d0..dd6512f7d32 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf index d650ceed9bb..6a0681f54a0 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf index f06a07262a1..88d0ee81dd4 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf index 8a6db9d368e..1028059b895 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf index 57b1cd6c752..d90d8578098 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf index 9ed3e0ce937..c4ac33f1547 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf index 0928aae45a6..4d22ee3560e 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf index a033fb98a12..47af93e5b74 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf index 0c3e8bdfd8f..f362fa06e0a 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf index 15b504fc052..0d514283b38 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf index 98022c2dac2..3dc3f8f9ac4 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf index 3d08fa6a9da..ae04bcf249d 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf index e80be3024cd..bcf1b752882 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf index c7d170c578c..86b750011f0 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf index 042f277b427..fe807b2eab0 100644 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf differ -- cgit v1.2.3