From 3b961a61ef9fb89adf20a89550d5de0bfe135448 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 20 Oct 2022 03:04:26 +0000 Subject: CTAN sync 202210200304 --- .../samples/sample-abbr-styles.pdf | Bin 556783 -> 1518890 bytes .../samples/sample-abbr-styles.tex | 457 +++++++++++++++++++-- .../glossaries-extra/samples/sample-abbrv.pdf | Bin 47261 -> 47270 bytes .../glossaries-extra/samples/sample-accsupp.pdf | Bin 83775 -> 83719 bytes .../samples/sample-acronym-desc.pdf | Bin 53665 -> 53675 bytes .../glossaries-extra/samples/sample-acronym.pdf | Bin 39238 -> 39250 bytes .../glossaries-extra/samples/sample-alias.pdf | Bin 46956 -> 46963 bytes .../samples/sample-altmodifier.pdf | Bin 37805 -> 37817 bytes .../samples/sample-alttree-marginpar.pdf | Bin 94528 -> 94465 bytes .../samples/sample-alttree-sym.pdf | Bin 74480 -> 74462 bytes .../glossaries-extra/samples/sample-alttree.pdf | Bin 58134 -> 58142 bytes .../samples/sample-autoindex-hyp.pdf | Bin 146844 -> 149156 bytes .../glossaries-extra/samples/sample-autoindex.pdf | Bin 171404 -> 171465 bytes .../glossaries-extra/samples/sample-crossref.pdf | Bin 44626 -> 44639 bytes .../glossaries-extra/samples/sample-crossref2.pdf | Bin 44932 -> 44941 bytes .../glossaries-extra/samples/sample-docdef.pdf | Bin 48575 -> 48584 bytes .../glossaries-extra/samples/sample-entrycount.pdf | Bin 58659 -> 58668 bytes .../glossaries-extra/samples/sample-external.pdf | Bin 36681 -> 36692 bytes .../glossaries-extra/samples/sample-fmt.pdf | Bin 81379 -> 81525 bytes .../glossaries-extra/samples/sample-footnote.pdf | Bin 68233 -> 68245 bytes .../glossaries-extra/samples/sample-header.pdf | Bin 135372 -> 134679 bytes .../glossaries-extra/samples/sample-indexhook.pdf | Bin 46037 -> 46049 bytes .../samples/sample-initialisms.pdf | Bin 87240 -> 87339 bytes .../samples/sample-initialisms.tex | 2 + .../glossaries-extra/samples/sample-linkcount.pdf | Bin 40764 -> 40775 bytes .../samples/sample-mixed-abbrv-styles.pdf | Bin 62787 -> 62799 bytes .../glossaries-extra/samples/sample-mixedsort.pdf | Bin 48415 -> 48427 bytes .../glossaries-extra/samples/sample-mixedsort.tex | 2 + .../glossaries-extra/samples/sample-mixture.pdf | Bin 168974 -> 169036 bytes .../glossaries-extra/samples/sample-multientry.pdf | Bin 58332 -> 58340 bytes .../glossaries-extra/samples/sample-name-font.pdf | Bin 214722 -> 214759 bytes .../glossaries-extra/samples/sample-nested.pdf | Bin 72395 -> 77642 bytes .../glossaries-extra/samples/sample-nested.tex | 8 +- .../samples/sample-noidx-restricteddocdefs.pdf | Bin 50828 -> 50842 bytes .../glossaries-extra/samples/sample-onelink.pdf | Bin 25864 -> 47025 bytes .../samples/sample-onthefly-utf8.pdf | Bin 111694 -> 111703 bytes .../samples/sample-onthefly-xetex.pdf | Bin 19669 -> 19653 bytes .../glossaries-extra/samples/sample-onthefly.pdf | Bin 46363 -> 46373 bytes .../glossaries-extra/samples/sample-pages.pdf | Bin 41286 -> 41300 bytes .../glossaries-extra/samples/sample-postdot.pdf | Bin 39556 -> 39563 bytes .../glossaries-extra/samples/sample-postlink.pdf | Bin 73848 -> 73857 bytes .../glossaries-extra/samples/sample-prefix.pdf | Bin 35603 -> 43297 bytes .../glossaries-extra/samples/sample-prefix.tex | 7 +- .../samples/sample-record-nameref.pdf | Bin 76219 -> 75683 bytes .../glossaries-extra/samples/sample-record.pdf | Bin 53514 -> 53524 bytes .../samples/sample-restricteddocdefs.pdf | Bin 51137 -> 51150 bytes .../glossaries-extra/samples/sample-suppl-hyp.pdf | Bin 37481 -> 37492 bytes .../samples/sample-suppl-main-hyp.pdf | Bin 49663 -> 49673 bytes .../glossaries-extra/samples/sample-suppl-main.pdf | Bin 34098 -> 34109 bytes .../glossaries-extra/samples/sample-suppl.pdf | Bin 14247 -> 14259 bytes .../glossaries-extra/samples/sample-trans.pdf | Bin 53229 -> 53238 bytes .../glossaries-extra/samples/sample-undef.pdf | Bin 35728 -> 36985 bytes .../glossaries-extra/samples/sample-undef.tex | 1 + .../samples/sample-unitentrycount.pdf | Bin 64556 -> 65135 bytes .../samples/sample-unitentrycount.tex | 1 + .../contrib/glossaries-extra/samples/sample.pdf | Bin 48266 -> 48281 bytes .../contrib/glossaries-extra/samples/sample.tex | 4 +- 57 files changed, 451 insertions(+), 31 deletions(-) (limited to 'macros/latex/contrib/glossaries-extra/samples') diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf index 97fe60bfc7..ddad18e49a 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.tex b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.tex index a5caad77b6..d5625142a1 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.tex @@ -5,12 +5,18 @@ \documentclass{report} +\usepackage[left=1cm,right=0.5cm,marginpar=2.5cm,includemp]{geometry} \usepackage[T1]{fontenc} \usepackage{relsize} +\usepackage{fontawesome} \usepackage{etoolbox} +\usepackage{xcolor} +\usepackage{soul} \usepackage[colorlinks,linkcolor=magenta]{hyperref} \usepackage{glossaries-extra} +\newcommand*{\warningsym}{\textcolor{red}{\faExclamationTriangle}} + % If you get any undefined control sequences or undefined % style errors, make sure you have the latest versions of % glossaries-extra.sty and glossaries.sty @@ -33,6 +39,9 @@ % for styles that don't have a designated command: %\renewcommand{\glsfirstlongdefaultfont}[1]{\textsf{#1}} +% Test command for "outer" formatting (applied with textformat key) +\newcommand*{\sampleformat}[1]{\textbf{\color{teal}#1}} + % These commands are used by the '-hyphen' styles. % For example, to switch to small-caps for the short form: %\renewcommand{\glsabbrvhyphenfont}{\glsabbrvscfont} @@ -44,16 +53,16 @@ \footnote{\glshyperlink[\glsfmtshort{#1}]{#1}: #2}% } -\glssetcategoryattribute{long-hyphen-short-hyphen}{markwords}{true} -\glssetcategoryattribute{long-hyphen-postshort-hyphen}{markwords}{true} -\glssetcategoryattribute{long-hyphen-short-hyphen-desc}{markwords}{true} -\glssetcategoryattribute{long-hyphen-postshort-hyphen-desc}{markwords}{true} -\glssetcategoryattribute{short-hyphen-long-hyphen}{markwords}{true} -\glssetcategoryattribute{short-hyphen-postlong-hyphen}{markwords}{true} -\glssetcategoryattribute{short-hyphen-long-hyphen-desc}{markwords}{true} -\glssetcategoryattribute{short-hyphen-postlong-hyphen-desc}{markwords}{true} -\glssetcategoryattribute{long-hyphen-noshort-desc-noreg}{markwords}{true} -\glssetcategoryattribute{long-hyphen-noshort-noreg}{markwords}{true} +\glssetcategoryattributes{long-hyphen-short-hyphen}{markwords,markshortwords}{true} +\glssetcategoryattributes{long-hyphen-postshort-hyphen}{markwords,markshortwords}{true} +\glssetcategoryattributes{long-hyphen-short-hyphen-desc}{markwords,markshortwords}{true} +\glssetcategoryattributes{long-hyphen-postshort-hyphen-desc}{markwords,markshortwords}{true} +\glssetcategoryattributes{short-hyphen-long-hyphen}{markwords,markshortwords}{true} +\glssetcategoryattributes{short-hyphen-postlong-hyphen}{markwords,markshortwords}{true} +\glssetcategoryattributes{short-hyphen-long-hyphen-desc}{markwords,markshortwords}{true} +\glssetcategoryattributes{short-hyphen-postlong-hyphen-desc}{markwords,markshortwords}{true} +\glssetcategoryattributes{long-hyphen-noshort-desc-noreg}{markwords,markshortwords}{true} +\glssetcategoryattributes{long-hyphen-noshort-noreg}{markwords,markshortwords}{true} \newcommand{\stylelist}{} @@ -63,7 +72,7 @@ \newabbreviation[category=#1,% %sort={#1},% order by style name user1={user text}% - ]{sample-#1}{short}{long form}% + ]{sample-#1}{short fm}{long form}% \csdef{glsxtrpostdesc#1}{ [style: #1]}% } @@ -73,7 +82,7 @@ \newabbreviation[category=#1,% %sort={#1},% order by style name user1={user text},% - description={sample description}]{sample-#1}{short}{long form}% + description={sample description}]{sample-#1}{short fm}{long form}% \csdef{glsxtrpostdesc#1}{ [style: #1]}% } @@ -215,6 +224,33 @@ change the font). To make the default setting clearer, this document has done: So any text in this document that's rendered in sans-serif would normally not have any font change implemented. +There are additional font changing tests implemented with outer text formatting +(the textformat key) and inner text formatting (the innertextformat key). + +The hyperlink may be placed outside the outer formatting (hyperoutside=true) or +inside of the outer formatting (hyperoutside=false). Note that when the +hyperlink is outside, the text colour change applied by the sample formatting +command (teal) overrides the colour change applied by the hyperlink colour +setting (magenta). The outer text format can also be changed globally +by redefining \verb|\glstextformat| or via the \verb|textformat| attribute. +(Order of precedence: textformat option, textformat attribute, +\verb|\glstextformat|.) + +The inner formatting is implemented within the abbreviation style, so it won't +show up in custom styles that don't implement it. The outer formatting isn't +applied to the post-link hook. The inner formatting may be applied to the +post-link hook, depending whether or not it's supported by the abbreviation +style. + +The outer text format is tested with the custom command defined as: +\begin{verbatim} +\newcommand*{\sampleformat}[1]{\textbf{\color{teal}#1}} +\end{verbatim} +The inner text format is tested with \verb|\hl| provided by soul.sty. +(Complex commands such as those provided by soul can only be used +in the inner text format. The outer format has the text content too +deeply embedded for those commands to process.) + Each test entry is defined using \begin{verbatim} \newabbreviation[category=#1,user1={user text}]% @@ -250,6 +286,13 @@ The test entries that use the \texttt{-hyphen} styles have had the compound word hyphenation if the inserted text (through the final optional argument of \verb|\gls|) starts with a hyphen. +\raisebox{2ex}{\hypertarget{warningnote}{}}% +\renewcommand*{\GlossariesAbbrStyleTooComplexWarning}[2]{% + \warningsym\marginpar{\hyperlink{warningnote}{\warningsym} too complex}}% +The symbol \warningsym\ indicates that a warning would normally be +issued at that point in the document for a style that's too complex +to support the given command. + \tableofcontents \pagenumbering{arabic} @@ -259,12 +302,45 @@ First use of \verb|\gls|. \forglsentries{\thislabel}{\glscategory{\thislabel}: \gls{\thislabel}.\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\glsresetall +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\gls[textformat=sampleformat,hyperoutside=true]{\thislabel}.\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\glsresetall +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\gls[textformat=sampleformat,hyperoutside=false]{\thislabel}.\glspar} + +\section{innertextformat=hl} + +\glsresetall +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\gls[innertextformat=hl]{\thislabel}.\glspar} + \chapter{Next Use} Next use of \verb|\gls|. \forglsentries{\thislabel}{\glscategory{\thislabel}: \gls{\thislabel}.\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\gls[textformat=sampleformat,hyperoutside=true]{\thislabel}.\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\gls[textformat=sampleformat,hyperoutside=false]{\thislabel}.\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\gls[innertextformat=hl]{\thislabel}.\glspar} + \chapter{First Use With Insert} First use of \texttt{\string\gls\marg{label}[-insert]}. The conditional \verb|\ifglsxtrinsertinside| is used by some styles to @@ -299,6 +375,32 @@ differences more noticeable this document has done: \glsreset{\thislabel}\glsxtrinsertinsidetrue \gls{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsreset{\thislabel}\glsxtrinsertinsidefalse +\gls[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert]; +\glsreset{\thislabel}\glsxtrinsertinsidetrue +\gls[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsreset{\thislabel}\glsxtrinsertinsidefalse +\gls[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert]; +\glsreset{\thislabel}\glsxtrinsertinsidetrue +\gls[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsreset{\thislabel}\glsxtrinsertinsidefalse +\gls[innertextformat=hl]{\thislabel}[-insert]; +\glsreset{\thislabel}\glsxtrinsertinsidetrue +\gls[innertextformat=hl]{\thislabel}[-insert].\glspar} + + \chapter{Next Use With Insert} Next use of \texttt{\string\gls\marg{label}[-insert]}. @@ -314,6 +416,30 @@ conditional. \glsxtrinsertinsidetrue \gls{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\gls[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\gls[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\gls[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\gls[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\gls[innertextformat=hl]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\gls[innertextformat=hl]{\thislabel}[-insert].\glspar} + \chapter{Full Form} Full form using \verb|\glsxtrfull| (inline full style). This may differ from the display form used by \verb|\gls| @@ -322,6 +448,21 @@ on first use, depending on the style. \forglsentries{\thislabel}{\glscategory{\thislabel}: \glsxtrfull{\thislabel}.\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrfull[textformat=sampleformat,hyperoutside=true]{\thislabel}.\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrfull[textformat=sampleformat,hyperoutside=false]{\thislabel}.\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrfull[innertextformat=hl]{\thislabel}.\glspar} + \chapter{Short Form} Short form using \verb|\glsxtrshort|. This may differ from the display form used by \verb|\gls| @@ -331,12 +472,46 @@ on subsequent use, depending on the style. \glsxtrshort{\thislabel}.\glspar } +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrshort[textformat=sampleformat,hyperoutside=true]{\thislabel}.\glspar +} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrshort[textformat=sampleformat,hyperoutside=false]{\thislabel}.\glspar +} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrshort[innertextformat=hl]{\thislabel}.\glspar +} + + \chapter{Long Form} Long form using \verb|\glsxtrlong|. \forglsentries{\thislabel}{\glscategory{\thislabel}: \glsxtrlong{\thislabel}.\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrlong[textformat=sampleformat,hyperoutside=true]{\thislabel}.\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrlong[textformat=sampleformat,hyperoutside=false]{\thislabel}.\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrlong[innertextformat=detokenize]{\thislabel}.\glspar} + \chapter{Full Form With Insert} Full form using \texttt{\string\glsxtrfull\marg{label}[-insert]} (inline full style). In this test chapter, each entry is displayed @@ -350,6 +525,30 @@ with \verb|\glsxtrinsertinsidefalse| and then displayed with \glsxtrinsertinsidetrue \glsxtrfull{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrfull[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrfull[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrfull[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrfull[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrfull[innertextformat=hl]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrfull[innertextformat=hl]{\thislabel}[-insert].\glspar} + \chapter{Short Form With Insert} Short form using \texttt{\string\glsxtrshort\marg{label}[-insert]}. @@ -364,6 +563,30 @@ with \verb|\glsxtrinsertinsidefalse| and then displayed with \glsxtrinsertinsidetrue \glsxtrshort{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrshort[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrshort[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrshort[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrshort[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrshort[innertextformat=hl]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrshort[innertextformat=hl]{\thislabel}[-insert].\glspar} + \chapter{Long Form With Insert} Long form using \texttt{\string\glsxtrlong\marg{label}[-insert]}. Note that the \texttt{hyphen} styles with the \texttt{markwords} @@ -380,20 +603,82 @@ with \verb|\glsxtrinsertinsidefalse| and then displayed with \glsxtrinsertinsidetrue \glsxtrlong{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrlong[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrlong[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrlong[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrlong[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsxtrinsertinsidefalse +\glsxtrlong[innertextformat=hl]{\thislabel}[-insert]; +\glsxtrinsertinsidetrue +\glsxtrlong[innertextformat=hl]{\thislabel}[-insert].\glspar} +\glsxtrinsertinsidefalse + \chapter{First Form} First form using \verb|\glsfirst|. This may be different from the first use of \verb|\gls| depending on the style. +In general, it's better not to use \verb|\glsfirst| with +abbreviations. Use \verb|\gls| (possibly with a reset) +or \verb|\glsxtrfull| instead. +Some styles are too complicated to work with \verb|\glsfirst|. \forglsentries{\thislabel}{\glscategory{\thislabel}: \glsfirst{\thislabel}.\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsfirst[textformat=sampleformat,hyperoutside=true]{\thislabel}.\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsfirst[textformat=sampleformat,hyperoutside=false]{\thislabel}.\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsfirst[innertextformat=hl]{\thislabel}.\glspar} + \chapter{Text Form} Text form using \verb|\glstext|. This may be different from the subsequent use of \verb|\gls| depending on the style. +In general, it's better not to use \verb|\glstext| with +abbreviations. Use \verb|\gls| (possibly with an unset) +or \verb|\glsxtrshort| instead. \forglsentries{\thislabel}{\glscategory{\thislabel}: \glstext{\thislabel}.\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glstext[textformat=sampleformat, hyperoutside=true]{\thislabel}.\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glstext[textformat=sampleformat, hyperoutside=false]{\thislabel}.\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glstext[innertextformat=hl]{\thislabel}.\glspar} + \chapter{First Form With Insert} First form using \texttt{\string\glsfirst\marg{label}[-insert]}. This is different from the first use of \verb|\gls| @@ -406,30 +691,152 @@ to use \verb|\glsfirst| with abbreviations. Use either \forglsentries{\thislabel}{\glscategory{\thislabel}: \glsfirst{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsfirst[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsfirst[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glsfirst[innertextformat=hl]{\thislabel}[-insert].\glspar} + \chapter{Text Form With Insert} Text form using \texttt{\string\glstext\marg{label}[-insert]}. This doesn't check for the conditional \verb|\ifglsxtrinsertinside|. +In general, it's better not to use \verb|\glstext| with +abbreviations. Use \verb|\gls| (possibly with an unset) +or \verb|\glsxtrshort| instead. \forglsentries{\thislabel}{\glscategory{\thislabel}: \glstext{\thislabel}[-insert].\glspar} +\section{textformat=sampleformat, hyperoutside=true} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glstext[textformat=sampleformat,hyperoutside=true]{\thislabel}[-insert].\glspar} + +\section{textformat=sampleformat, hyperoutside=false} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glstext[textformat=sampleformat,hyperoutside=false]{\thislabel}[-insert].\glspar} + +\section{innertextformat=hl} + +\forglsentries{\thislabel}{\glscategory{\thislabel}: +\glstext[innertextformat=hl]{\thislabel}[-insert].\glspar} + \chapter{Summary} \renewcommand{\do}[1]{\section{#1} -First use \texttt{\string\gls\marg{label}}: -\glsreset{sample-#1}\gls{sample-#1}.\par\noindent -Next use \texttt{\string\gls\marg{label}}: \gls{sample-#1}.\par\noindent -First use \texttt{\string\gls\marg{label}[-insert]}: -\glsreset{sample-#1}\gls{sample-#1}[-insert].\par\noindent -Next use \texttt{\string\gls\marg{label}[-insert]}: -\gls{sample-#1}[-insert].\par\noindent -\texttt{\string\glsxtrfull\marg{label}[-insert]}: -\glsxtrfull{sample-#1}[-insert].\par\noindent -\texttt{\string\glsxtrshort\marg{label}[-insert]}: -\glsxtrshort{sample-#1}[-insert].\par\noindent -\texttt{\string\glsxtrlong\marg{label}[-insert]}: -\glsxtrlong{sample-#1}[-insert].\par\noindent +\subsection{First Use} +\texttt{\string\gls\marg{label}} / \texttt{\string\Gls\marg{label}} / +\texttt{\string\GLS\marg{label}}: +\gls[prereset]{sample-#1}; +\Gls[prereset]{sample-#1}; +\GLS[prereset]{sample-#1}.\par\noindent +With insert: +\gls[prereset]{sample-#1}[-insert]; +\Gls[prereset]{sample-#1}[-insert]; +\GLS[prereset]{sample-#1}[-insert].\par\noindent +Plural \texttt{\string\glspl\marg{label}} / \texttt{\string\Glspl\marg{label}} / +\texttt{\string\GLSpl\marg{label}}: +\glspl[prereset]{sample-#1}; +\Glspl[prereset]{sample-#1}; +\GLSpl[prereset]{sample-#1}.\par\noindent +With insert: +\glspl[prereset]{sample-#1}[-insert]; +\Glspl[prereset]{sample-#1}[-insert]; +\GLSpl[prereset]{sample-#1}[-insert]. +\subsection{Next Use} +\texttt{\string\gls\marg{label}} / \texttt{\string\Gls\marg{label}} / +\texttt{\string\GLS\marg{label}}: +\gls{sample-#1}; +\Gls{sample-#1}; +\GLS{sample-#1}.\par\noindent +With insert: +\gls{sample-#1}[-insert]; +\Gls{sample-#1}[-insert]; +\GLS{sample-#1}[-insert].\par\noindent +Plural \texttt{\string\glspl\marg{label}} / \texttt{\string\Glspl\marg{label}} / +\texttt{\string\GLSpl\marg{label}}: +\glspl{sample-#1}; +\Glspl{sample-#1}; +\GLSpl{sample-#1}.\par\noindent +With insert: +\glspl{sample-#1}[-insert]; +\Glspl{sample-#1}[-insert]; +\GLSpl{sample-#1}[-insert]. +\subsection{Full Inline} +\texttt{\string\glsxtrfull\marg{label}} / +\texttt{\string\Glsxtrfull\marg{label}} / +\texttt{\string\GLSxtrfull\marg{label}}: +\glsxtrfull{sample-#1}; +\Glsxtrfull{sample-#1}; +\GLSxtrfull{sample-#1}.\par\noindent +With insert: +\glsxtrfull{sample-#1}[-insert]; +\Glsxtrfull{sample-#1}[-insert]; +\GLSxtrfull{sample-#1}[-insert].\par\noindent +Plural \texttt{\string\glsxtrfullpl\marg{label}} / +\texttt{\string\Glsxtrfullpl\marg{label}} / +\texttt{\string\GLSxtrfullpl\marg{label}}: +\glsxtrfullpl{sample-#1}; +\Glsxtrfullpl{sample-#1}; +\GLSxtrfullpl{sample-#1}.\par\noindent +Plural with insert: +\glsxtrfullpl{sample-#1}[-insert]; +\Glsxtrfullpl{sample-#1}[-insert]; +\GLSxtrfullpl{sample-#1}[-insert]. +\subsection{Short} +\texttt{\string\glsxtrshort\marg{label}} / +\texttt{\string\Glsxtrshort\marg{label}} / +\texttt{\string\GLSxtrshort\marg{label}}: +\glsxtrshort{sample-#1}; +\Glsxtrshort{sample-#1}; +\GLSxtrshort{sample-#1}.\par\noindent +With insert: +\glsxtrshort{sample-#1}[-insert]; +\Glsxtrshort{sample-#1}[-insert]; +\GLSxtrshort{sample-#1}[-insert].\par\noindent +Plural \texttt{\string\glsxtrshortpl\marg{label}} / +\texttt{\string\Glsxtrshortpl\marg{label}} / +\texttt{\string\GLSxtrshortpl\marg{label}}: +\glsxtrshortpl{sample-#1}; +\Glsxtrshortpl{sample-#1}; +\GLSxtrshortpl{sample-#1}.\par\noindent +Plural with insert: +\glsxtrshortpl{sample-#1}[-insert]; +\Glsxtrshortpl{sample-#1}[-insert]; +\GLSxtrshortpl{sample-#1}[-insert]. +\subsection{Long} +\texttt{\string\glsxtrlong\marg{label}} / +\texttt{\string\Glsxtrlong\marg{label}} / +\texttt{\string\GLSxtrlong\marg{label}}: +\glsxtrlong{sample-#1}; +\Glsxtrlong{sample-#1}; +\GLSxtrlong{sample-#1}.\par\noindent +With insert: +\glsxtrlong{sample-#1}[-insert]; +\Glsxtrlong{sample-#1}[-insert]; +\GLSxtrlong{sample-#1}[-insert].\par\noindent +Plural \texttt{\string\glsxtrlongpl\marg{label}} / +\texttt{\string\Glsxtrlongpl\marg{label}} / +\texttt{\string\GLSxtrlongpl\marg{label}}: +\glsxtrlongpl{sample-#1}; +\Glsxtrlongpl{sample-#1}; +\GLSxtrlongpl{sample-#1}.\par\noindent +Plural with insert: +\glsxtrlongpl{sample-#1}[-insert]; +\Glsxtrlongpl{sample-#1}[-insert]; +\GLSxtrlongpl{sample-#1}[-insert]. +\subsection{Other} Name: \glsentryname{sample-#1}.\par\noindent Sort: \texttt{\glsentrysort{sample-#1}}.\par\noindent Description: \glsentrydesc{sample-#1}.\par diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf index a697131366..b7bca980af 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf index 37c57580b7..d8656327ed 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf index 2cafcdcaee..6372605793 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf index 76ba3b9aca..a29c48ba10 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf index ba4b5841c5..e3dac89466 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf index c9598650f1..20eeba5f36 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf index deb3f958fb..32c0013a1e 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf index ef8684f498..9630bb626b 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf index 9f7d115c31..29d37e1c08 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf index 19d8078f64..5081823433 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf index ed9ebfa5d2..797e828c06 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf index 98faf00379..be9532f557 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf index 0a1a5faa7b..16b300a658 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf index 8c71fa9125..14c4b7f66e 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf index 616a236a55..5784acfd4c 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf index 2e5a8b61c7..774a350d02 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf index 4ab15d3039..c44cf52026 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf index d9401ea0eb..0639914e7d 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf index 7a64e7f8fb..d24e3ffecc 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf index 3476f3ffb9..41fbbf4ae8 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf index 30e91037ad..39268001b7 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.tex b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.tex index 39aa4e905f..0a5fc1839d 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.tex @@ -33,6 +33,8 @@ without dots \gls{html} and the end of the sentence. (Next use.) Abbreviations with dots \gls{eg} and \gls{si} and abbreviation without dots \gls{html} and the end of the sentence. +Singular: \gls{si} and at the end of a sentence \gls{si}. + Plural: \glspl{si} and at the end of a sentence \glspl{si}. Reset\glsresetall. First use end of sentence: diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf index d504f07606..3191eba3dd 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf index 36e35a0036..0e69ad76e3 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf index 41496a03a1..49cf6cb9e2 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.tex b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.tex index a85c7c6b9b..945af5768f 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.tex @@ -1,3 +1,5 @@ +% arara: pdflatex +% arara: pdflatex \documentclass{article} \usepackage[symbols,automake]{glossaries-extra} diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf index 197725e6b7..ccecdcca5a 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-multientry.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-multientry.pdf index e663cfb884..682e5a0238 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-multientry.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-multientry.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf index d5f57c11b4..6853bbc904 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf index 441421bf25..2daf0cca35 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-nested.tex b/macros/latex/contrib/glossaries-extra/samples/sample-nested.tex index a7c32a6908..ec57247753 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-nested.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-nested.tex @@ -14,7 +14,8 @@ \newabbreviation{ssi}{ssi}{server side includes} \newabbreviation{html}{html}{hypertext markup language} -%DON'T use this with upper casing commands! +% If sentence-case is required for the following, ensure that you have glossaries +% v4.50+ and mfirstuc v2.08+ \newabbreviation{shtml}{shtml}{\gls{ssi} enabled \gls{html}} % Alternatively @@ -33,6 +34,11 @@ commands like \verb|\gls| or \verb|\glsxtrshort| that occur in fields, when any of those field is accessed through linking commands. +\section{\Glsxtrp{long}{html}} + +Make sure you have glossaries.sty v4.50+ and mfirstuc.sty v2.08+ for +improved sentence-casing. + First use: \gls{shtml}. \newpage diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf index a05a97144d..2a55474962 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf index a8aa2a5618..46e48d2d17 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf index b68e416e5d..15e61019ed 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf index 738c18e589..ab23b693c7 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf index cca87ab41e..336b0154cd 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf index bfae252c41..35db7aa14c 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf index aa66c978da..977735ffae 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf index 57d24e36f7..b12dcbd2d3 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf index b5be861062..6e164e2c2f 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.tex b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.tex index 7fa2f325fb..fec5e92f54 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.tex @@ -3,8 +3,8 @@ % arara: pdflatex \documentclass{article} -\usepackage{glossaries-extra} -\usepackage{glossaries-prefix} +\usepackage[colorlinks]{hyperref} +\usepackage[prefix]{glossaries-extra} \makeglossaries @@ -14,6 +14,9 @@ {svm}{SVM}{support vector machine} \begin{document} +\tableofcontents + +\section{\Pglsfmtlong{svm}} This is a sample document to test prefixes. First use: \pgls{svm}. diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf index 3ffa713436..9398d20f26 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf index 8c3dc27480..831a6e3b42 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf index 86e48ef5ac..29649c4c4a 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf index afd19dd073..8d7f06953c 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf index 077434a94a..0e16dd138a 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf index df11469495..7d97db11f5 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf index f33fc059dc..0b86aaa2ce 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf index 0b58c5a146..33b037e5f6 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf index 78f3a357b8..a5e2c7368a 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-undef.tex b/macros/latex/contrib/glossaries-extra/samples/sample-undef.tex index 194f4a4bc8..b4ade872ca 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-undef.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-undef.tex @@ -15,6 +15,7 @@ Defined entry: \gls{sample}, \glslink{sample}{text}. +This paragraph will trigger a warning. Undefined entry: \gls{undefined}, \glslink{undefined}{text}. \printglossaries diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf index e75a0fc4a7..47bfe1f3eb 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.tex b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.tex index 7979120c45..4b14bb25d8 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.tex @@ -1,4 +1,5 @@ % arara: pdflatex +% arara: pdflatex % arara: makeglossaries % arara: pdflatex \documentclass{report} diff --git a/macros/latex/contrib/glossaries-extra/samples/sample.pdf b/macros/latex/contrib/glossaries-extra/samples/sample.pdf index 80d03daa53..33b78ed6d1 100644 Binary files a/macros/latex/contrib/glossaries-extra/samples/sample.pdf and b/macros/latex/contrib/glossaries-extra/samples/sample.pdf differ diff --git a/macros/latex/contrib/glossaries-extra/samples/sample.tex b/macros/latex/contrib/glossaries-extra/samples/sample.tex index 42e2f4d677..7d8e38efeb 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample.tex +++ b/macros/latex/contrib/glossaries-extra/samples/sample.tex @@ -5,9 +5,7 @@ \documentclass{article} \usepackage[colorlinks]{hyperref} -\usepackage{glossaries-extra} -\usepackage{glossary-mcols} -\setglossarystyle{mcolindex} +\usepackage[stylemods=mcols,style=mcolindex]{glossaries-extra} \makeglossaries -- cgit v1.2.3