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/doc/support/bib2gls/CHANGES | 54 ++++++++++++++++++++ .../doc/support/bib2gls/bib2gls-begin.pdf | Bin 613878 -> 697089 bytes Master/texmf-dist/doc/support/bib2gls/bib2gls.1 | 27 ++++++---- Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf | Bin 3142512 -> 3999653 bytes .../support/bib2gls/examples/markuplanguages.bib | 2 +- .../support/bib2gls/examples/sample-authors.pdf | Bin 49017 -> 49003 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 -> 47326 bytes .../support/bib2gls/examples/sample-constants.pdf | Bin 89416 -> 89404 bytes .../support/bib2gls/examples/sample-languages.pdf | Bin 56151 -> 0 bytes .../support/bib2gls/examples/sample-languages.tex | 54 -------------------- .../bib2gls/examples/sample-markuplanguages.pdf | Bin 0 -> 56324 bytes .../bib2gls/examples/sample-markuplanguages.tex | 55 +++++++++++++++++++++ .../doc/support/bib2gls/examples/sample-maths.pdf | Bin 110958 -> 110945 bytes .../doc/support/bib2gls/examples/sample-media.pdf | Bin 160811 -> 160799 bytes .../support/bib2gls/examples/sample-msymbols.pdf | Bin 103819 -> 103806 bytes .../doc/support/bib2gls/examples/sample-multi1.pdf | Bin 243174 -> 243179 bytes .../doc/support/bib2gls/examples/sample-multi2.pdf | Bin 317946 -> 317966 bytes .../doc/support/bib2gls/examples/sample-multi2.tex | 2 +- .../doc/support/bib2gls/examples/sample-people.pdf | Bin 47760 -> 47749 bytes .../bib2gls/examples/sample-textsymbols.pdf | Bin 69804 -> 69791 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 41131 -> 41121 bytes .../support/bib2gls/examples/sample-usergroups.pdf | Bin 23920 -> 23878 bytes .../doc/support/bib2gls/examples/usergroups.bib | 2 +- 27 files changed, 130 insertions(+), 66 deletions(-) delete mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.pdf delete mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.tex create mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf create mode 100644 Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.tex (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/support/bib2gls/CHANGES b/Master/texmf-dist/doc/support/bib2gls/CHANGES index a59744d0601..d90c4cd5e75 100644 --- a/Master/texmf-dist/doc/support/bib2gls/CHANGES +++ b/Master/texmf-dist/doc/support/bib2gls/CHANGES @@ -1,3 +1,57 @@ +v1.8 (2018-11-30): + + * new resource options: + + --save-primary-locations + --primary-location-formats + --long-case-change + --dual-long-case-change + --word-boundaries + --sort-label-list + --dependency-fields + + * added support for the new glossaries-extra package option + record=nameref (introduced to glossaries-extra v1.37). + + * normal locations are now written to the location field as + \glsnoidxdisplayloc{}{}{}{} + instead of explicitly using + \setentrycounter[]{}\{} + This matches the way the record is added to the loclist field + and makes it easier to adjust the record formatting. + + * bib2gls now always parses the .log file even if the interpreter + setting is off. (It still needs to know version details and + whether hyperlinks and Unicode are supported by the document.) + + * Underscores now allowed in bib labels. + + * Hooks added to pick up label prefixes if needed: + + \bibglsprimaryprefixlabel + \bibglsdualprefixlabel + \bibglstertiaryprefixlabel + \bibglsexternalprefixlabel + + * bug fix: corrected default sort=doc + + * bug fix: corrected letternumber-upperlower and + letternumber-lowerupper sort methods. + + * bug fix: corrected invalid datetime pattern that threw + InvalidArgumentException + + * bug fix: https://github.com/nlct/bib2gls/issues/3 + Files located in local texmf path are not determined correctly + on Windows. + (actual bug was in texparserlib.jar rather than bib2gls.jar) + + * \@glsnavhypertarget will now fallback on original definition + (which requires an extra LaTeX call) if the type is unknown. + + * Renamed example file sample-languages.tex to + sample-markuplanguages.tex + v1.7 (2018-08-18): * added support for multiple supplementary sources diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf index 10567d7ab4d..1b56f3d9b33 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 7cb3ab10c3f..60060770700 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.09 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -54,16 +54,20 @@ .\" Avoid warning from groff about undefined register 'F'. .de IX .. -.if !\nF .nr F 0 -.if \nF>0 \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{\ -. nr % 0 -. nr F 2 +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 +. \} . \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIB2GLS 1" -.TH BIB2GLS 1 "2018-04-07" "perl v5.26.1" "bib2gls" +.TH BIB2GLS 1 "2018-08-25" "perl v5.28.0" "bib2gls" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -214,6 +218,11 @@ Merge an entry's \fBwrglossary\fR records for the same page locations. .IP "\fB\-\-no\-merge\-wrglossary\-records\fR" 4 .IX Item "--no-merge-wrglossary-records" Don't merge an entry's \fBwrglossary\fR records. +.IP "\fB\-\-merge\-nameref\-on\fR \fIrule\fR" 4 +.IX Item "--merge-nameref-on rule" +Rule for merging locations created with the record=nameref package option +(requires glossaries\-extra.sty version 1.37+). The \fIrule\fR may be +one of: \fBhcounter\fR, \fBhref\fR, \fBtitle\fR or \fBlocation\fR. .IP "\fB\-\-force\-cross\-resource\-refs\fR or \fB\-x\fR" 4 .IX Item "--force-cross-resource-refs or -x" Force cross-resource referencing mode on. diff --git a/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf b/Master/texmf-dist/doc/support/bib2gls/bib2gls.pdf index e5b5ca22f51..43d21de48ce 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/examples/markuplanguages.bib b/Master/texmf-dist/doc/support/bib2gls/examples/markuplanguages.bib index a9026843b72..8c46af7fa95 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/markuplanguages.bib +++ b/Master/texmf-dist/doc/support/bib2gls/examples/markuplanguages.bib @@ -46,7 +46,7 @@ @abbreviation{mathml, short={MathML}, long={\abbrvtag{m\NoCaseChange{ath}}ematical }#markuplang, - description={the standard markup language for creating web pages}, + description={markup language for describing mathematical notation}, identifier={markuplanguage} } 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 de3315dbf0b..7e637a9e649 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 880723b51c6..37088bf4823 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 9ad4de19184..ba5cafb6d1d 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 9377006f8d6..70bb61b0470 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 7e2c4d483de..616370e70e7 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-languages.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.pdf deleted file mode 100644 index d8835b6e975..00000000000 Binary files a/Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.tex b/Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.tex deleted file mode 100644 index d394c1b0212..00000000000 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-languages.tex +++ /dev/null @@ -1,54 +0,0 @@ -% This file is public domain. See the "Examples" chapter -% in the bib2gls user manual for a more detailed description -% of this file. - -\documentclass[fontsize=12pt]{scrartcl} - -\usepackage[T1]{fontenc} - -\usepackage[colorlinks]{hyperref} -\usepackage[record,% use bib2gls - nostyles,% don't load default styles -% load glossary-tree.sty and patch styles: - stylemods={tree}, - style=treegroup]{glossaries-extra} - -% abbreviation style must be set before \GlsXtrLoadResources -\setabbreviationstyle[markuplanguage]{long-short-desc} - -\GlsXtrEnableInitialTagging{markuplanguage}{\abbrvtag} - -\renewcommand*{\glsxtrlongshortdescname}{% - \protect\protect\glsabbrvfont{\the\glsshorttok}\space - \glsxtrparen{\glslongfont{\the\glslongtok}}% -} - -\GlsXtrLoadResources[ - src=markuplanguages,% data in markuplanguages.bib - loc-suffix, - category=markuplanguage -] - -\newcommand{\glsxtrpostdescmarkuplanguage}{% - \glsxtrifhasfield{location}{\glscurrententrylabel}% - {,}% - {.}% -} - -\glssetcategoryattribute{markuplanguage}{glossname}{firstuc} - -\renewcommand*{\glsxtrtagfont}[1]{\underline{\MakeTextUppercase{#1}}} - -\begin{document} - -\section{First Use} - -\gls{LaTeX}, \gls{markdown}, \gls{xhtml}, \gls{mathml}, \gls{svg}. - -\section{Next Use} - -\gls{LaTeX}, \gls{markdown}, \gls{xhtml}, \gls{mathml}, \gls{svg}. - -\GlsXtrSetDefaultNumberFormat{glsignore} -\printunsrtglossary -\end{document} diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf new file mode 100644 index 00000000000..bf7cb76b55d Binary files /dev/null and b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf differ diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.tex b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.tex new file mode 100644 index 00000000000..aba4cbf2194 --- /dev/null +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.tex @@ -0,0 +1,55 @@ +% This file is public domain. See the "Examples" chapter +% in the bib2gls user manual for a more detailed description +% of this file. + +\documentclass[fontsize=12pt]{scrartcl} + +\usepackage[T1]{fontenc} + +\usepackage[colorlinks]{hyperref} +\usepackage[record,% use bib2gls + nostyles,% don't load default styles +% load glossary-tree.sty and patch styles: + stylemods={tree}, + style=treegroup]{glossaries-extra} + +% abbreviation style must be set before \GlsXtrLoadResources +\setabbreviationstyle[markuplanguage]{long-short-desc} + +\GlsXtrEnableInitialTagging{markuplanguage}{\abbrvtag} + +\renewcommand*{\glsxtrlongshortdescname}{% + \protect\protect\glsabbrvfont{\the\glsshorttok}\space + \glsxtrparen{\glslongfont{\the\glslongtok}}% +} + +\GlsXtrLoadResources[ + src=markuplanguages,% data in markuplanguages.bib + loc-suffix, + category=markuplanguage, + description-case-change=firstuc +] + +\newcommand{\glsxtrpostdescmarkuplanguage}{% + \glsxtrifhasfield{location}{\glscurrententrylabel}% + {,}% + {.}% +} + +\glssetcategoryattribute{markuplanguage}{glossname}{firstuc} + +\renewcommand*{\glsxtrtagfont}[1]{\underline{\MakeTextUppercase{#1}}} + +\begin{document} + +\section{First Use} + +\gls{LaTeX}, \gls{markdown}, \gls{xhtml}, \gls{mathml}, \gls{svg}. + +\section{Next Use} + +\gls{LaTeX}, \gls{markdown}, \gls{xhtml}, \gls{mathml}, \gls{svg}. + +\GlsXtrSetDefaultNumberFormat{glsignore} +\printunsrtglossary +\end{document} 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 516c47d6c62..9f1849fe1ac 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 e35915ee954..2ecee98595b 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 c283f2f91ac..2a8cf08a99f 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 45756e713d0..bca3e987feb 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 ce890362f42..e61b207d5ec 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-multi2.tex b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.tex index 433a56cc1ec..bec2301f0c3 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.tex +++ b/Master/texmf-dist/doc/support/bib2gls/examples/sample-multi2.tex @@ -439,7 +439,7 @@ and \film{thereturnoftheking} (adapted from the \renewcommand{\glsxtralttreeSymbolDescLocation}[2]{% \glossentrydesc{#1}% \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}% - \glspostdescription\glstreeprelocation + \glspostdescription \glsxtrAltTreePar }% } 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 9059cf5198a..1490ac1b029 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 4a8b92b4f46..239503ceb43 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-units1.pdf b/Master/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf index f9d46361409..b3a5176fdba 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 4174e51e7fb..db752bfcd20 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 498b3e0adef..799ee650f30 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 a0d80a70269..2cefbd0b1ec 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 diff --git a/Master/texmf-dist/doc/support/bib2gls/examples/usergroups.bib b/Master/texmf-dist/doc/support/bib2gls/examples/usergroups.bib index 95fa3163a50..2f3b654c28b 100644 --- a/Master/texmf-dist/doc/support/bib2gls/examples/usergroups.bib +++ b/Master/texmf-dist/doc/support/bib2gls/examples/usergroups.bib @@ -117,7 +117,7 @@ @abbreviation{ITALIC, short={ITALIC}, long={Irish \TeX\ and \LaTeX\ In-print Community}, - language={en-GB,en-IE}, + language={en-IE,en-GB}, identifier={texusergroup} } -- cgit v1.2.3