diff options
Diffstat (limited to 'macros/latex/contrib')
13 files changed, 678 insertions, 330 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-unified/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-unified/README.md index 29120705d3..a02ad5f045 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-unified/README.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-unified/README.md @@ -3,7 +3,7 @@ biblatex-unified `biblatex-unified` is an opinionated biblatex implementation of the [Unified Stylesheet for Linguistics Journals](https://www.linguisticsociety.org/resource/unified-style-sheet). The stylesheet was developed by [CELxJ, the Committee of Editors of Linguistics Journals](https://www.linguisticsociety.org/about/who-we-are/committees/editors-linguistics-journals-celxj). -The first implementation of the stylesheet for LaTeX was [`sp.bst`](https://raw.githubusercontent.com/semprag/tex/master/sp.cls), developed for the house-style of the journal [*Semantics and Pragmatics*](http://semprag.org) (*S&P*). Bridget Samuels produced a revised version `unified.bst`, which has largely disappeared from the internet. +The first implementation of the stylesheet for LaTeX was [`sp.bst`](https://raw.githubusercontent.com/semprag/tex/master/sp.bst), developed for the house-style of the journal [*Semantics and Pragmatics*](http://semprag.org) (*S&P*). Bridget Samuels produced a revised version `unified.bst`, which has largely disappeared from the internet. The current project is a ground-up re-implementation of the unified stylesheet in modern biblatex. It has been used by *S&P* in production for several years. diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.md b/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.md index 294ca5aa17..0d34139a40 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.md @@ -1,7 +1,7 @@ --- title: biblatex-unified author: Kai von Fintel (fintel@mit.edu) -date: 2022-02-05 +date: 2022-11-08 (v1.20) colorlinks: true numbersections: true ... @@ -10,7 +10,7 @@ numbersections: true `biblatex-unified` is an opinionated biblatex implementation of the [Unified Stylesheet for Linguistics Journal](https://www.linguisticsociety.org/resource/unified-style-sheet). The stylesheet was developed by [CELxJ, the Committee of Editors of Linguistics Journals](https://www.linguisticsociety.org/about/who-we-are/committees/editors-linguistics-journals-celxj). -The first implementation of the stylesheet for LaTeX was [`sp.bst`](https://raw.githubusercontent.com/semprag/tex/master/sp.cls), developed for the house-style of the journal [*Semantics and Pragmatics*](http://semprag.org) (*S&P*). Bridget Samuels produced a revised version `unified.bst`, which has largely disappeared from the internet. +The first implementation of the stylesheet for LaTeX was [`sp.bst`](https://raw.githubusercontent.com/semprag/tex/master/sp.bst), developed for the house-style of the journal [*Semantics and Pragmatics*](http://semprag.org) (*S&P*). Bridget Samuels produced a revised version `unified.bst`, which has largely disappeared from the internet. The current project is a ground-up re-implementation of the unified stylesheet in modern biblatex. It has been used by *S&P* in production for several years. @@ -42,16 +42,16 @@ To use the style in conjunction with *S&P*'s [`sp.cls`{.latex}](https://raw.gith simply add the `biblatex` class option when importing `sp.cls`{.latex}: ```latex - \documentclass[biblatex]{sp} +\documentclass[biblatex]{sp} ``` If you are not using the *S&P* document class, you can still use this style by adding the following to your preamble (after `\documentclass{...}`{.latex} but before `\begin{document}`{.latex}): ```latex - \usepackage[backend=biber, - style=unified, - maxcitenames=3, - maxbibnames=99]{biblatex} +\usepackage[backend=biber, + style=unified, + maxcitenames=3, + maxbibnames=99]{biblatex} ``` The unified citation style relies on hyperlinking between in-text citations and the bibliography. So, the `hyperref` package is required. It is automatically loaded by `sp.cls` but if you use a different document class and `hyperref` is not loaded by that class, you need to add `\usepackage{hyperref}` to your preamble as well. @@ -107,13 +107,17 @@ NB: It is to be encouraged that titles and subtitles be entered into separate fi Option 1 - title = {Government and Binding Theory and the Minimalist Program}, - subtitle = {Principles and Parameters in Syntactic Theory}, +```bibtex +title = {Government and Binding Theory and the Minimalist Program}, +subtitle = {Principles and Parameters in Syntactic Theory}, +``` Option 2 - title = {Government and Binding Theory and the Minimalist Program: - {Principles} and Parameters in Syntactic Theory}, +```bibtex +title = {Government and Binding Theory and the Minimalist Program: + {Principles} and Parameters in Syntactic Theory}, +``` >4\. **All author/editor first names should be spelled out.** Not doing so only serves to make the citation less informative. Without full first names, the 20th century index for Language alone would conflate five different people as ‘J. Smith’, four as ‘J. Harris’, three each under ‘A. Cohen’ and ‘P. Lee’, two each under ‘R. Kent’, ‘J. Anderson’, ‘H. Klein’ and ‘J. Klein’. @@ -155,15 +159,17 @@ NB: The examples included with the Unified Style Sheet do not include the editor *Option 1*: Use the `@inproceedings` entry type and include the ISSN of the proceedings when available. Example: - @inproceedings{casali:1998a, - Author = {Casali, Roderic F.}, - Booktitle = {Chicago Linguistic Society (CLS)}, - ISSN = {0577-7240}, - Number = {1}, - Pages = {55-68}, - Title = {Predicting {ATR} Activity}, - Volume = {34}, - Year = {1998}} +```bibtex +@inproceedings{casali:1998a, + Author = {Casali, Roderic F.}, + Booktitle = {Chicago Linguistic Society (CLS)}, + ISSN = {0577-7240}, + Number = {1}, + Pages = {55-68}, + Title = {Predicting {ATR} Activity}, + Volume = {34}, + Year = {1998}} +``` Comment: Following the Unified Style Sheet, we can let the presence of an ISSN control whether an article in conference proceedings is set like a journal article or like a book chapter. To do this, the bib-file needs to contain the ISSN of proceedings where possible. When the ISSN is in the bib-file, `biblatex-unified` will not print it with the entry but it will trigger setting as an article. If there's no ISSN in the entry, `biblatex-unified` will set it as a book chapter. The ISSN can be found through [WorldCat](http://www.worldcat.org) fairly easily. Here's a list of common conference proceedings with their ISSN: @@ -175,14 +181,16 @@ Comment: Following the Unified Style Sheet, we can let the presence of an ISSN c *Option 2*: Another option, less portable and definitely a hack, is to use the `@article` entry type, putting the conference name (and the acronym in parentheses; no need to case protect the acronym, since journal titles are set as is) in the `journal` field, and do not list the editors. Example: - @article{casali:1998b, - Author = {Casali, Roderic F.}, - Journal = {Chicago Linguistic Society (CLS)}, - Number = {1}, - Pages = {55-68}, - Title = {Predicting {ATR} Activity}, - Volume = {34}, - Year = {1998}} +```bibtex +@article{casali:1998b, + Author = {Casali, Roderic F.}, + Journal = {Chicago Linguistic Society (CLS)}, + Number = {1}, + Pages = {55-68}, + Title = {Predicting {ATR} Activity}, + Volume = {34}, + Year = {1998}} +``` >11\. **Use “edn.” as an abbreviation for “edition”, thus “2nd edn.”.** This avoids ambiguity and confusion with “ed.” (editor). @@ -240,28 +248,41 @@ We depart from the style sheet only in a few other places. These are actually on # Additional remarks on DOIs and other links -The Unified Style Sheet was devised before the widespread use of DOIs to identify the source of materials that are available electronically. It is good practice for authors to include DOIs in their bib-file for anything that has a DOI. Most modern publications prominently display the DOI on the first page of the work and/or in the metadata. Sometimes a DOI is harder to find, but [Google Scholar](http://scholar.google.com/) and [crossref.org/SimpleTextQuery](http://crossref.org/SimpleTextQuery/) can help. `biblatex-unified` displays DOIs as a full link (such as `https://doi.org/10.3765/sp.10.1`) in accordance with [the guidelines imposed by Crossref](https://www.crossref.org/display-guidelines/). If you would like a more compact display (`DOI:10.3765/sp.10.1`), you can achieve this by adding the `compactdois` package option to the `\usepackage`{.latex} command: +DOIs (digital object identifiers) are the best way to identify material available online. It is good practice for authors to include DOIs in their bib-file for anything that has a DOI. Most modern publications prominently display the DOI on the first page of the work and/or in the metadata. Sometimes a DOI is harder to find, but [Google Scholar](http://scholar.google.com/) and [crossref.org/SimpleTextQuery](http://crossref.org/SimpleTextQuery/) can help. -```latex - \usepackage[backend=biber, - style=unified, - maxcitenames=3, - maxbibnames=99, - compactdois]{biblatex} +Another kind of link is to established eprint sources. `biblatex` has built-in support for the following eprint-types: arxiv, jstor, pubmed, hdl, googlebooks. `biblatex-unified` adds support for two new eprint-types: `lingbuzz` (LingBuzz) and `roa` (Rutgers Optimality Archive). Example: + +```bibtex +@unpublished{conrod-2021-VariationEnglishGenderedPronouns, + author = {Conrod, Kirby}, + date = {2021-08}, + eprint = {006452}, + eprinttype = {lingbuzz}, + subtitle = {Analysis and Recommendations for Ethics in Linguistics}, + title = {Variation in {{English}} Gendered Pronouns}, +} ``` -If you're using the `sp.cls` document class with the `biblatex` option, you should instead add this to the preamble: `\ExecuteBibliographyOptions{compactdois}`{.latex}, if you want compact DOIs +[Crossref guidelines](https://www.crossref.org/display-guidelines/) specify that DOIs should be displayed as full links (such as `https://doi.org/10.3765/sp.10.1`). `biblatex-unified` complies with this and extends the practice to the display of eprint information. Furthermore, `biblatex-unified` displays only one online link: DOI if available, eprint if there's no DOI, anything in the `url` field otherwise. + +The user can override `biblatex-unified` defaults as follows: the package option `compactlinks` displays DOIs and eprint info in a compact way (`DOI: 10.3765/sp.10.1` or `JSTOR: 4178098`) and the package option `alllinks` displays all available links instead of just one. Example: -When `biblatex-unified` is used with the up-todate version of the `sp.cls` documentclass, once a bibentry has a DOI, a link in the `url` field will not also be displayed. If you want to achieve this effect with other document classes, you can add the following to your preamble after loading `biblatex-unified`: +```latex +\usepackage[backend=biber, + style=unified, + maxcitenames=3, + maxbibnames=99, + compactlinks, alllinks]{biblatex} +``` + +If you're using the `sp.cls` document class with the `biblatex` option and you want compact links and all links, you should instead add this to the preamble: ```latex -\DeclareSourcemap{ - \maps[datatype=bibtex]{ - \map{\step[fieldsource=doi,final] - \step[fieldset=url,null] - \step[fieldset=urldate,null]}}} +\ExecuteBibliographyOptions{compactlinks, alllinks} ``` +If you're using the `compactlinks` option, you will notice that `biblatex-unified` parses the `url` field and will format any recognized eprint-links in the corresponding compact way. In other words, if the url in a bibentry is `http://www.jstor.org/stable/4178098`, the generated bibliography will contain `JSTOR: 4178098`. + # Guidelines for the preparation of bib files For convenience, we repeat the best practices for preparing your bib file for use with `biblatex-unified`. @@ -272,7 +293,6 @@ For convenience, we repeat the best practices for preparing your bib file for us 4. For on-line materials, you can give the date the resource was accessed. Use the `urldate` field for this purpose and give the date in the YYYY-MM-DD format, e.g. `2013-08-11`. 5. Use two-letter postal abbreviations for all US cities. - # License and copyright Copyright ©2022 Kai von Fintel. @@ -289,11 +309,19 @@ This software is provided “as is,” without warranty of any kind, either expr ## v1.01 (2020-09-11) {-} -- Added note that `hyperref` is required. +- Added note that `hyperref` is required. ## v1.10 (2022-02-05) {-} - Internal refactoring of handling of "von"-names - Changed `&` to be glued to previous author -- Added `compactdois` option +- Added `compactdois` option [now deprecated, superseded by `compactlinks`] - Added documentation on DOIs + +## v1.20 (2022-11-08) {-} + +- Better handling of links +- Added `compactlinks` and `alllinks` options +- Revised documentation on DOIs and other links +- Fixed punctuation before subtitle +- Improved handling of non-numerical dates ("forthcoming" etc.) diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.pdf Binary files differindex 68d19f6531..a4fbc33748 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.tex b/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.tex index 936bc27ad4..77a1323f9a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-unified/biblatex-unified.tex @@ -34,18 +34,6 @@ \KOMAoptions{parskip=half}} \makeatother \usepackage{xcolor} -\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available -\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} -\hypersetup{ - pdftitle={biblatex-unified}, - pdfauthor={Kai von Fintel (fintel@mit.edu)}, - colorlinks=true, - linkcolor={Maroon}, - filecolor={Maroon}, - citecolor={Blue}, - urlcolor={Blue}, - pdfcreator={LaTeX via pandoc}} -\urlstyle{same} % disable monospaced font for URLs \usepackage{color} \usepackage{fancyvrb} \newcommand{\VerbBar}{|} @@ -93,10 +81,22 @@ \ifLuaTeX \usepackage{selnolig} % disable illegal ligatures \fi +\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} % disable monospaced font for URLs +\hypersetup{ + pdftitle={biblatex-unified}, + pdfauthor={Kai von Fintel (fintel@mit.edu)}, + colorlinks=true, + linkcolor={Maroon}, + filecolor={Maroon}, + citecolor={Blue}, + urlcolor={Blue}, + pdfcreator={LaTeX via pandoc}} \title{biblatex-unified} \author{Kai von Fintel (fintel@mit.edu)} -\date{2022-02-05} +\date{2022-11-08 (v1.20)} \begin{document} \maketitle @@ -112,7 +112,7 @@ Stylesheet for Linguistics Journal}. The stylesheet was developed by the Committee of Editors of Linguistics Journals}. The first implementation of the stylesheet for LaTeX was -\href{https://raw.githubusercontent.com/semprag/tex/master/sp.cls}{\texttt{sp.bst}}, +\href{https://raw.githubusercontent.com/semprag/tex/master/sp.bst}{\texttt{sp.bst}}, developed for the house-style of the journal \href{http://semprag.org}{\emph{Semantics and Pragmatics}} (\emph{S\&P}). Bridget Samuels produced a revised version @@ -180,7 +180,7 @@ simply add the \texttt{biblatex} class option when importing \begin{Shaded} \begin{Highlighting}[] - \BuiltInTok{\textbackslash{}documentclass}\NormalTok{[biblatex]\{}\ExtensionTok{sp}\NormalTok{\}} +\BuiltInTok{\textbackslash{}documentclass}\NormalTok{[biblatex]\{}\ExtensionTok{sp}\NormalTok{\}} \end{Highlighting} \end{Shaded} @@ -192,10 +192,10 @@ but before \begin{Shaded} \begin{Highlighting}[] - \BuiltInTok{\textbackslash{}usepackage}\NormalTok{[backend=biber,} -\NormalTok{ style=unified,} -\NormalTok{ maxcitenames=3,} -\NormalTok{ maxbibnames=99]\{}\ExtensionTok{biblatex}\NormalTok{\}} +\BuiltInTok{\textbackslash{}usepackage}\NormalTok{[backend=biber,} +\NormalTok{ style=unified,} +\NormalTok{ maxcitenames=3,} +\NormalTok{ maxbibnames=99]\{}\ExtensionTok{biblatex}\NormalTok{\}} \end{Highlighting} \end{Shaded} @@ -361,17 +361,21 @@ other bibliography styles): Option 1 -\begin{verbatim} -title = {Government and Binding Theory and the Minimalist Program}, -subtitle = {Principles and Parameters in Syntactic Theory}, -\end{verbatim} +\begin{Shaded} +\begin{Highlighting}[] +\CommentTok{title = \{Government and Binding Theory and the Minimalist Program\},} +\CommentTok{subtitle = \{Principles and Parameters in Syntactic Theory\},} +\end{Highlighting} +\end{Shaded} Option 2 -\begin{verbatim} -title = {Government and Binding Theory and the Minimalist Program: - {Principles} and Parameters in Syntactic Theory}, -\end{verbatim} +\begin{Shaded} +\begin{Highlighting}[] +\CommentTok{title = \{Government and Binding Theory and the Minimalist Program: } +\CommentTok{ \{Principles\} and Parameters in Syntactic Theory\},} +\end{Highlighting} +\end{Shaded} \begin{quote} 4. \textbf{All author/editor first names should be spelled out.} Not @@ -483,17 +487,19 @@ hack than the other: \emph{Option 1}: Use the \texttt{@inproceedings} entry type and include the ISSN of the proceedings when available. Example: -\begin{verbatim} -@inproceedings{casali:1998a, - Author = {Casali, Roderic F.}, - Booktitle = {Chicago Linguistic Society (CLS)}, - ISSN = {0577-7240}, - Number = {1}, - Pages = {55-68}, - Title = {Predicting {ATR} Activity}, - Volume = {34}, - Year = {1998}} -\end{verbatim} +\begin{Shaded} +\begin{Highlighting}[] +\VariableTok{@inproceedings}\NormalTok{\{}\OtherTok{casali:1998a}\NormalTok{,} + \DataTypeTok{Author}\NormalTok{ = \{Casali, Roderic F.\},} + \DataTypeTok{Booktitle}\NormalTok{ = \{Chicago Linguistic Society (CLS)\},} + \DataTypeTok{ISSN}\NormalTok{ = \{0577{-}7240\},} + \DataTypeTok{Number}\NormalTok{ = \{1\},} + \DataTypeTok{Pages}\NormalTok{ = \{55{-}68\},} + \DataTypeTok{Title}\NormalTok{ = \{Predicting \{ATR\} Activity\},} + \DataTypeTok{Volume}\NormalTok{ = \{34\},} + \DataTypeTok{Year}\NormalTok{ = \{1998\}\}} +\end{Highlighting} +\end{Shaded} Comment: Following the Unified Style Sheet, we can let the presence of an ISSN control whether an article in conference proceedings is set like @@ -525,16 +531,18 @@ to use the \texttt{@article} entry type, putting the conference name since journal titles are set as is) in the \texttt{journal} field, and do not list the editors. Example: -\begin{verbatim} -@article{casali:1998b, - Author = {Casali, Roderic F.}, - Journal = {Chicago Linguistic Society (CLS)}, - Number = {1}, - Pages = {55-68}, - Title = {Predicting {ATR} Activity}, - Volume = {34}, - Year = {1998}} -\end{verbatim} +\begin{Shaded} +\begin{Highlighting}[] +\VariableTok{@article}\NormalTok{\{}\OtherTok{casali:1998b}\NormalTok{,} + \DataTypeTok{Author}\NormalTok{ = \{Casali, Roderic F.\},} + \DataTypeTok{Journal}\NormalTok{ = \{Chicago Linguistic Society (CLS)\},} + \DataTypeTok{Number}\NormalTok{ = \{1\},} + \DataTypeTok{Pages}\NormalTok{ = \{55{-}68\},} + \DataTypeTok{Title}\NormalTok{ = \{Predicting \{ATR\} Activity\},} + \DataTypeTok{Volume}\NormalTok{ = \{34\},} + \DataTypeTok{Year}\NormalTok{ = \{1998\}\}} +\end{Highlighting} +\end{Shaded} \begin{quote} 11. \textbf{Use ``edn.'' as an abbreviation for ``edition'', thus ``2nd @@ -699,53 +707,75 @@ pertain to any explicit guidelines. \section{Additional remarks on DOIs and other links}\label{additional-remarks-on-dois-and-other-links}} -The Unified Style Sheet was devised before the widespread use of DOIs to -identify the source of materials that are available electronically. It -is good practice for authors to include DOIs in their bib-file for -anything that has a DOI. Most modern publications prominently display -the DOI on the first page of the work and/or in the metadata. Sometimes -a DOI is harder to find, but \href{http://scholar.google.com/}{Google -Scholar} and +DOIs (digital object identifiers) are the best way to identify material +available online. It is good practice for authors to include DOIs in +their bib-file for anything that has a DOI. Most modern publications +prominently display the DOI on the first page of the work and/or in the +metadata. Sometimes a DOI is harder to find, but +\href{http://scholar.google.com/}{Google Scholar} and \href{http://crossref.org/SimpleTextQuery/}{crossref.org/SimpleTextQuery} -can help. \texttt{biblatex-unified} displays DOIs as a full link (such -as \texttt{https://doi.org/10.3765/sp.10.1}) in accordance with -\href{https://www.crossref.org/display-guidelines/}{the guidelines -imposed by Crossref}. If you would like a more compact display -(\texttt{DOI:10.3765/sp.10.1}), you can achieve this by adding the -\texttt{compactdois} package option to the -\VERB|\BuiltInTok{\textbackslash{}usepackage}| command: +can help. + +Another kind of link is to established eprint sources. \texttt{biblatex} +has built-in support for the following eprint-types: arxiv, jstor, +pubmed, hdl, googlebooks. \texttt{biblatex-unified} adds support for two +new eprint-types: \texttt{lingbuzz} (LingBuzz) and \texttt{roa} (Rutgers +Optimality Archive). Example: \begin{Shaded} \begin{Highlighting}[] - \BuiltInTok{\textbackslash{}usepackage}\NormalTok{[backend=biber,} -\NormalTok{ style=unified,} -\NormalTok{ maxcitenames=3,} -\NormalTok{ maxbibnames=99,} -\NormalTok{ compactdois]\{}\ExtensionTok{biblatex}\NormalTok{\}} +\VariableTok{@unpublished}\NormalTok{\{}\OtherTok{conrod}\NormalTok{{-}}\OtherTok{2021}\NormalTok{{-}}\OtherTok{VariationEnglishGenderedPronouns}\NormalTok{,} + \DataTypeTok{author}\NormalTok{ = \{Conrod, Kirby\},} + \DataTypeTok{date}\NormalTok{ = \{2021{-}08\},} + \DataTypeTok{eprint}\NormalTok{ = \{006452\},} + \DataTypeTok{eprinttype}\NormalTok{ = \{lingbuzz\},} + \DataTypeTok{subtitle}\NormalTok{ = \{Analysis and Recommendations for Ethics in Linguistics\},} + \DataTypeTok{title}\NormalTok{ = \{Variation in \{\{English\}\} Gendered Pronouns\},} +\NormalTok{\}} \end{Highlighting} \end{Shaded} -If you're using the \texttt{sp.cls} document class with the -\texttt{biblatex} option, you should instead add this to the preamble: -\VERB|\FunctionTok{\textbackslash{}ExecuteBibliographyOptions}\NormalTok{\{compactdois\}}|, -if you want compact DOIs +\href{https://www.crossref.org/display-guidelines/}{Crossref guidelines} +specify that DOIs should be displayed as full links (such as +\texttt{https://doi.org/10.3765/sp.10.1}). \texttt{biblatex-unified} +complies with this and extends the practice to the display of eprint +information. Furthermore, \texttt{biblatex-unified} displays only one +online link: DOI if available, eprint if there's no DOI, anything in the +\texttt{url} field otherwise. + +The user can override \texttt{biblatex-unified} defaults as follows: the +package option \texttt{compactlinks} displays DOIs and eprint info in a +compact way (\texttt{DOI:\ 10.3765/sp.10.1} or \texttt{JSTOR:\ 4178098}) +and the package option \texttt{alllinks} displays all available links +instead of just one. Example: -When \texttt{biblatex-unified} is used with the up-todate version of the -\texttt{sp.cls} documentclass, once a bibentry has a DOI, a link in the -\texttt{url} field will not also be displayed. If you want to achieve -this effect with other document classes, you can add the following to -your preamble after loading \texttt{biblatex-unified}: +\begin{Shaded} +\begin{Highlighting}[] +\BuiltInTok{\textbackslash{}usepackage}\NormalTok{[backend=biber,} +\NormalTok{ style=unified,} +\NormalTok{ maxcitenames=3,} +\NormalTok{ maxbibnames=99,} +\NormalTok{ compactlinks, alllinks]\{}\ExtensionTok{biblatex}\NormalTok{\}} +\end{Highlighting} +\end{Shaded} + +If you're using the \texttt{sp.cls} document class with the +\texttt{biblatex} option and you want compact links and all links, you +should instead add this to the preamble: \begin{Shaded} \begin{Highlighting}[] -\FunctionTok{\textbackslash{}DeclareSourcemap}\NormalTok{\{} - \FunctionTok{\textbackslash{}maps}\NormalTok{[datatype=bibtex]\{} - \FunctionTok{\textbackslash{}map}\NormalTok{\{}\FunctionTok{\textbackslash{}step}\NormalTok{[fieldsource=doi,final]} - \FunctionTok{\textbackslash{}step}\NormalTok{[fieldset=url,null]} - \FunctionTok{\textbackslash{}step}\NormalTok{[fieldset=urldate,null]\}\}\}} +\FunctionTok{\textbackslash{}ExecuteBibliographyOptions}\NormalTok{\{compactlinks, alllinks\}} \end{Highlighting} \end{Shaded} +If you're using the \texttt{compactlinks} option, you will notice that +\texttt{biblatex-unified} parses the \texttt{url} field and will format +any recognized eprint-links in the corresponding compact way. In other +words, if the url in a bibentry is +\texttt{http://www.jstor.org/stable/4178098}, the generated bibliography +will contain \texttt{JSTOR:\ 4178098}. + \hypertarget{guidelines-for-the-preparation-of-bib-files}{% \section{Guidelines for the preparation of bib files}\label{guidelines-for-the-preparation-of-bib-files}} @@ -839,9 +869,28 @@ notes}\label{changelog-and-release-notes}} \item Changed \texttt{\&} to be glued to previous author \item - Added \texttt{compactdois} option + Added \texttt{compactdois} option {[}now deprecated, superseded by + \texttt{compactlinks}{]} \item Added documentation on DOIs \end{itemize} +\hypertarget{v1.20-2022-11-08}{% +\subsection*{v1.20 (2022-11-08)}\label{v1.20-2022-11-08}} +\addcontentsline{toc}{subsection}{v1.20 (2022-11-08)} + +\begin{itemize} +\tightlist +\item + Better handling of links +\item + Added \texttt{compactlinks} and \texttt{alllinks} options +\item + Revised documentation on DOIs and other links +\item + Fixed punctuation before subtitle +\item + Improved handling of non-numerical dates (``forthcoming'' etc.) +\end{itemize} + \end{document} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.bbx index be261b9f73..95c8b00a26 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.bbx @@ -9,48 +9,57 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{unified.bbx}[2022/02/05 v1.10 biblatex bibliography style] +\ProvidesFile{unified.bbx}[2022/11/08 v1.20 biblatex bibliography style] -% biblatex by default calls biblatex.def, we add to this authoryear.bbx, which -% in turn loads standard.bbx. So, unified.bbx is built on top of those styles; -% once authoryear.bbx is loaded, we tell it not to put in dashes for repeated -% authors (in accordance with the Unified Stylesheet) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% biblatex by default calls biblatex.def, we add to this authoryear.bbx, which % +% in turn loads standard.bbx. So, unified.bbx is built on top of those styles; % +% once authoryear.bbx is loaded, we tell it not to put in dashes for repeated % +% authors (in accordance with the Unified Stylesheet) % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequireBibliographyStyle{authoryear} -\ExecuteBibliographyOptions{dashed=false,isbn=false,eprint=false} +\ExecuteBibliographyOptions{dashed=false,isbn=false,eprint=true} -% NB: The Unified Style Sheet wants abbreviated "ed(s)", "edn". But using the -% abbreviate option also abbreviates the names of months. But then -% dateabbrev=false restores the long names of months +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% NB: The Unified Style Sheet wants abbreviated "ed(s)", "edn". But using the % +% abbreviate option also abbreviates the names of months. But then % +% dateabbrev=false restores the long names of months % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ExecuteBibliographyOptions{% sorting=nyt,abbreviate,dateabbrev=false,useprefix=true} -% For backward compatibility: choose labeldate or labeldateparts -% depending on the biblatex version +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% For backward compatibility: choose labeldate or labeldateparts % +% depending on the biblatex version % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \@ifpackagelater{biblatex}{2016/09/09} {% \ExecuteBibliographyOptions{labeldateparts}} {% \ExecuteBibliographyOptions{labeldate} \def\printlabeldateextra{\printdateextralabel} }% -% If an @article entry contains Issuetitle and Editor information, we -% might not want to print it. The Unified Style Sheet does not offer -% explicit guidelines on this, but they don't have any examples where -% either of these pieces of information are actually printed. -% Therefore, we can offer an option for the user to decide whether to -% print it. The default will be not to print it since the Unified -% Style Sheet does not have examples where this information is -% printed. The user can print it by setting `issueandeditor=true` as a -% package option when biblatex is called. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% If an @article entry contains Issuetitle and Editor information, we % +% might not want to print it. The Unified Style Sheet does not offer % +% explicit guidelines on this, but they don't have any examples where % +% either of these pieces of information are actually printed. % +% Therefore, we can offer an option for the user to decide whether to % +% print it. The default will be not to print it since the Unified % +% Style Sheet does not have examples where this information is % +% printed. The user can print it by setting `issueandeditor=true` as a % +% package option when biblatex is called. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newtoggle{issueandeditor} \DeclareBibliographyOption{issueandeditor}[false]{% \settoggle{issueandeditor}{#1}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Treating prefixes like "von" as part of the last name, but ignore them for -% sorting (relies on useprefix=true default option) -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Treating prefixes like "von" as part of the last name, but ignore them for % +% sorting (relies on useprefix=true default option) % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareSortingNamekeyTemplate{ \keypart{ @@ -69,9 +78,9 @@ \renewbibmacro{begentry}{\midsentence} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Moving "Jr." to after the first name -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Moving "Jr." to after the first name % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \renewbibmacro*{name:family-given}[4]{% \usebibmacro{name:delim}{#3#1}% @@ -92,13 +101,15 @@ {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}} } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Various bibmacros used in producing the bibliography -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% VARIOUS BIBMACROS USED IN PRODUCING THE BIBLIOGRAPHY % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% We use `date+extradate` but biblatex versions before 3.8 didn't have that -% macro. Older versions were smart enough to complain about `\renewmacro` and -% use `\newmacro` instead. But the following construction works for both cases +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% We use `date+extradate` but biblatex versions before 3.8 didn't have that % +% macro. Older versions were smart enough to complain about `\renewmacro` and % +% use `\newmacro` instead. But the following construction works for both cases % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \providebibmacro{date+extradate}{} \renewbibmacro*{date+extradate}{% @@ -205,9 +216,11 @@ {}% \newunit} -% The next three bib macros are for printing the maintitle and -% booktitle fields of an @inproceedings entry with an ISSN as an -% article in accordance with the unified style sheet guidelines. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% The next three bib macros are for printing the maintitle and % +% booktitle fields of an @inproceedings entry with an ISSN as an % +% article in accordance with the unified style sheet guidelines. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % 1. maintitle @@ -258,9 +271,11 @@ \setunit{\addcomma\space}% \printfield{eid}} -% This is for printing the volume field of a proceedings with an ISSN -% as an article in accordance with the unified style sheet guidelines. -% It depends on the declared field format below. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This is for printing the volume field of a proceedings with an ISSN % +% as an article in accordance with the unified style sheet guidelines. % +% It depends on the declared field format below. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newbibmacro*{unified:proc-as-article:volume+number+eid}{% \printfield[volume:unified:proc-as-article]{volume}% @@ -268,9 +283,11 @@ \setunit{\addcomma\space}% \printfield{eid}} -% Because of the weird format "3 May, 2007" specified in the Unified -% Stylesheet for URL access dates, we need a special way to format the -% urldate +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Because of the weird format "3 May, 2007" specified in the Unified % +% Stylesheet for URL access dates, we need a special way to format the % +% urldate % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand{\mkbibdateunified}[3]{% Year-Month-Day as input --> xx Month, Year \iffieldundef{#3} @@ -347,8 +364,10 @@ \usebibmacro{date}% \newunit} -% The following is a hack to satisfy the Unified Stylesheet's decision -% to give the edition right after the OED as used as a sortlabel. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% The following is a hack to satisfy the Unified Stylesheet's decision % +% to give the edition right after the OED as used as a sortlabel. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \renewbibmacro*{labeltitle}{% \iffieldundef{label} @@ -361,24 +380,36 @@ {\printfield[title]{shorttitle}}} {\printfield{label}}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Punctuation & formatting -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% PUNCTUATION & FORMATTING % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% This gets rid of the Oxford comma in name lists and uses the -% ampersand rather than "and": +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This gets rid of the Oxford comma in name lists and uses the % +% ampersand rather than "and": % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \renewcommand*{\finalnamedelim}{\addnbspace\&\addspace} \renewcommand*{\finallistdelim}{\addnbspace\&\addspace} -% no colon after "In" in incollection entries (overriding -% biblatex.def): +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% no colon after "In" in incollection entries (overriding % +% biblatex.def): % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \renewcommand{\intitlepunct}{\addspace} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Subtitles are indicated with a colon after the main title, unless the title % +% ends in a punctuation mark. % % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \renewcommand{\subtitlepunct}{\addcolon\space} +\DefineBibliographyExtras{english}{\DeclarePunctuationPairs{colon}{*}} -% No comma before pages, just the usual new unit period +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% No comma before pages, just the usual new unit period % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \renewcommand*{\bibpagespunct}{\newunitpunct} @@ -387,65 +418,173 @@ phdthesis = {dissertation}, } -% basically everything is in sentence case, other than journals and -% book series (recurring titles) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% basically everything is in sentence case, other than journals and % +% book series (recurring titles) % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareFieldFormat[% article,book,collection,incollection,inproceedings,thesis,unpublished]% {titlecase}{\MakeSentenceCase*{#1}}% -% No quotes around titles +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% No quotes around titles % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareFieldFormat[% article,inbook,incollection,inproceedings,patent,thesis,unpublished]% {title}{#1} -% Just like book titles, thesis titles are in italics +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Just like book titles, thesis titles are in italics % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}} \DeclareFieldFormat{pages}{#1} % no pp. prefix, took \mkpageprefix out [kvf] -% This is for printing the volume field of a proceedings with an ISSN -% as an article in accordance with the unified style sheet guidelines +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This is for printing the volume field of a proceedings with an ISSN % +% as an article in accordance with the unified style sheet guidelines % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareFieldFormat{volume:unified:proc-as-article}{#1} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Display of DOIs etc. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Display of DOIs etc. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % The unified style displays DOIs according to the Crossref guidelines as full -% `https://doi.org/...` links. But the user can choose to give the `compactdois' +% `https://doi.org/...'' links. But the user can choose to give the `compactlinks % option when loading biblatex, which will use a more compact display. -\newtoggle{unified:compactdois} -\DeclareBibliographyOption[boolean]{compactdois}[true]{% - \settoggle{unified:compactdois}{#1}} +\newtoggle{unified:compactlinks} +\DeclareBibliographyOption[boolean]{compactlinks}[true]{% + \settoggle{unified:compactlinks}{#1} + \settoggle{bbx:eprint}{#1}} \DeclareFieldFormat{doi}{% - \iftoggle{unified:compactdois}% - {\mkbibacro{DOI}\addcolon\space% - \ifhyperref - {\href{https://doi.org/#1}{\nolinkurl{#1}}} - {\nolinkurl{https://doi.org/#1}}} - {\ifhyperref - {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}} - {\nolinkurl{https://doi.org/#1}}}} - + \iftoggle{unified:compactlinks}% + {\mkbibacro{DOI}\addcolon\space\href{https://doi.org/#1}{\nolinkurl{#1}}}% + {\url{https://doi.org/#1}}} + \DeclareFieldFormat{url}{\url{#1}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% The bibliography drivers, specifying the formats of each type of -% entry in the bibliography -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Redefine jstor and googlebooks eprint formats (full links unless compactlinks option is set) + +\DeclareFieldFormat{eprint:jstor}{% + \iftoggle{unified:compactlinks}% + {\mkbibacro{JSTOR}\addcolon\space\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}} + {\url{http://www.jstor.org/stable/#1}}} + +\DeclareFieldFormat{eprint:googlebooks}{% + \iftoggle{unified:compactlinks}% + {Google Books\addcolon\space{\href{http://books.google.com/books?id=#1}{\nolinkurl{#1}}}} + {\url{http://books.google.com/books?id=#1}}} + +% Print LingBuzz entries using an eprint field +\DeclareFieldFormat{eprint:lingbuzz}{% + \iftoggle{unified:compactlinks}% + {LingBuzz\addcolon\space\href{https://ling.auf.net/lingbuzz/#1}{\nolinkurl{#1}}} + {\url{https://ling.auf.net/lingbuzz/#1}}} +\DeclareFieldAlias{eprint:LingBuzz}{eprint:lingbuzz} + +% Print Rutgers Optimality Archive entries using an eprint field +\DeclareFieldFormat{eprint:roa}{% + \iftoggle{unified:compactlinks}% + {\mkbibacro{ROA}\addcolon\space\href{https://roa.rutgers.edu/article/view/#1}{\nolinkurl{#1}}} + {\url{https://roa.rutgers.edu/article/view/#1}}} +\DeclareFieldAlias{eprint:ROA}{eprint:roa} + +% Unless the user issues the option `alllinks`, if there's a DOI, only that will be +% displayed, and if there's no DOI but an eprint, only that will be displayed. If +% `alllinks` is issued, all links (up to three) will be displayed + +\newtoggle{unified:alllinks} +\DeclareBibliographyOption[boolean]{alllinks}[true]{% + \settoggle{unified:alllinks}{#1}} + +% We first check whether the url field contains a link to a DOI or an established eprint source +% If so, we put that info into the DOI or eprint fields +\AtBeginDocument{% + \DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{\step[fieldsource=url,match=\regexp{(http|https):\/\/(dx\.)?doi\.org\/(.*)},final] + \step[fieldset=doi, fieldvalue={$3}] + \step[fieldset=url,null] + \step[fieldset=urldate,null]} + \map{\step[fieldsource=url,match=\regexp{(http|https):\/\/ling\.auf\.net\/lingbuzz\/(.*)},final] + \step[fieldset=eprint, fieldvalue={$2}] + \step[fieldset=eprinttype, fieldvalue={lingbuzz}] + \step[fieldset=url,null] + \step[fieldset=urldate,null]} + \map{\step[fieldsource=url,match=\regexp{(http|https):\/\/www\.jstor\.org\/stable\/(.*)},final] + \step[fieldset=eprint, fieldvalue={$2}] + \step[fieldset=eprinttype, fieldvalue={jstor}] + \step[fieldset=url,null] + \step[fieldset=urldate,null]} + \map{\step[fieldsource=url,match=\regexp{(http|https):\/\/books\.google\.com\/books\?id=(.*)},final] + \step[fieldset=eprint, fieldvalue={$2}] + \step[fieldset=eprinttype, fieldvalue={googlebooks}] + \step[fieldset=url,null] + \step[fieldset=urldate,null]} + \map{\step[fieldsource=url,match=\regexp{(http|https):\/\/roa\.rutgers\.edu\/article\/view\/(.*)},final] + \step[fieldset=eprint, fieldvalue={$2}] + \step[fieldset=eprinttype, fieldvalue={roa}] + \step[fieldset=url,null] + \step[fieldset=urldate,null]} + }} + \iftoggle{unified:alllinks} + {} + {\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{\step[fieldsource=doi,final] + \step[fieldset=eprint,null] + \step[fieldset=eprinttype,null] + \step[fieldset=url,null] + \step[fieldset=urldate,null]} + \map{\step[fieldsource=eprint,final] + \step[fieldset=url,null] + \step[fieldset=urldate,null]}}}}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% biblatex doesn't like things like "forthcoming'' in the year/date field. The % +% canonical way to do this is to put "forthcoming" in the `pubstate` field. Since % +% we want that to be treated as the label, we need to adjust some things. What we % +% do here is suggested at https://tex.stackexchange.com/a/444414/70432. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\DeclareLabeldate{% + \field{date} + \field{year} + \field{eventdate} + \field{origdate} + \field{urldate} + \field{pubstate} + \literal{nodate} +} + +\renewbibmacro*{addendum+pubstate}{% + \printfield{addendum}% + \newunit\newblock + \iffieldequalstr{labeldatesource}{pubstate} + {} + {\printfield{pubstate}}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% THE BIBLIOGRAPHY DRIVERS % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% First, the entry types used in the Unified Test Bibliography. -%%% Could rely on standard.bbx for all others as a fallback. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% First, the entry types used in the Unified Test Bibliography. % +% Could rely on standard.bbx for all others as a fallback. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% For the article type, the only departure from standard.bbx is that -% we don't use a literal "In: " before the journal title; other -% formatting departures are done in the format specs and bibmacros +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% For the article type, the only departure from standard.bbx is that % +% we don't use a literal "In: " before the journal title; other % +% formatting departures are done in the format specs and bibmacros % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareBibliographyDriver{article}{% \usebibmacro{bibindex}% @@ -530,33 +669,39 @@ {}% \usebibmacro{finentry}} -% Aliased to ensure no period between the title and the series. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Aliased to ensure no period between the title and the series. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareBibliographyAlias{collection}{book} -% @inbook entries look terrible as-is, and have fields very similar to -% @incollection anyway +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% @inbook entries look terrible as-is, and have fields very similar to % +% @incollection anyway % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareBibliographyAlias{inbook}{incollection} \DeclareBibliographyAlias{incollection}{inproceedings} -% Given the guidelines in the unified style sheet, we should print -% conference proceedings and working papers as @article's just in case -% the publication has an ISSN. So, rather than have users handle this -% in the database by changing the entry type, we can implement this by -% checking if the inproceedings entry has an ISSN. If the field is -% undefined, the driver will do what driver did for @inproceedings -% entries as of 512f11657199a6044f7663da454f3eac338bdbd5 except that -% \printlist{organization} and \newunit have been removed. On the -% other hand, if the ISSN field is not undefined, then we will do -% largely the exact same thing that we do in the @article driver, -% except that we use the two macros -% \usebibmacro{unified:proc-as-article:maintitle+booktitle} and -% \usebibmacro{unified:proc-as-article:volume+number+eid} instead of -% \usebibmacro{journal+issuetitle} and except that -% \usebibmacro{byeditor+others} has been removed so as to ensure that -% the editors are not listed even if they are present in the database. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Given the guidelines in the unified style sheet, we should print % +% conference proceedings and working papers as @article's just in case % +% the publication has an ISSN. So, rather than have users handle this % +% in the database by changing the entry type, we can implement this by % +% checking if the inproceedings entry has an ISSN. If the field is % +% undefined, the driver will do what driver did for @inproceedings % +% entries as of 512f11657199a6044f7663da454f3eac338bdbd5 except that % +% \printlist{organization} and \newunit have been removed. On the % +% other hand, if the ISSN field is not undefined, then we will do % +% largely the exact same thing that we do in the @article driver, % +% except that we use the two macros % +% \usebibmacro{unified:proc-as-article:maintitle+booktitle} and % +% \usebibmacro{unified:proc-as-article:volume+number+eid} instead of % +% \usebibmacro{journal+issuetitle} and except that % +% \usebibmacro{byeditor+others} has been removed so as to ensure that % +% the editors are not listed even if they are present in the database. % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% @@ -692,9 +837,7 @@ \newunit\newblock \usebibmacro{location+date}% \newunit\newblock - \iftoggle{bbx:url} - {\usebibmacro{url+urldate}} - {}% + \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.cbx index 95fe0d99e0..898ee16a60 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-unified/unified.cbx @@ -9,7 +9,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{unified.cbx}[2020/05/25 v1.00 biblatex citation style] +\ProvidesFile{unified.cbx}[2022/11/08 v1.20 biblatex citation style] \RequireCitationStyle{authoryear-comp} diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 2e584ed2a0..f49e14c200 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/11/04}{1.71C} +\ProvidesExplClass{easybook}{2022/11/08}{1.71D} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -304,7 +304,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/11/04}{1.71C} +\ProvidesExplPackage{easybase}{2022/11/08}{1.71D} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2334,7 +2334,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/11/04}{1.71C} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/11/08}{1.71D} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 52763c6ca7..cf8ebd4ce7 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 086515d7ee..de17154a4b 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.71C, - date = 2022/11/04, + version = v1.71D, + date = 2022/11/08, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -54,7 +54,7 @@ \SetTblrInner[talltblr]{hline{1,Z} = {0.8pt,blue}} \SetTblrTemplate{caption}{empty} \DefTblrTemplate{remark-sep}{default}{\space} -\SetTblrStyle{remark}{font = \normalfont} +\SetTblrStyle{remark}{font = \small\normalfont} \ExplSyntaxOn\makeatletter % * Do not add entries to the index diff --git a/macros/latex/contrib/se2thesis/CHANGELOG.md b/macros/latex/contrib/se2thesis/CHANGELOG.md index 5f35b011e9..d8d2ec80d5 100644 --- a/macros/latex/contrib/se2thesis/CHANGELOG.md +++ b/macros/latex/contrib/se2thesis/CHANGELOG.md @@ -7,6 +7,23 @@ and this project adheres to ## [Unreleased] +## [v1.3.0] – 2022–11–08 + +### Changed + +These changes might be breaking changes! + +- Change the width of the text block to match a golden ratio with its height. +- Change the available predefined colours. +- Change the option names of `se2colors` and `se2fonts` to `cmode` and `fmode`, + respectively. +- Use Helvetica instead of Optima as the sans-serif default font. + +### Fixed + +- For summary boxes a white space was missing between the text “Summary” and the + opening bracket, reported by @Wooza + ## [v1.2.0] – 2022–10–24 ### Added @@ -38,6 +55,7 @@ and this project adheres to ### Added - First official release +[v1.3.0]: https://github.com/se2p/se2thesis/compare/v1.3.0...v1.2.0 [v1.2.0]: https://github.com/se2p/se2thesis/compare/v1.2.0...v1.1.1 [v1.1.1]: https://github.com/se2p/se2thesis/compare/v1.1.0...v1.1.1 [v1.1.0]: https://github.com/se2p/se2thesis/compare/1.0.0...v1.1.0 diff --git a/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf b/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf Binary files differindex 19a357abca..c7d06dab7c 100644 --- a/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf +++ b/macros/latex/contrib/se2thesis/se2thesis-master-thesis-example.pdf diff --git a/macros/latex/contrib/se2thesis/se2thesis.dtx b/macros/latex/contrib/se2thesis/se2thesis.dtx index 0dea72eb51..39485c8d11 100644 --- a/macros/latex/contrib/se2thesis/se2thesis.dtx +++ b/macros/latex/contrib/se2thesis/se2thesis.dtx @@ -151,7 +151,7 @@ \usepackage{hvfloat} \hypersetup{% - allcolors=UPSE2-DarkBlue,% + allcolors=UPSE2-Blue,% pdftitle={se2thesis -- A Thesis Class for the Chair of Software Engineering II at the University of Passau, Germany},% pdfauthor={Stephan Lukasczyk}, @@ -823,9 +823,9 @@ % The \pkg{se2colors} package provides this exact features. % One can load it using |\usepackage{se2colors}| in the document preamble. % -% \begin{function}{colormode} +% \begin{function}[updated = 2022-11-03]{cmode} % \begin{syntax} -% |colormode| = \meta{choice} +% |cmode| = \meta{choice} % \end{syntax} % Selects the colour mode that shall be used for creating the results, % a choice from the options specified in \cref{tab:coloursoptions}. @@ -840,22 +840,22 @@ % \begin{tabular}{@{} l l @{}} \toprule % Option & Description \\ \midrule % % -% |colormode=4C| +% |cmode=4C| % & Define colours in CMYK colour space (\emph{default}). \\ % % % |CMYK|, |cmyk| % & Aliases for the previous. \\ % % -% |colormode=RGB| +% |cmode=RGB| % & Define colours in RGB colour space. \\ % % % |RGB|, |rgb| % & Aliases for the previous. \\ % % -% |colormode=BW| +% |cmode=BW| % & Define colours in black-and-white colour space. \\ % % -% |colormode=1C| +% |cmode=1C| % & Alias for the previous. \\ % % % |gray| @@ -871,23 +871,87 @@ % and |UPSE2-Orange| \testclr{UPSE2-Orange}. % % Additionally, -% we define 15 supplementary colours: +% we define four colours for the four faculties of the University: +% \begin{itemize} +% \item the Faculty of Law |UPSE2-JUR| \testclr{UPSE2-JUR}, +% \item the School of Business, Economics and Information Systems |UPSE2-WIWI| \testclr{UPSE2-WIWI}, +% \item the Faculty of Arts and Humanities |UPSE2-PHIL| \testclr{UPSE2-PHIL}, and +% \item the Faculty of Computer Science and Mathematics |UPSE2-FIM| \testclr{UPSE2-FIM}. +% \end{itemize} +% +% Finally, +% we define a full set of supplementary colours: % \begin{itemize} -% \item |UPSE2-DarkGreen| \testclr{UPSE2-DarkGreen}, -% \item |UPSE2-MediumGreen| \testclr{UPSE2-MediumGreen}, -% \item |UPSE2-LightGreen| \testclr{UPSE2-LightGreen}, -% \item |UPSE2-DarkBlue| \testclr{UPSE2-DarkBlue}, -% \item |UPSE2-MediumBlue| \testclr{UPSE2-MediumBlue}, -% \item |UPSE2-LightBlue| \testclr{UPSE2-LightBlue}, -% \item |UPSE2-DarkPurple| \testclr{UPSE2-DarkPurple}, -% \item |UPSE2-MediumPurple| \testclr{UPSE2-MediumPurple}, -% \item |UPSE2-LightPurple| \testclr{UPSE2-LightPurple}, -% \item |UPSE2-DarkOcher| \testclr{UPSE2-DarkOcher}, -% \item |UPSE2-MediumOcher| \testclr{UPSE2-MediumOcher}, -% \item |UPSE2-LightOcher| \testclr{UPSE2-LightOcher}, -% \item |UPSE2-DarkRed| \testclr{UPSE2-DarkRed}, -% \item |UPSE2-MediumRed| \testclr{UPSE2-MediumRed}, and +% \item |UPSE2-DarkGray| \testclr{UPSE2-DarkGray} +% with its derivatives \\ +% |UPSE2-DarkGray1| \testclr{UPSE2-DarkGray1}, +% |UPSE2-DarkGray2| \testclr{UPSE2-DarkGray2}, +% |UPSE2-DarkGray3| \testclr{UPSE2-DarkGray3}, +% |UPSE2-DarkGray4| \testclr{UPSE2-DarkGray4}, and +% |UPSE2-DarkGray5| \testclr{UPSE2-DarkGray5}. +% \item |UPSE2-White| \testclr{UPSE2-White} +% with its derivatives \\ +% |UPSE2-White1| \testclr{UPSE2-White1}, +% |UPSE2-White2| \testclr{UPSE2-White2}, +% |UPSE2-White3| \testclr{UPSE2-White3}, +% |UPSE2-White4| \testclr{UPSE2-White4}, and +% |UPSE2-White5| \testclr{UPSE2-White5}. +% \item |UPSE2-MediumGray| \testclr{UPSE2-MediumGray} +% with its derivatives \\ +% |UPSE2-MediumGray1| \testclr{UPSE2-MediumGray1}, +% |UPSE2-MediumGray2| \testclr{UPSE2-MediumGray2}, +% |UPSE2-MediumGray3| \testclr{UPSE2-MediumGray3}, +% |UPSE2-MediumGray4| \testclr{UPSE2-MediumGray4}, and +% |UPSE2-MediumGray5| \testclr{UPSE2-MediumGray5}. +% \item |UPSE2-LightGray| \testclr{UPSE2-LightGray} +% with its derivatives \\ +% |UPSE2-LightGray1| \testclr{UPSE2-LightGray1}, +% |UPSE2-LightGray2| \testclr{UPSE2-LightGray2}, +% |UPSE2-LightGray3| \testclr{UPSE2-LightGray3}, +% |UPSE2-LightGray4| \testclr{UPSE2-LightGray4}, and +% |UPSE2-LightGray5| \testclr{UPSE2-LightGray5}. +% \item |UPSE2-Orange| \testclr{UPSE2-Orange} +% with its derivatives \\ +% |UPSE2-Orange1| \testclr{UPSE2-Orange1}, +% |UPSE2-Orange2| \testclr{UPSE2-Orange2}, +% |UPSE2-Orange3| \testclr{UPSE2-Orange3}, +% |UPSE2-Orange4| \testclr{UPSE2-Orange4}, and +% |UPSE2-Orange5| \testclr{UPSE2-Orange5}. % \item |UPSE2-LightRed| \testclr{UPSE2-LightRed} +% with its derivatives \\ +% |UPSE2-LightRed1| \testclr{UPSE2-LightRed1}, +% |UPSE2-LightRed2| \testclr{UPSE2-LightRed2}, +% |UPSE2-LightRed3| \testclr{UPSE2-LightRed3}, +% |UPSE2-LightRed4| \testclr{UPSE2-LightRed4}, and +% |UPSE2-LightRed5| \testclr{UPSE2-LightRed5}. +% \item |UPSE2-DarkRed| \testclr{UPSE2-DarkRed} +% with its derivatives \\ +% |UPSE2-DarkRed1| \testclr{UPSE2-DarkRed1}, +% |UPSE2-DarkRed2| \testclr{UPSE2-DarkRed2}, +% |UPSE2-DarkRed3| \testclr{UPSE2-DarkRed3}, +% |UPSE2-DarkRed4| \testclr{UPSE2-DarkRed4}, and +% |UPSE2-DarkRed5| \testclr{UPSE2-DarkRed5}. +% \item |UPSE2-Green| \testclr{UPSE2-Green} +% with its derivatives \\ +% |UPSE2-Green1| \testclr{UPSE2-Green1}, +% |UPSE2-Green2| \testclr{UPSE2-Green2}, +% |UPSE2-Green3| \testclr{UPSE2-Green3}, +% |UPSE2-Green4| \testclr{UPSE2-Green4}, and +% |UPSE2-Green5| \testclr{UPSE2-Green5}. +% \item |UPSE2-Blue| \testclr{UPSE2-Blue} +% with its derivatives \\ +% |UPSE2-Blue1| \testclr{UPSE2-Blue1}, +% |UPSE2-Blue2| \testclr{UPSE2-Blue2}, +% |UPSE2-Blue3| \testclr{UPSE2-Blue3}, +% |UPSE2-Blue4| \testclr{UPSE2-Blue4}, and +% |UPSE2-Blue5| \testclr{UPSE2-Blue5}. +% \item |UPSE2-AccentGray| \testclr{UPSE2-AccentGray} +% with its derivatives \\ +% |UPSE2-AccentGray1| \testclr{UPSE2-AccentGray1}, +% |UPSE2-AccentGray2| \testclr{UPSE2-AccentGray2}, +% |UPSE2-AccentGray3| \testclr{UPSE2-AccentGray3}, +% |UPSE2-AccentGray4| \testclr{UPSE2-AccentGray4}, and +% |UPSE2-AccentGray5| \testclr{UPSE2-AccentGray5}. % \end{itemize} % % \section{The \pkg{se2fonts} package}\label{sec:doc-se2fonts} @@ -896,17 +960,17 @@ % By default, % we recommend using Hermann Zapf's beautiul \emph{Palatino} font % as the main text font, -% accompanied with his sans-serif font \emph{Optima} +% accompanied with the sans-serif font \emph{Helvetica} % and \emph{Neo Euler} as the default math font; % we set \emph{Meslo LGS Nerd Font Mono} as the monospaced font. -% Palatino and Optima get shipped with any macOS system, +% Palatino and Helvetica get shipped with any macOS system, % the user, however, needs to download Neo Euler themself\footnote{ % for example from % \href{https://fontlibrary.org/en/font/euler-otf}{https://fontlibrary.org/en/font/euler-otf}. % }. % Being aware that these fonts might not be available on every user's system, % we recommend using \emph{\TeX{} Gyre Pagella} as an alternative to -% Palatino, \emph{\TeX{} Gyre Heros} as an alternative to Optima, +% Palatino, \emph{\TeX{} Gyre Heros} as an alternative to Helvetica, % and the \emph{\TeX{} Gyre Pagella Math} as the default math font; % \emph{Fira Code} is a nice monospaced font. % Although they look different in various details @@ -926,9 +990,9 @@ % The following option is defined by the \pkg{se2fonts} package % to influence the selection of the fonts. % -% \begin{function}[updated = 2022-09-27]{fontmode} +% \begin{function}[updated = 2022-11-03]{fmode} % \begin{syntax} -% |fontmode| = \meta{choice} +% |fmode| = \meta{choice} % \end{syntax} % Sets the font-selection mode based on a choice: % |original| selects the fonts we recommend for using, @@ -947,7 +1011,7 @@ % \begin{itemize} % \item {\fontspec{Palatino}An example text in Palatino} % \item {\fontspec{TeX Gyre Pagella}An example text in \TeX{} Gyre Pagella} -% \item {\fontspec{Optima}An example text in Optima} +% \item {\fontspec{Helvetica}An example text in Helvetica} % \item {\fontspec{TeX Gyre Heros}An example text in \TeX{} Gyre Heros} % \item {\fontspec{MesloLGSNerd Font Mono}An example text in MesloLGS} % \item {\fontspec{Fira Code}An example text in Fira Code} @@ -1060,7 +1124,7 @@ % % Identify the class and give the overall version number. % \begin{macrocode} -\ProvidesExplClass {se2thesis} {2022-10-24} {1.2.0} +\ProvidesExplClass {se2thesis} {2022-11-08} {1.3.0} {A thesis class for the Chair of Software Engineering II} % \end{macrocode} % @@ -1569,17 +1633,17 @@ % \begin{macrocode} \int_compare:nTF { \l_@@_paper_int=1 } { - \areaset[current]{336pt}{630pt} + \areaset[current]{389pt}{630pt} \setlength{\marginparsep}{8.5cm} \setlength{\marginparsep}{1em} }{ \int_compare:nTF { \l_@@_paper_int=2 } { - \areaset[current]{238pt}{445pt} + \areaset[current]{275pt}{445pt} \setlength{\marginparsep}{6.0cm} \setlength{\marginparsep}{0.71em} }{ - \areaset[current]{291pt}{545pt} + \areaset[current]{337pt}{545pt} \setlength{\marginparsep}{7.4cm} \setlength{\marginparsep}{0.87em} } @@ -1607,7 +1671,7 @@ \footnotesize% \hspace*{\l_@@_headmarkspace_dim}% \group_begin: - \color{UPSE2-DarkBlue}% + \color{UPSE2-Blue}% \rule[\l_@@_ruleraise_dim]{\l_@@_rulewidth_dim}{\l_@@_rulethickness_dim}% \group_end: \hspace*{\l_@@_rulespace_dim}% @@ -1619,11 +1683,11 @@ \group_begin: \ \group_end: \footnotesize% \group_begin: - \color{UPSE2-DarkBlue}\headmark + \color{UPSE2-Blue}\headmark \group_end: \hspace*{\l_@@_rulespace_dim}% \group_begin: - \color{UPSE2-DarkBlue}% + \color{UPSE2-Blue}% \rule[\l_@@_ruleraise_dim]{\l_@@_rulewidth_dim}{\l_@@_rulethickness_dim}% \group_end: \hspace*{\l_@@_rulespace_dim}% @@ -1646,7 +1710,7 @@ \footnotesize% \hspace*{\l_@@_rulespace_dim}% \group_begin: - \color{UPSE2-DarkBlue}% + \color{UPSE2-Blue}% \rule[\l_@@_ruleraise_dim]{\l_@@_rulewidth_dim}{\l_@@_rulethickness_dim}% \group_end: }]{% @@ -1658,12 +1722,12 @@ \footnotesize% \hspace*{\l_@@_rulespace_dim}% \group_begin: - \color{UPSE2-DarkBlue}% + \color{UPSE2-Blue}% \rule[\l_@@_ruleraise_dim]{\l_@@_rulewidth_dim}{\l_@@_rulethickness_dim}% \group_end: \hspace*{\l_@@_headmarkspace_dim}% \group_begin: - \color{UPSE2-DarkBlue}\headmark + \color{UPSE2-Blue}\headmark \group_end: } % \end{macrocode} @@ -2136,7 +2200,7 @@ % its content. % \begin{macrocode} \NewDocumentEnvironment { summary } { m } - { \begin{tcolorbox}[title={Summary (#1)}] } + { \begin{tcolorbox}[title={Summary~ (#1)}] } { \end{tcolorbox} } % \end{macrocode} % \end{environment} @@ -2168,7 +2232,7 @@ % We provide the following English translations. % % \begin{macrocode} -\ProvideDictionaryFor{English}{se2translations}[2022/10/24] +\ProvideDictionaryFor{English}{se2translations}[2022/11/08] \ProvideDictTranslation{abstract}{abstract} \ProvideDictTranslation{Abstract}{Abstract} \ProvideDictTranslation{acknowledgement}{acknowledgement} @@ -2219,7 +2283,7 @@ % We provide the following German translations. % % \begin{macrocode} -\ProvideDictionaryFor{German}{se2translations}[2022/10/24] +\ProvideDictionaryFor{German}{se2translations}[2022/11/08] \ProvideDictTranslation{abstract}{Zusammenfassung} \ProvideDictTranslation{Abstract}{Zusammenfassung} \ProvideDictTranslation{acknowledgement}{Danksagung} @@ -2280,7 +2344,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2colors} {2022-10-24} {1.2.0} +\ProvidesExplPackage {se2colors} {2022-11-08} {1.3.0} {A colour support package for the se2thesis bundle} % \end{macrocode} % @@ -2292,30 +2356,30 @@ % \begin{macrocode} \keys_define:nn { seiicolors } { - colormode .choice:, - colormode / 4C .code:n = { + cmode .choice:, + cmode / 4C .code:n = { \PassOptionsToPackage{cmyk}{xcolor} \tl_gset:Nn \l_@@_colormode_tl {4C} }, - colormode / RGB .code:n = { + cmode / RGB .code:n = { \PassOptionsToPackage{rgb}{xcolor} \tl_gset:Nn \l_@@_colormode_tl {RGB} }, - colormode / BW .code:n = { + cmode / BW .code:n = { \PassOptionsToPackage{gray}{xcolor} \tl_gset:Nn \l_@@_colormode_tl {BW} }, - colormode / CMYK .meta:n = {colormode=4C}, - colormode / cmyk .meta:n = {colormode=4C}, - colormode / rgb .meta:n = {colormode=RGB}, - colormode / gray .meta:n = {colormode=BW}, - RGB .meta:n = {colormode=RGB}, - rgb .meta:n = {colormode=rgb}, - CMYK .meta:n = {colormode=4C}, - cmyk .meta:n = {colormode=4C}, - gray .meta:n = {colormode=BW}, + cmode / CMYK .meta:n = {cmode=4C}, + cmode / cmyk .meta:n = {cmode=4C}, + cmode / rgb .meta:n = {cmode=RGB}, + cmode / gray .meta:n = {cmode=BW}, + RGB .meta:n = {cmode=RGB}, + rgb .meta:n = {cmode=rgb}, + CMYK .meta:n = {cmode=4C}, + cmyk .meta:n = {cmode=4C}, + gray .meta:n = {cmode=BW}, } -\keys_set:nn { seiicolors } { colormode = 4C } +\keys_set:nn { seiicolors } { cmode = 4C } % \end{macrocode} % \end{variable} % @@ -2341,30 +2405,76 @@ % Passau's style guides. % \begin{macrocode} \definecolorset[named]{RGB/cmyk}{UPSE2-}{}{% - Gray,123,131,133/.08,.02,0,.48;% - Orange,229,137,0/0,.40,1.0,.10% + Orange,242,148,0/0.00,0.44,0.95,0.01;% + Gray,153,159,158/0.40,0.28,0.28,0.00;% + JUR,229,49,56/0.01,0.90,0.81,0.01;% + WIWI,0,96,57/0.87,0.20,0.87,0.36;% + PHIL,188,42,51/0.06,0.93,0.81,0.11;% + FIM,0,90,161/0.93,0.63,0.01,0.02;% + DarkGray,77,77,77/0.74,0.67,0.62,0.18;% + White,255,255,255/0.00,0.00,0.00,0.00;% + MediumGray,127,127,127/0.52,0.43,0.40,0.02;% + LightGray,229,229,229/0.08,0.06,0.04,0.00;% + LightRed,229,49,56/0.01,0.90,0.81,0.01;% + DarkRed,188,42,51/0.06,0.93,0.80,0.11;% + Green,0,96,57/0.87,0.20,0.86,0.35;% + Blue,0,90,161/0.93,0.63,0.01,0.02;% + AccentGray,153,159,158/0.40,0.28,0.28,0.00% } % \end{macrocode} % -% Define the additional colours. -% \begin{macrocode} -\definecolorset[named]{RGB/cmyk}{UPSE2-}{}{% - DarkGreen,85,100,85/.6,.2,.6,.35;% - MediumGreen,105,150,115/.55,0,.55,.10;% - LightGreen,140,175,130/.4,0,.5,.05;% - DarkBlue,80,110,150/.70,.40,0,.15;% - MediumBlue,105,155,190/.55,.1,0,.1;% - LightBlue,135,185,200/.4,0,.10,.05;% - DarkPurple,100,80,120/.6,.8,.05,.15;% - MediumPurple,130,90,125/.35,.7,.1,.15;% - LightPurple,160,135,170/.3,.45,.05,0;% - DarkOcher,120,100,80/.35,.45,.65,.25;% - MediumOcher,150,130,95/.25,.3,.6,.15;% - LightOcher,185,145,100/.1,.25,.6,.1;% - DarkRed,180,20,40/.05,1,.8,.05;% - MediumRed,210,90,80/0,.75,.6,.1;% - LightRed,255,145,125/.05,.5,.45,.05% -} +% Define the derived colours. +% \begin{macrocode} +\colorlet{UPSE2-DarkGray1}{UPSE2-DarkGray!20!white} +\colorlet{UPSE2-DarkGray2}{UPSE2-DarkGray!40!white} +\colorlet{UPSE2-DarkGray3}{UPSE2-DarkGray!60!white} +\colorlet{UPSE2-DarkGray4}{UPSE2-DarkGray!75!black} +\colorlet{UPSE2-DarkGray5}{UPSE2-DarkGray!50!black} +\colorlet{UPSE2-White1}{UPSE2-White!95!black} +\colorlet{UPSE2-White2}{UPSE2-White!85!black} +\colorlet{UPSE2-White3}{UPSE2-White!75!black} +\colorlet{UPSE2-White4}{UPSE2-White!65!black} +\colorlet{UPSE2-White5}{UPSE2-White!50!black} +\colorlet{UPSE2-MediumGray1}{UPSE2-MediumGray!20!white} +\colorlet{UPSE2-MediumGray2}{UPSE2-MediumGray!40!white} +\colorlet{UPSE2-MediumGray3}{UPSE2-MediumGray!60!white} +\colorlet{UPSE2-MediumGray4}{UPSE2-MediumGray!75!black} +\colorlet{UPSE2-MediumGray5}{UPSE2-MediumGray!50!black} +\colorlet{UPSE2-LightGray1}{UPSE2-LightGray!90!black} +\colorlet{UPSE2-LightGray2}{UPSE2-LightGray!75!black} +\colorlet{UPSE2-LightGray3}{UPSE2-LightGray!55!black} +\colorlet{UPSE2-LightGray4}{UPSE2-LightGray!25!black} +\colorlet{UPSE2-LightGray5}{UPSE2-LightGray!10!black} +\colorlet{UPSE2-Orange1}{UPSE2-Orange!20!white} +\colorlet{UPSE2-Orange2}{UPSE2-Orange!40!white} +\colorlet{UPSE2-Orange3}{UPSE2-Orange!60!white} +\colorlet{UPSE2-Orange4}{UPSE2-Orange!75!black} +\colorlet{UPSE2-Orange5}{UPSE2-Orange!50!black} +\colorlet{UPSE2-LightRed1}{UPSE2-LightRed!20!white} +\colorlet{UPSE2-LightRed2}{UPSE2-LightRed!40!white} +\colorlet{UPSE2-LightRed3}{UPSE2-LightRed!60!white} +\colorlet{UPSE2-LightRed4}{UPSE2-LightRed!75!black} +\colorlet{UPSE2-LightRed5}{UPSE2-LightRed!50!black} +\colorlet{UPSE2-DarkRed1}{UPSE2-DarkRed!20!white} +\colorlet{UPSE2-DarkRed2}{UPSE2-DarkRed!40!white} +\colorlet{UPSE2-DarkRed3}{UPSE2-DarkRed!60!white} +\colorlet{UPSE2-DarkRed4}{UPSE2-DarkRed!75!black} +\colorlet{UPSE2-DarkRed5}{UPSE2-DarkRed!50!black} +\colorlet{UPSE2-Green1}{UPSE2-Green!10!white} +\colorlet{UPSE2-Green2}{UPSE2-Green!25!white} +\colorlet{UPSE2-Green3}{UPSE2-Green!50!white} +\colorlet{UPSE2-Green4}{UPSE2-Green!75!white} +\colorlet{UPSE2-Green5}{UPSE2-Green!90!white} +\colorlet{UPSE2-Blue1}{UPSE2-Blue!20!white} +\colorlet{UPSE2-Blue2}{UPSE2-Blue!40!white} +\colorlet{UPSE2-Blue3}{UPSE2-Blue!60!white} +\colorlet{UPSE2-Blue4}{UPSE2-Blue!75!black} +\colorlet{UPSE2-Blue5}{UPSE2-Blue!50!black} +\colorlet{UPSE2-AccentGray1}{UPSE2-AccentGray!20!white} +\colorlet{UPSE2-AccentGray2}{UPSE2-AccentGray!40!white} +\colorlet{UPSE2-AccentGray3}{UPSE2-AccentGray!60!white} +\colorlet{UPSE2-AccentGray4}{UPSE2-AccentGray!75!black} +\colorlet{UPSE2-AccentGray5}{UPSE2-AccentGray!50!black} % \end{macrocode} % % \begin{macrocode} @@ -2386,7 +2496,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2fonts} {2022-10-24} {1.2.0} +\ProvidesExplPackage {se2fonts} {2022-11-08} {1.3.0} {A font-selection support package for the se2thesis bundle} % \end{macrocode} % @@ -2398,21 +2508,21 @@ % \begin{macrocode} \keys_define:nn { seiifonts } { - fontmode .choice:, - fontmode / original .code:n = { + fmode .choice:, + fmode / original .code:n = { \tl_gset:Nn \l_@@_fontmode_tl {original} }, - fontmode / replacement .code:n = { + fmode / replacement .code:n = { \tl_gset:Nn \l_@@_fontmode_tl {replacement} }, - fontmode / auto .code:n = { + fmode / auto .code:n = { \tl_gset:Nn \l_@@_fontmode_tl {auto} }, - original .meta:n = {fontmode=original}, - replacement .meta:n = {fontmode=replacement}, - auto .meta:n = {fontmode=auto}, + original .meta:n = {fmode=original}, + replacement .meta:n = {fmode=replacement}, + auto .meta:n = {fmode=auto}, } -\keys_set:nn { seiifonts } { fontmode = auto } +\keys_set:nn { seiifonts } { fmode = auto } % \end{macrocode} % \end{variable} % @@ -2493,12 +2603,12 @@ % \end{macrocode} % % The user wants to have the |original| fonts, -% which are Palatino, Optima, MesloLGS Nerd Font Mono, and Neo Euler. +% which are Palatino, Helvetica, MesloLGS Nerd Font Mono, and Neo Euler. % \begin{macrocode} \tl_if_eq:NnT \l_@@_fontmode_tl {original} { \setmainfont{Palatino} - \setsansfont{Optima} + \setsansfont{Helvetica} \setmonofont{MesloLGS Nerd Font Mono} \setmathfont{Neo Euler}[math-style=upright] } @@ -2530,8 +2640,8 @@ \IfFontExistsTF { Palatino } { \setmainfont{Palatino} } { \setmainfont{TeX Gyre Pagella} } - \IfFontExistsTF { Optima } - { \setsansfont{Optima} } + \IfFontExistsTF { Helvetica } + { \setsansfont{Helvetica} } { \setsansfont{TeXGyre Heros} } \IfFontExistsTF{ MesloLGS Nerd Font Mono } { \setmonofont{MesloLGS Nerd Font Mono} } diff --git a/macros/latex/contrib/se2thesis/se2thesis.pdf b/macros/latex/contrib/se2thesis/se2thesis.pdf Binary files differindex a6bc343034..a8a52332af 100644 --- a/macros/latex/contrib/se2thesis/se2thesis.pdf +++ b/macros/latex/contrib/se2thesis/se2thesis.pdf |