From f6f97a69d3847af9a8c49c35bd957fe0b35201e8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 27 Feb 2018 20:36:27 +0000 Subject: glossaries-extra (27feb18) git-svn-id: svn://tug.org/texlive/trunk@46755 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/glossaries-extra/glossaries-extra.dtx | 2344 +++++++++++++++++++- .../latex/glossaries-extra/glossaries-extra.ins | 6 +- 2 files changed, 2309 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/source/latex/glossaries-extra') diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx index 369ed3645e6..aeebd5cc020 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -2,21 +2,22 @@ % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: % -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" -% -setambles ".*\.bib=>\nopreamble\nopostamble" % -doc "glossaries-extra-codedoc.tex" +% -section "chapter" % -author "Nicola Talbot" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" +% -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty" % -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" % -src "glossary-bookindex.sty\Z=>glossary-bookindex.sty" % -src "(example-glossaries-.+\.tex)\Z=>\1" % -src "(example-glossaries-.+\.bib)\Z=>\1" -% -comment ".*\.tex" -% -comment ".*\.bib" +% -setambles ".*\.bib=>\nopreamble\nopostamble" % -macrocode ".*\.tex" % -macrocode ".*\.bib" -% -section "chapter" +% -comment ".*\.tex" +% -comment ".*\.bib" % glossaries-extra -% Created on 2018/1/5 12:41 +% Created on 2018/2/26 21:37 %\fi %\iffalse %<*package> @@ -126,7 +127,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{20216} +\CheckSum{22518} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -166,13 +167,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \raggedright } -\title{glossaries-extra.sty v1.26: +\title{glossaries-extra.sty v1.27: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2018-01-05} +\date{2018-02-26} \begin{document} \DocInput{glossaries-extra.dtx} @@ -217,7 +218,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2018/01/05 v1.26 (NLCT)] +\ProvidesPackage{glossaries-extra}[2018/02/26 v1.27 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -824,10 +825,16 @@ Dickimaw Books\\ %\changes{1.16}{2017-06-15}{added check for \cs{@gls@setupsort@none}} % \begin{macrocode} \ifdef\@gls@setupsort@none{\@gls@setupsort@none}{}% +% \end{macrocode} +%Load \sty{glossaries-extra-bib2gls}: +% \begin{macrocode} + \RequirePackage{glossaries-extra-bib2gls}% }% \or % \end{macrocode} -%Record and index. +%Record and index. This option doesn't load +%\sty{glossaries-extra-bib2gls} as the sorting is performed by +%\app{xindy} or \app{makeindex}. % \begin{macrocode} \def\glsxtr@setup@record{% \renewcommand*{\@do@seeglossary}{\@glsxtr@dosee@alsoindex@glossary}% @@ -1003,6 +1010,8 @@ Dickimaw Books\\ \ifglsnopostdot\else.\spacefactor\sfcode`\. \fi}% }% } +% \end{macrocode} +%\end{option} % %\begin{option}{postpunc} %Set the post-description punctuation. This also sets @@ -1668,6 +1677,15 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +%Provide script dialect hook (does nothing unless +%redefined by \sty{glossaries-extra-bib2gls}). +%\begin{macro}{\@glsxtrdialecthook} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\newcommand*{\@glsxtrdialecthook}{} +% \end{macrocode} +%\end{macro} +% %Set up record option if required. % \begin{macrocode} \glsxtr@setup@record @@ -8491,6 +8509,14 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsxtrresourceinit} +%\changes{1.21}{2017-11-03}{new} +%Code used during the protected write operation. +% \begin{macrocode} +\newcommand*{\glsxtrresourceinit}{} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsxtrresourcecount} %\changes{1.12}{2017-02-03}{new} % \begin{macrocode} @@ -9184,22 +9210,6 @@ can only be used within \string\printunsrtglossaryentryprocesshook}{}% % \end{macrocode} %\end{macro} % -%\subsection{Support for \app{bib2gls}} -%Some useful commands for \app{bib2gls} users. -%\begin{macro}{\glshex} -%\changes{1.21}{2017-11-03}{new} -% \begin{macrocode} -\newcommand*{\glshex}{\string\u} -% \end{macrocode} -%\end{macro} -%\begin{macro}{\glsxtrresourceinit} -%\changes{1.21}{2017-11-03}{new} -%Code used during the protected write operation. -% \begin{macrocode} -\newcommand*{\glsxtrresourceinit}{} -% \end{macrocode} -%\end{macro} -% %Provide a way to conveniently define commands that behaves like %\cs{gls} with a label prefix. % @@ -21049,22 +21059,38 @@ defined}{}% % Load any required language modules that are available. This % doesn't generate any warning if none are found, since they're not % essential. (The only command that really needs defining for the -% document is \ics{abbreviationsname}, which can simply be redefined.) +% document is \ics{abbreviationsname}, which can simply be +% redefined. However, with \app{bib2gls} it might be useful to +% provide custom rules for a particular locale.) +% +%\begin{macro}{\glsxtr@loaddialect} +%The dialect label should be stored in \cs{this@dialect} +%before using this command. +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\newcommand{\glsxtr@loaddialect}{% + \IfTrackedLanguageFileExists{\this@dialect}% + {glossariesxtr-}% prefix + {.ldf}% + {% + \RequireGlossariesExtraLang{\CurrentTrackedTag}% + }% + {}% not found +% \end{macrocode} +% If \sty{glossaries-extra-bib2gls} has been loaded, +% \cs{@glsxtrdialecthook} will check for the associated script, +% otherwise it will do nothing. +% \begin{macrocode} + \@glsxtrdialecthook +} +% \end{macrocode} +%\end{macro} % \begin{macrocode} \@ifpackageloaded{tracklang} {% \AnyTrackedLanguages {% - \ForEachTrackedDialect{\this@dialect}{% - \IfTrackedLanguageFileExists{\this@dialect}% - {glossariesxtr-}% prefix - {.ldf}% - {% - \RequireGlossariesExtraLang{\CurrentTrackedTag}% - }% - {% - }% - }% + \ForEachTrackedDialect{\this@dialect}{\glsxtr@loaddialect}% }% {}% } @@ -21085,6 +21111,2246 @@ defined}{}% %\fi %\iffalse % \begin{macrocode} +%<*glossaries-extra-bib2gls.sty> +% \end{macrocode} +%\fi +%\changes{1.27}{2018-02-26}{added glossaries-extra-bib2gls.sty} +%\section{glossaries-extra-bib2gls.sty} +%This package provides additional support for \app{bib2gls} and is +%automatically loaded by the record option. +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{glossaries-extra-bib2gls}[2018/02/26 v1.27 (NLCT)] +% \end{macrocode} +% +%These are some convenient macros for use with custom rules. +%\begin{macro}{\glshex} +%\changes{1.21}{2017-11-03}{new} +% \begin{macrocode} +\newcommand*{\glshex}{\string\u} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrprovidecommand} +%\changes{1.27}{2018-02-26}{new} +%For use in \texttt{@preamble}, this behaves like +%\cs{providecommand} in the document but like \cs{renewcommand} +%in \app{bib2gls}. +% \begin{macrocode} +\newcommand*{\glsxtrprovidecommand}{\providecommand} +% \end{macrocode} +%\end{macro} +% +%Provide missing Greek letters for use in maths mode. +%These are recognised by \app{bib2gls} and will be mapped to the +%Mathematical Greek Italic letters. This ensures that the Greek +%letters that have the same shape as Latin letters are kept +%with the other Greek letters. These commands use an upright font +%for capitals and italic for lower case to provide a better match +%with the other Greek symbols provided by the kernel. +% +%\begin{macro}{\Alpha} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Alpha}{\mathrm{A}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Beta} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Beta}{\mathrm{B}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Epsilon} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Epsilon}{\mathrm{E}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Zeta} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Zeta}{\mathrm{Z}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Eta} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Eta}{\mathrm{H}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Iota} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Iota}{\mathrm{I}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Kappa} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Kappa}{\mathrm{K}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Mu} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Mu}{\mathrm{M}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Nu} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Nu}{\mathrm{N}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Omicron} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Omicron}{\mathrm{O}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Rho} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Rho}{\mathrm{P}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Tau} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Tau}{\mathrm{T}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Chi} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Chi}{\mathrm{X}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Digamma} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\Digamma}{\mathrm{F}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\omicron} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} +\providecommand*{\omicron}{\mathit{o}} +% \end{macrocode} +%\end{macro} +% +%Provide corresponding upright characters if \sty{upgreek} has been +%loaded. +% \begin{macrocode} +\@ifpackageloaded{upgreek}% +{ +% \end{macrocode} +%\begin{macro}{\Upalpha} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upalpha}{\mathrm{A}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upbeta} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upbeta}{\mathrm{B}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upepsilon} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upepsilon}{\mathrm{E}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upzeta} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upzeta}{\mathrm{Z}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upeta} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upeta}{\mathrm{H}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upiota} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upiota}{\mathrm{I}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upkappa} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upkappa}{\mathrm{K}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upmu} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upmu}{\mathrm{M}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upnu} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upnu}{\mathrm{N}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upomicron} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upomicron}{\mathrm{O}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Uprho} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Uprho}{\mathrm{P}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Uptau} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Uptau}{\mathrm{T}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Upchi} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\Upchi}{\mathrm{X}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\upomicron} +%\changes{1.27}{2018-02-26}{new} +% \begin{macrocode} + \providecommand*{\upomicron}{\mathrm{o}} +% \end{macrocode} +%\end{macro} +% +% \begin{macrocode} +}% +{}% upgreek.sty not loaded +% \end{macrocode} +% +%This package provides some basic rules but is not intended for +%complete coverage of all locales. The CLDR should provide the +%appropriate locale-sensitive rules. These macros are primarily to +%help construct custom rules to include, for example, Greek maths symbols +%mixed with Latin. For the full rule syntax, see the Java API for +%\href{https://docs.oracle.com/javase/8/docs/api/java/text/RuleBasedCollator.html}{RuleBaseCollator} +% +%If you want to provide a rule-block for a particular locale to +%allow for customization within that locale, create a file called +%\texttt{glossariesxtr-\meta{tag}.ldf} (where \meta{tag} identifies +%the locale) and add similar commands. See the description +%of \cs{IfTrackedLanguageFileExists} in the \sty{tracklang} manual +%for the allowed forms of \meta{tag}. The simplest is to just use +%the root language label. The file will then be automatically loaded +%by \styfmt{glossaries-extra} if the document has support for that +%language. +% +% +%When combining these blocks of rules, remember to separate them +%with the appropriate character. For example: +%\begin{verbatim} +%sort-rule={\glsxtrcontrolrules +% ;\glsxtrspacerules +% ;\glsxtrnonprintablerules +% ;\glsxtrcombiningdiacriticrules +% ,\glsxtrhyphenrules +% <\glsxtrgeneralpuncrules +% <\glsxtrdigitrules +% <\glsxtrfractionrules +% <\glsxtrGeneralLatinIVrules +% <\glsxtrMathItalicGreekIrules +%} +%\end{verbatim} +% +%\begin{macro}{\glsxtrcontrolrules} +%\changes{1.27}{2018-02-26}{new} +%These are control characters that are usually placed at the start +%of a rule in the `ignored characters' section. +%\cs{string} is used for punctuation characters in case they've been +%made active. +% \begin{macrocode} +\newcommand*{\glsxtrcontrolrules}{% + \string'\glshex 200B\string'\string=\glshex 200C\string=\glshex 200D + \string=\glshex 200E\string=\glshex 200F\string=\glshex 0000\string=\glshex 0001 + \string=\glshex 0002\string=\glshex 0003\string=\glshex 0004\string=\glshex 0005 + \string=\glshex 0006\string=\glshex 0007\string=\glshex 0008 + \string=\string'\glshex 0009\string'\string=\string'\glshex 000B\string' + \string=\glshex 000E\string=\glshex 000F\string=\string'\glshex +0010\string'\string=\glshex 0011 + \string=\glshex 0012\string=\glshex 0013\string=\glshex 0014\string=\glshex 0015 + \string=\glshex 0016\string=\glshex 0017\string=\glshex 0018\string=\glshex 0019 + \string=\glshex 001A\string=\glshex 001B\string=\glshex 001C\string=\glshex 001D + \string=\glshex 001E\string=\glshex 001F\string=\glshex 007F\string=\glshex 0080 + \string=\glshex 0081\string=\glshex 0082\string=\glshex 0083\string=\glshex 0084 + \string=\glshex 0085\string=\glshex 0086\string=\glshex 0087\string=\glshex 0088 + \string=\glshex 0089\string=\glshex 008A\string=\glshex 008B\string=\glshex 008C + \string=\glshex 008D\string=\glshex 008E\string=\glshex 008F\string=\glshex 0090 + \string=\glshex 0091\string=\glshex 0092\string=\glshex 0093\string=\glshex 0094 + \string=\glshex 0095\string=\glshex 0096\string=\glshex 0097\string=\glshex 0098 + \string=\glshex 0099\string=\glshex 009A\string=\glshex 009B\string=\glshex 009C + \string=\glshex 009D\string=\glshex 009E\string=\glshex 009F +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrspacerules} +%\changes{1.27}{2018-02-26}{new} +%These are space characters. +% \begin{macrocode} +\newcommand*{\glsxtrspacerules}{% + \string' \string'\string; + \string'\glshex 00A0\string'\string; + \string'\glshex 2000\string'\string; + \string'\glshex 2001\string'\string; + \string'\glshex 2002\string'\string; + \string'\glshex 2003\string'\string; + \string'\glshex 2004\string'\string; + \string'\glshex 2005\string'\string; + \string'\glshex 2006\string'\string; + \string'\glshex 2007\string'\string; + \string'\glshex 2008\string'\string; + \string'\glshex 2009\string'\string; + \string'\glshex 200A\string'\string; + \string'\glshex 3000\string' +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrnonprintablerules} +%\changes{1.27}{2018-02-26}{new} +%These are non-printable characters (BOM, tabs, line feed and carriage +%return). +% \begin{macrocode} +\newcommand*{\glsxtrnonprintablerules}{% + \string'\glshex FEFF\string'\string; + \string'\glshex 000A\string'\string; + \string'\glshex 0009\string'\string; + \string'\glshex 000C\string'\string; + \string'\glshex 000B\string' +} +% \end{macrocode} +%\end{macro} + +%\begin{macro}{\glsxtrcombiningdiacriticrules} +%\changes{1.27}{2018-02-26}{new} +%Combining diacritic marks. This is split into multiple macros. +% \begin{macrocode} +\newcommand*{\glsxtrcombiningdiacriticrules}{% + \glsxtrcombiningdiacriticIrules\string; + \glsxtrcombiningdiacriticIIrules\string; + \glsxtrcombiningdiacriticIIIrules\string; + \glsxtrcombiningdiacriticIVrules +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrcombiningdiacriticIrules} +%\changes{1.27}{2018-02-26}{new} +%First set of combining diacritic marks. +% \begin{macrocode} +\newcommand*{\glsxtrcombiningdiacriticIrules}{% + \glshex 0301\string;% combining acute + \glshex 0300\string;% combining grave + \glshex 0306\string;% combining breve + \glshex 0302\string;% combining circumflex + \glshex 030C\string;% combining caron + \glshex 030A\string;% combining ring + \glshex 030D\string;% combining vertical line above + \glshex 0308\string;% combining diaeresis + \glshex 030B\string;% combining double acute + \glshex 0303\string;% combining tilde + \glshex 0307\string;% combining dot above + \glshex 0304% combining macron +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrcombiningdiacriticIIrules} +%\changes{1.27}{2018-02-26}{new} +%Second set of combining diacritic marks. +% \begin{macrocode} +\newcommand*{\glsxtrcombiningdiacriticIIrules}{% + \glshex 0337\string;% combining short solidus overlay + \glshex 0327\string;% combining cedilla + \glshex 0328\string;% combining ogonek + \glshex 0323\string;% combining dot below + \glshex 0332\string;% combining low line + \glshex 0305\string;% combining overline + \glshex 0309\string;% combining hook above + \glshex 030E\string;% combining double vertical line above + \glshex 030F\string;% combining double grave accent + \glshex 0310\string;% combining candrabindu + \glshex 0311\string;% combining inverted breve + \glshex 0312\string;% combining turned comma above + \glshex 0313\string;% combining comma above + \glshex 0314\string;% combining reversed comma above + \glshex 0315\string;% combining comma above right + \glshex 0316\string;% combining grave accent below + \glshex 0317% combining acute accent below +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrcombiningdiacriticIIIrules} +%\changes{1.27}{2018-02-26}{new} +%Third set of combining diacritic marks. +% \begin{macrocode} +\newcommand*{\glsxtrcombiningdiacriticIIIrules}{% + \glshex 0318\string;% combining left tack below + \glshex 0319\string;% combining right tack below + \glshex 031A\string;% combining left angle above + \glshex 031B\string;% combining horn + \glshex 031C\string;% combining left half ring below + \glshex 031D\string;% combining up tack below + \glshex 031E\string;% combining down tack below + \glshex 031F\string;% combining plus sign below + \glshex 0320\string;% combining minus sign below + \glshex 0321\string;% combining palatalized hook below + \glshex 0322\string;% combining retroflex hook below + \glshex 0324\string;% combining diaresis below + \glshex 0325\string;% combining ring below + \glshex 0326\string;% combining comma below + \glshex 0329\string;% combining vertical line below + \glshex 032A\string;% combining bridge below + \glshex 032B\string;% combining inverted double arch below + \glshex 032C\string;% combining caron below + \glshex 032D\string;% combining circumflex accent below + \glshex 032E\string;% combining breve below + \glshex 032F\string;% combining inverted breve below + \glshex 0330\string;% combining tilde below + \glshex 0331\string;% combining macron below + \glshex 0333\string;% combining double low line + \glshex 0334\string;% combining tilde overlay + \glshex 0335\string;% combining short stroke overlay + \glshex 0336\string;% combining long stroke overlay + \glshex 0338\string;% combining long solidus overlay + \glshex 0339\string;% combining combining right half ring below + \glshex 033A\string;% combining inverted bridge below + \glshex 033B\string;% combining square below + \glshex 033C\string;% combining seagull below + \glshex 033D\string;% combining x above + \glshex 033E\string;% combining vertical tilde + \glshex 033F\string;% combining double overline + \glshex 0342\string;% combining Greek perispomeni + \glshex 0344\string;% combining Greek dialytika tonos + \glshex 0345\string;% combining Greek ypogegrammeni + \glshex 0360\string;% combining double tilde + \glshex 0361\string;% combining double inverted breve + \glshex 0483\string;% combining Cyrillic titlo + \glshex 0484\string;% combining Cyrillic palatalization + \glshex 0485\string;% combining Cyrillic dasia pneumata + \glshex 0486% combining Cyrillic psili pneumata +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrcombiningdiacriticIVrules} +%\changes{1.27}{2018-02-26}{new} +%Fourth set of combining diacritic marks. +% \begin{macrocode} +\newcommand*{\glsxtrcombiningdiacriticIVrules}{% + \glshex 20D0\string;% combining left harpoon above + \glshex 20D1\string;% combining right harpoon above + \glshex 20D2\string;% combining long vertical line overlay + \glshex 20D3\string;% combining short vertical line overlay + \glshex 20D4\string;% combining anticlockwise arrow above + \glshex 20D5\string;% combining clockwise arrow above + \glshex 20D6\string;% combining left arrow above + \glshex 20D7\string;% combining right arrow above + \glshex 20D8\string;% combining ring overlay + \glshex 20D9\string;% combining clockwise ring overlay + \glshex 20DA\string;% combining anticlockwise ring overlay + \glshex 20DB\string;% combining three dots above + \glshex 20DC\string;% combining four dots above + \glshex 20DD\string;% combining enclosing circle + \glshex 20DE\string;% combining enclosing square + \glshex 20DF\string;% combining enclosing diamond + \glshex 20E0\string;% combining enclosing circle backslash + \glshex 20E1% combining left right arrow above +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrhyphenrules} +%\changes{1.27}{2018-02-26}{new} +%Hyphens. +% \begin{macrocode} +\newcommand*{\glsxtrhyphenrules}{% + \string'\string-\string'\string;% ASCII hyphen + \glshex 00AD\string;% soft hyphen + \glshex 2010\string;% hyphen + \glshex 2011\string;% non-breaking hyphen + \glshex 2012\string;% figure dash + \glshex 2013\string;% en dash + \glshex 2014\string;% em dash + \glshex 2015\string;% horizontal bar + \glshex 2212\string=\glshex 207B\string=\glshex 208B% minus sign +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrgeneralpuncrules} +%\changes{1.27}{2018-02-26}{new} +%General punctuation. +% \begin{macrocode} +\newcommand*{\glsxtrgeneralpuncrules}{% + \glsxtrgeneralpuncIrules + \string<\glsxtrcurrencyrules + \string<\glsxtrgeneralpuncIIrules +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrgeneralpuncIrules} +%\changes{1.27}{2018-02-26}{new} +%First set of general punctuation. +% \begin{macrocode} +\newcommand*{\glsxtrgeneralpuncIrules}{% + \string'\glshex 005F\string'% underscore + \string<\glshex 00AF% macron + \string<\string'\glshex 002C\string'% comma + \string<\string'\glshex 003B\string'% semi-colon + \string<\string'\glshex 003A\string'% colon + \string<\string'\glshex 0021\string'% exclamation mark + \string<\glshex 00A1% inverted exclamation mark + \string<\string'\glshex 003F\string'% question mark + \string<\glshex 00BF% inverted question mark + \string<\string'\glshex 002F\string'% solidus + \string<\string'\glshex 002E\string'% full stop + \string<\glshex 00B4% acute accent + \string<\string'\glshex 0060\string'% grave accent + \string<\string'\glshex 005E\string'% circumflex accent + \string<\glshex 00A8% diaersis + \string<\string'\glshex 007E\string'% tilde + \string<\glshex 00B7% middle dot + \string<\glshex 00B8% cedilla + \string<\string'\glshex 0027\string'% straight apostrophe + \string<\string'\glshex 0022\string'% straight double quote + \string<\glshex 00AB% left guillemet + \string<\glshex 00BB% right guillemet + \string<\string'\glshex 0028\string'% left parenthesis + \string=\glshex 207D\string=\glshex 208D% super/subscript left parenthesis + \string<\string'\glshex 0029\string'% right parenthesis + \string=\glshex 207E\string=\glshex 208E% super/subscript right parenthesis + \string<\string'\glshex 005B\string'% left square bracket + \string<\string'\glshex 005D\string'% right square bracket + \string<\string'\glshex 007B\string'% left curly bracket + \string<\string'\glshex 007D\string'% right curly bracket + \string<\glshex 00A7% section sign + \string<\glshex 00B6% pilcrow sign + \string<\glshex 00A9% copyright sign + \string<\glshex 00AE% registered sign + \string<\string'\glshex 0040\string'% at sign +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrcurrencyrules} +%\changes{1.27}{2018-02-26}{new} +%General punctuation. +% \begin{macrocode} +\newcommand*{\glsxtrcurrencyrules}{% + \glshex 00A4% currency sign + \string<\glshex 0E3F% Thai currency symbol baht + \string<\glshex 00A2% cent sign + \string<\glshex 20A1% colon sign + \string<\glshex 20A2% cruzeiro sign + \string<\string'\glshex 0024\string'% dollar sign + \string<\glshex 20AB% dong sign + \string<\glshex 20AC% euro sign + \string<\glshex 20A3% French franc sign + \string<\glshex 20A4% lira sign + \string<\glshex 20A5% mill sign + \string<\glshex 20A6% naira sign + \string<\glshex 20A7% peseta sign + \string<\glshex 00A3% pound sign + \string<\glshex 20A8% rupee sign + \string<\glshex 20AA% new sheqel sign + \string<\glshex 20A9% won sign + \string<\glshex 00A5% yen sign +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrgeneralpuncIIrules} +%\changes{1.27}{2018-02-26}{new} +%Second set of general punctuation. +% \begin{macrocode} +\newcommand*{\glsxtrgeneralpuncIIrules}{% + \string'\glshex 002A\string'% asterisk + \string<\string'\glshex 005C\string'% backslash + \string<\string'\glshex 0026\string'% ampersand + \string<\string'\glshex 0023\string'% hash sign + \string<\string'\glshex 0025\string'% percent sign + \string<\string'\glshex 002B\string'% plus sign + \string=\glshex 207A\string=\glshex 208A% super/subscript plus sign + \string<\glshex 00B1% plus-minus sign + \string<\glshex 00F7% division sign + \string<\glshex 00D7% multiplication sign + \string<\string'\glshex 003C\string'% less-than sign + \string<\string'\glshex 003D\string'% equals sign + \string<\string'\glshex 003E\string'% greater-than sign + \string<\glshex 00AC% not sign + \string<\string'\glshex 007C\string'% vertical bar (pipe) + \string<\glshex 00A6% broken bar + \string<\glshex 00B0% degree sign + \string<\glshex 00B5% micron sign +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrGeneralLatinIrules} +%\changes{1.27}{2018-02-26}{new} +%Basic Latin alphabet. +% \begin{macrocode} +\newcommand*{\glsxtrGeneralLatinIrules}{% + \glsxtrLatinA + \string +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*glossaries-extra-stylemods.sty> % \end{macrocode} %\fi @@ -21097,7 +23363,7 @@ defined}{}% % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2018/01/05 v1.26 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2018/02/26 v1.27 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -23154,7 +25420,7 @@ defined}{}% %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2018/01/05 v1.26 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2018/02/26 v1.27 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins index 089a1aa7ab8..5be521b6253 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins @@ -1,4 +1,4 @@ -% glossaries-extra.ins generated using makedtx version 1.2 2018/1/5 12:41 +% glossaries-extra.ins generated using makedtx version 1.2 2018/2/26 21:37 \input docstrip \preamble @@ -18,7 +18,7 @@ The Current Maintainer of this work is Nicola Talbot. - This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. + This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. \endpreamble @@ -26,6 +26,8 @@ \generate{\file{glossaries-extra.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra.sty,package}} +\file{glossaries-extra-bib2gls.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra-bib2gls.sty,package}} \file{glossaries-extra-stylemods.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra-stylemods.sty,package}} \file{glossary-bookindex.sty}{\usepreamble\defaultpreamble -- cgit v1.2.3