summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-12-03 03:02:48 +0000
committerNorbert Preining <norbert@preining.info>2024-12-03 03:02:48 +0000
commit57acda85d316696ad44e52125c17bdd6aa25b2b3 (patch)
treee8f2bd0e721ebe85c8b7fc20b344b071df3c9b3c /macros/latex/contrib
parentd8a57fb296b6897829f0ae703b0b32f00bd1ba20 (diff)
CTAN sync 202412030302
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-enc/README104
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.bbx191
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx20
-rw-r--r--macros/latex/contrib/dashrulex/dashrulex.pdfbin55770 -> 55730 bytes
-rw-r--r--macros/latex/contrib/dashrulex/dashrulex.sty6
-rw-r--r--macros/latex/contrib/dashrulex/dashrulex.tex12
6 files changed, 223 insertions, 110 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-enc/README b/macros/latex/contrib/biblatex-contrib/biblatex-enc/README
index fe57d30412..e770747b30 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-enc/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-enc/README
@@ -1,6 +1,6 @@
- %% biblatex-enc v.1.0 (17/06/2017)
- %% Copyright 2011-2017 J.B. Camps (jbcamps <at> hotmail.com)
-
+ %% biblatex-enc v.1.1 (02/12/2024)
+ %% Copyright 2011-2024 J.B. Camps (jbcamps@hotmail.com)
+
%%%%% Contents %%%%
% 1. Description %
% 2. Installation %
@@ -8,119 +8,135 @@
% 4. Versions %
% 5. Licence %
%%%%%%%%%%%%%%%%%%%
-
+
% 1. Description
% ---------------
% biblatex-enc is a citation and bibliography style for use with
% BibLaTeX. It conforms to the bibliographic standards used
% in the École nationale des chartes (Paris), and may be suited for a more
% general use in historical and philological works. It is initially
- % derived from the historische-zeitschrift package maintained by
+ % derived from the historische-zeitschrift package maintained by
% Dominik Waßenhoven, with the necessary modifications.
-
+
% 2. Installation
- % ---------------
- % Extract the files to
+ % ---------------
+ % Extract the files to
% <TEXMFLOCAL>/tex/latex/biblatex-enc
% where <TEXMFLOCAL> denotes the root of the local TeX installation
% tree. Don't forget to update the file hash tables after installing
% the files (i.e. by running
% $ texhash
% ).
-
+
% 3. Usage
- % ---------------
+ % ---------------
% 3.1 General Usage
% ---------------
- % Load the style as the biblatex standard styles, with
+ % Load the style as the biblatex standard styles, with
% \usepackage[style=enc]{biblatex}
%
- % The style provides formatting for both the footnotes and the
+ % The style provides formatting for both the footnotes and the
% bibliography with the standard commands,
% \footcite[See][p.~]{my_reference}
- % or
- % \footnote{ <some text> [See][p.~]{my_reference}}
- % and with
+ % or
+ % \footnote{ <some text> \cite[See][p.~]{my_reference}}
+ % and with
% \printbibliography
- % N.B.: if you have defined shorthands, they will also be used, and
+ % N.B.: if you have defined shorthands, they will also be used, and
% you can print them with
% \printshorthands
%
% N.B.: the \cites{}{} and \footcites{}{} commands are also available,
% as well as \parencite{} and \parencites{}{}.
-
+
% 3.2 Repetition of a reference, an author, etc.
- % ---------------
+ % ---------------
% In accordance to the bibliographic standards here implemented,
- % Ibid. is used for immediate repetition of a work, and Id., Ead.,
+ % Ibid. is used for immediate repetition of a work, and Id., Ead.,
% Eid., Eaed. for immediate repetition of an author. If you
% want this last one to work properly, you will need to set the
- % field
+ % field
% gender={}
% (sf, sm, pf, pm) in the bibliography file (.bib). See the Biblatex
% documentation.
%
- % The short title is used after the first appearance of a reference.
+ % The short title is used after the first appearance of a reference.
% You will also need to set it in the .bib file,
% shorttitle = {My Shorttitle},
%
- % Finally, if you want for chapters or articles of the same volume to
- % be cited with the abreviated volume title, both in footnotes and in the
- % bibliography, you will need to use the
+ % Finally, if you want for chapters or articles of the same volume to
+ % be cited with the abbreviated volume title, both in footnotes and in the
+ % bibliography, you will need to use the
% crossref = {volume_key},
% field.
-
+
% 3.3 Critical editions
- % ---------------
- % For critical editions to be handled correctly (i.e. for the critical
- % editor to be quoted as « éd. Untel », and not « dir. Untel », the
+ % ---------------
+ % For critical editions to be handled correctly (i.e. for the critical
+ % editor to be quoted as « éd. Untel », and not « dir. Untel », the
% field editortype need to be set as criticaleditor in the .bib file,
% e.g.
% editortype = {criticaleditor}
-
+
% 3.4 Annotated bibliography
- % ---------------
+ % ---------------
% If you want to produce an annotated bibliography, you can do it
% by setting the option
% \usepackage[annotatedBibliography=true]{biblatex}
- % This will print the content of the
+ % This will print the content of the
% annotation = {This reference is annotated},
- % of the bibliography (.bib) file in footnotesize, after the end
- % of the bibliographical reference (useful if you want to quote
+ % of the bibliography (.bib) file in footnotesize, after the end
+ % of the bibliographical reference (useful if you want to quote
% reviews of a book, for instance).
% 3.5 Typical usage
- % ---------------
+ % ---------------
% You can call BibLaTeX and the style with,
% \usepackage[backend=biber, %biber usage is recommended
% sorting=nyt, % sorting by name, year, and title
- % indexing=cite, %If you want to index cited authors
+ % indexing=cite, %If you want to index cited authors
% useeditor=false, %to keep sorting by title for edited works
% annotatedBibliography=true, %to have annotations
% style=enc, %
% minbibnames=10, %minimum and maximum authors cited in the bibliography (use of 'et al.')
% maxbibnames=10, %
% ]{biblatex}
- %
-
+ %
+
% 3.6 Note on localisation
- % ---------------
+ % ---------------
% This style is set for use with the French BibLaTeX locale
% but some of its definitions are replaced with new ones,
% in the .bbx file, in accordance to the bibliographic
% standards here implemented.
-
+
+
+ % 3.7 old prints
+ % ---------------
+ % The publisher is not included in @book. Since it is an important
+ % information for old books, we have added a new type of
+ % bibliographic source: @oldprint. The entry has to be encoded
+ % exactly like a @book, but the publisher will be added to the
+ % bibliographic reference, e.g.,
+ % @oldprint{author_oldprint,
+ % title = {Book's title},
+ % author = {Author, Some},
+ % location = {The City},
+ % publisher = {Publisher},
+ % date = {1675},
+ % }
+
% 4. Versions
% ---------------
% First version mars-april 2011
- % Current version, 2017 : 1.0
+ % Current version, 2024 : 1.1
% Modified to work with BibLaTeX >= 3.3
-
+
% 5. Licence
- % ---------------
+ % ---------------
%
% This work may be distributed and/or modified under the conditions
- % of the LaTeX Project Public License, either version 1.3 of this
+ % of the LaTeX Project Public License, either version 1.3 of this
% license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
@@ -128,7 +144,7 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
- %
+ %
% The Current Maintainer of this work is J.B. Camps (jbcamps@hotmail.com).
%
% This work consists of the files README, enc.cbx and enc.bbx.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.bbx
index 4dada49c3c..95c46d1ada 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.bbx
@@ -1,9 +1,9 @@
- %% biblatex-enc v.1.0 (17/06/2017)
+ %% biblatex-enc v.1.1 (02/12/2024)
%% enc.bbx
- %% Copyright 2015 J.B. Camps (jbcamps@hotmail.com)
+ %% Copyright 2011-2024 J.B. Camps (jbcamps@hotmail.com)
%
% This work may be distributed and/or modified under the conditions
- % of the LaTeX Project Public License, either version 1.3 of this
+ % of the LaTeX Project Public License, either version 1.3 of this
% license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
@@ -11,10 +11,10 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
- %
+ %
% The Current Maintainer of this work is J.B. Camps (jbcamps <at> hotmail.com).
%
- % This work consists of the files enc.cbx and enc.BBX.
+ % This work consists of the files enc.cbx and enc.bbx.
%TODO déplacer volumes, mention d'édition, etc. après lieu et date.
@@ -49,7 +49,7 @@
\settoggle{bbx:eprint}{#1}}
\DeclareBibliographyOption{annotatedBibliography}[false]{%
\settoggle{bbx:annotatedBibliography}{#1}} %false by default
-
+
\ExecuteBibliographyOptions{
url=true,
@@ -64,20 +64,20 @@
\DeclareBibliographyAlias{software}{online}
\DeclareBibliographyAlias{cite:software}{cite:online}
-%%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Reformatting %%%%%
-%%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% Reformatting %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%%
\renewcommand*{\mkbibnamegiven}[1]{#1}
%\renewcommand*{\mkbibnamefamily}[1]{#1}
\renewcommand*{\mkbibnameprefix}[1]{#1}
\renewcommand*{\mkbibnamesuffix}[1]{#1}
-% Comme les petites capitales pour le nom de famille font partie de la
-% définition du style de langue fr., il faut définir l'utilisation du
+% Comme les petites capitales pour le nom de famille font partie de la
+% définition du style de langue fr., il faut définir l'utilisation du
% romain un peu différemmment
%\savecommand\mkbibnamefamily%on sauvegarde la version avec small caps
\DefineBibliographyExtras{french}{%
-\renewcommand*{\mkbibnamefamily}[1]{{\hyphenrules{nohyphenation}#1}}%
+\renewcommand*{\mkbibnamefamily}[1]{\textnohyphenation{#1}}%
}
%Jamais de ponctuation entre les différentes parties d'un nom
@@ -96,7 +96,7 @@
%\renewcommand*{\finalnamedelim}{and}% et avant le
%\renewcommand*{\multilistdelim}{\adcomma\space}
% , entre différents lieux d'édition
-%\renewcommand*{\finallistdelim}{et} %
+%\renewcommand*{\finallistdelim}{et} %
\renewcommand{\andothersdelim}{\addcomma\addspace}%à vérifier dans les normes. Ponctuation avant et. al.
%%%% Les titres
@@ -144,33 +144,45 @@
bycriticaleditor = {éd\adddot},
}
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Series in parentheses %%%%%
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% Series in parentheses %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
\newbibmacro*{series+number}{%
\iffieldundef{series}%
{}
{\printtext[parens]{%
\printfield{series}%
\iffieldundef{number}
- {}
+ {}
{\setunit{\addcomma\space}%
\printfield{number}}%
}}}
-%%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%%
%%%%% Publisher omitted %%%%%
-%%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%%
\newbibmacro*{location+year}{%
\printlist{location}%
\newunit%
\printfield{year}%
\newunit%
}
-
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Parenthèses pour l'année d'une revue %%%%%
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+
+%%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% Publisher added %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%%
+\newbibmacro*{location+publisher+year}{%
+ \printlist{location}%
+ \newunit%
+ \printlist{publisher}%
+ \newunit%
+ \printfield{year}%
+ \newunit%
+}
+
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% Parenthèses pour l'année d'une revue %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
\newbibmacro*{issue+date}{%
\iffieldundef{issue}
{\iffieldundef{month}
@@ -203,8 +215,8 @@
\newunit%
\usebibmacro{issue}%
\newunit}
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+
\DeclareFieldFormat{shorthandwidth}{#1}
\newcommand*{\thebibitem}{\item}
\newcommand*{\thelositem}{\item}
@@ -230,7 +242,7 @@
\setlength{\parsep}{\bibparsep}%
\renewcommand*{\makelabel}[1]{##1\hss}}}
{\endlist}
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%déclaration du format de nom applicable à la bibliographie
@@ -258,9 +270,9 @@
\ifdefvoid{#2}{}{\addlowpenspace\mkbibnamegiven{#2}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamefamily{\textsc{#1}}\isdot
+ \mkbibnamefamily{\textsc{#1}}\isdot
\ifboolexpr{%
- test {\ifdefvoid{#2}}
+ test {\ifdefvoid{#2}}
and
test{\ifdefvoid{#3}}
and
@@ -296,8 +308,8 @@
\usebibmacro{editorstrg}%
\clearname{editor}}
{\global\undef\bbx@lasthash}}
-
-
+
+
\renewbibmacro*{byeditor+others}{%
\ifnameundef{editor}
{}
@@ -309,18 +321,18 @@
\printnames[citeauthor][1-10]{editor}%Je précise 1-10, pour qu'à la première occurrence on ait tous les éditeurs, mais c'est un peu un hack, car cela repose sur le fait que l'on ne mentionne, dans la version actuelle du style, les éditeurs que dans la première note complète. Une solution plus propre serait de procéder comme pour les auteurs, en différenciant editor-fullnote et editor-shortnote
}
\savefield{namehash}{\cbx@lasthash}
- \clearname{editor}%
+ \clearname{editor}%
\setunit*{\addcomma\addspace}
\newunit}%
\usebibmacro{byeditorx}%
- \usebibmacro{bytranslator+others}}
-
-
+ \usebibmacro{bytranslator+others}}
+
+
\renewbibmacro*{editorstrg}{%
\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
{\mkbibparens{\bibstring{editors}}}
{\mkbibparens{\bibstring{editor}}}}
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%Définition du format pour les noms d'auteurs pour les citations
@@ -331,17 +343,17 @@
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
{\ifthenelse{\iffieldequals{namehash}{\cbx@lasthash}}%
{\bibstring{idem\thefield{gender}},}%
- {\printnames[citeauthor][1-10]{author}%
+ {\printnames[citeauthor][1-10]{author}%
\savefield{namehash}{\cbx@lasthash}
%\savefield{fullhash}{\cbx@thefield{fullhash}}}{\printnames{labelname}}
}}%
{\global\undef\cbx@lasthash}}
-
+
\newbibmacro*{author-shortnote}{%On est obligés d'en faire deux, pour avoir un et. al. différent
\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
{\ifthenelse{\iffieldequals{namehash}{\cbx@lasthash}}%
{\bibstring{idem\thefield{gender}},}%
- {\printnames[citeauthor][1-3]{author}%
+ {\printnames[citeauthor][1-3]{author}%
\savefield{namehash}{\cbx@lasthash}
%\savefield{fullhash}{\cbx@thefield{fullhash}}}{\printnames{labelname}}
}}%
@@ -367,10 +379,10 @@
{\usebibmacro{author-fullnote}}
{\usebibmacro{editor}}}
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Editor in @incollection and %%%%%
-%%%%% @inproceedings not in italics %%%%%
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% Editor in @incollection and %%%%%
+%%%%% @inproceedings not in italics %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
\renewbibmacro*{bybookauthor}{%
\ifnamesequal{author}{bookauthor}%
@@ -418,7 +430,7 @@
\setunit{\addcolon\space}}}%
\usebibmacro{booktitle}%
\newunit}
-
+
\newbibmacro*{title+issuetitle}{%
\usebibmacro{periodical}%
\setunit*{\addspace}%
@@ -454,7 +466,7 @@
\newbibmacro*{finentry}{\finentry}
-
+
\newbibmacro*{doi+eprint+url}{%
\iftoggle{bbx:doi}%
{\printfield{doi}}%
@@ -484,9 +496,9 @@
}{}%
}
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Bibliography Driver %%%%%
-%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
+%%%%% Bibliography Driver %%%%%
+%%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%
%Et on est prêts, c'est parti !
@@ -548,7 +560,44 @@
\usebibmacro{location+year}%
\setunit*{\addspace}%
\usebibmacro{series+number}%
- \setunit{\newunitpunct}%
+ \setunit{\newunitpunct}%
+ \newunit%
+ \usebibmacro{chapter+pages}%
+% \newunit%
+% \printfield{pagetotal}
+ \newunit%
+ \usebibmacro{doi+eprint+url}%
+ \newunit%
+ \printfield{addendum}%
+ \usebibmacro{finentry}%
+ \usebibmacro{annotation}%
+ }
+
+\DeclareBibliographyDriver{oldprint}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author/editor}%
+ \setunit{\labelnamepunct}%
+ \usebibmacro{maintitle+title}%
+ \newunit%
+ \usebibmacro{byauthor}%
+ \newunit%
+ \usebibmacro{byeditor+others}%
+ \newunit%
+ \iffieldundef{maintitle}%
+ {\printfield{volume}%
+ \printfield{part}}%
+ {}%
+ \newunit%
+ \printfield{volumes}%
+ \newunit%
+ \printfield{edition}%
+ \setunit*{\newunitpunct}%
+ \printfield{note}%
+ \setunit*{\newunitpunct}%
+ \usebibmacro{location+year}%
+ \setunit*{\addspace}%
+ \usebibmacro{series+number}%
+ \setunit{\newunitpunct}%
\newunit%
\usebibmacro{chapter+pages}%
% \newunit%
@@ -558,7 +607,7 @@
\newunit%
\printfield{addendum}%
\usebibmacro{finentry}%
- \usebibmacro{annotation}%
+ \usebibmacro{annotation}%
}
\DeclareBibliographyDriver{booklet}{%
@@ -639,7 +688,7 @@
}{%
\printfield[shorttitle]{shorttitle}
}
- }%
+ }%
}
{%
\usebibmacro{bybookauthor}%
@@ -689,7 +738,7 @@
}{%
\printfield[shorttitle]{shorttitle}
}
- }%
+ }%
}
{%
\iffieldundef{editor}{}{%
@@ -744,7 +793,7 @@
}{%
\printfield[shorttitle]{shorttitle}
}
- }%
+ }%
}
{%
\iffieldundef{editor}{}{%
@@ -1042,7 +1091,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Et maintenant les bibliography drivers pour les premières citations
-% pleines, mais dans lesquelles on veut un ordre différent pour les
+% pleines, mais dans lesquelles on veut un ordre différent pour les
% auteurs
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1050,7 +1099,7 @@
\DeclareBibliographyDriver{cite:article}{%%
\usebibmacro{bibindex}%
\usebibmacro{author-fullnote/editor}%
- %\printnames[family-given][1-10]{author}
+ %\printnames[family-given][1-10]{author}
\setunit{\labelnamepunct}%
\usebibmacro{title}%
\newunit%
@@ -1107,6 +1156,40 @@
\printfield{addendum}%
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{cite:oldprint}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author-fullnote/editor}%
+ \setunit{\labelnamepunct}%
+ \usebibmacro{maintitle+title}%
+ \newunit%
+ \usebibmacro{byauthor}%
+ \newunit%
+ \usebibmacro{byeditor+others}%
+ \newunit%
+ \iffieldundef{maintitle}%
+ {\printfield{volume}%
+ \printfield{part}}%
+ {}%
+ \newunit%
+ \printfield{volumes}%
+ \newunit%
+ \printfield{edition}%
+ \newunit%
+ \printfield{note}%
+ \newunit%
+ \usebibmacro{location+publisher+year}%
+ \setunit{\addspace}%
+ \usebibmacro{series+number}%
+ \newunit%
+ \usebibmacro{chapter+pages}%
+% \newunit%
+% \printfield{pagetotal}%
+ \newunit%
+ \usebibmacro{doi+eprint+url}%
+ \newunit%
+ \printfield{addendum}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{cite:booklet}{%
\usebibmacro{bibindex}%
\usebibmacro{author-fullnote/editor}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx
index 4bd759c362..0f3ffc5b05 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx
@@ -1,6 +1,6 @@
- %% biblatex-enc v.1.0 (17/06/2017)
- %% enc.cbx
- %% Copyright 2014 J.B. Camps (jbcamps@hotmail.com)
+ %% biblatex-enc v.1.1 (02/12/2024)
+ %% enc.bbx
+ %% Copyright 2011-2024 J.B. Camps (jbcamps@hotmail.com)
%
% This work may be distributed and/or modified under the conditions
% of the LaTeX Project Public License, either version 1.3 of this
@@ -14,7 +14,7 @@
%
% The Current Maintainer of this work is J.B. Camps (jbcamps <at> hotmail.com).
%
- % This work consists of the files enc.cbx and enc.BBX.
+ % This work consists of the files enc.cbx and enc.bbx.
\ProvidesFile{enc.cbx}[]
@@ -274,5 +274,17 @@
\usebibmacro{footcite}}
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+
+%NEW: trying to add smartcite, to handle autocite
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\smartcite}{\multicitedelim}
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \iffootnote
+ {\usebibmacro{footcite}}
+ {\usebibmacro{cite}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
\endinput
diff --git a/macros/latex/contrib/dashrulex/dashrulex.pdf b/macros/latex/contrib/dashrulex/dashrulex.pdf
index 3122447bde..01d4b185ad 100644
--- a/macros/latex/contrib/dashrulex/dashrulex.pdf
+++ b/macros/latex/contrib/dashrulex/dashrulex.pdf
Binary files differ
diff --git a/macros/latex/contrib/dashrulex/dashrulex.sty b/macros/latex/contrib/dashrulex/dashrulex.sty
index db7a7b8918..3ff842a405 100644
--- a/macros/latex/contrib/dashrulex/dashrulex.sty
+++ b/macros/latex/contrib/dashrulex/dashrulex.sty
@@ -9,7 +9,7 @@
% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2012/02/12]
\RequirePackage{xparse}
-\ProvidesExplPackage{dashrulex}{2024/10/22}{1.01d}
+\ProvidesExplPackage{dashrulex}{2024/12/02}{1.01e}
{Draw dashed rules}
\DeclareDocumentCommand{\hdashrule}{O{0pt}O{x}mmm}
{
@@ -28,9 +28,11 @@
}
}
}
+\ExplSyntaxOff
\NewDocumentCommand{\drx@parse@dash}
- {mm>{\SplitArgument{1}{|}}m}
+ {mm>{\SplitArgument{1}{:}}m}
{\drx@parse@dash@inner{#1}{#2}#3}
+\ExplSyntaxOn
\cs_set_protected:Npn \drx@parse@dash@inner #1#2#3#4
{
\IfNoValueTF{#4}
diff --git a/macros/latex/contrib/dashrulex/dashrulex.tex b/macros/latex/contrib/dashrulex/dashrulex.tex
index 01579bbc91..607307fe50 100644
--- a/macros/latex/contrib/dashrulex/dashrulex.tex
+++ b/macros/latex/contrib/dashrulex/dashrulex.tex
@@ -7,8 +7,8 @@
{
package = dashrulex,
title = dashrulex,
- version = v1.01d,
- date = 2024/10/22,
+ version = v1.01e,
+ date = 2024/12/02,
authors = Qu Yi,
title = \dashrulex{} package,
info = Draw dashed rules,
@@ -54,7 +54,7 @@ Sometimes it is necessary to draw dashed rules when writing documents, such as g
\section{User commands}
\begin{commands}
\command{hdashrule}[\oarg{raise}\oarg{leader}\marg{width}\marg{thickness list}\marg{dash rules}]
- The command to draw horizontal dashed rules, based on the \cs{rule} command, and the same as the \cs{rule} command when the \meta{dash rules} are empty. \meta{raise} is the vertical offset of the rule. \meta{leader} is the alignment of the dashed line fill, which can be empty, \code{c}, or \code{x} (the \textcolor{red}{default}), corresponding to the \cs{leaders}, \cs{cleaders}, and \cs{xleaders} commands, respectively. \meta{width} is the length of the dashed line, which can be set to \cs{fill} when used to fill the remaining part of the current text line. \meta{thickness list} is a rule for the height of \textcolor{red}{vertical} lines, separated by \textcolor{red}{commas} and written as \fbox{\splitmeta{height 1}{height a}\code{,...}}, where \meta{height 1} denotes the height of a solid line and \meta{height a} denotes the height of a blank space. \meta{dash rules} stands for \textcolor{red}{horizontal} dashed line rules, which expressed as \fbox{\splitmeta[\code{|}]{length 1}{length a}\code{,}\splitmeta[\code{|}]{length 2}{length b}\code{,...}}, where \meta{length 1} represents the length of the solid line and \meta{length a} represents the length of the blank space, such as \fbox{\code{5pt|2pt,3pt}}, if the blank space is empty, then it is equal to the solid line length.
+ The command to draw horizontal dashed rules, based on the \cs{rule} command, and the same as the \cs{rule} command when the \meta{dash rules} are empty. \meta{raise} is the vertical offset of the rule. \meta{leader} is the alignment of the dashed line fill, which can be empty, \code{c}, or \code{x} (the \textcolor{red}{default}), corresponding to the \cs{leaders}, \cs{cleaders}, and \cs{xleaders} commands, respectively. \meta{width} is the length of the dashed line, which can be set to \cs{fill} when used to fill the remaining part of the current text line. \meta{thickness list} is a rule for the height of \textcolor{red}{vertical} lines, separated by \textcolor{red}{commas} and written as \fbox{\splitmeta{height 1}{height a}\code{,...}}, where \meta{height 1} denotes the height of a solid line and \meta{height a} denotes the height of a blank space. \meta{dash rules} stands for \textcolor{red}{horizontal} dashed line rules, which expressed as \fbox{\splitmeta[\code{:}]{length 1}{length a}\code{,}\splitmeta[\code{:}]{length 2}{length b}\code{,...}}, where \meta{length 1} represents the length of the solid line and \meta{length a} represents the length of the blank space, such as \fbox{\code{5pt:2pt,3pt}}, if the blank space is empty, then it is equal to the solid line length.
\begin{demohigh}
1X\rule{2cm}{1pt}x \\
2X\hdashrule{2cm}{1pt}{}x \\
@@ -64,9 +64,9 @@ Sometimes it is necessary to draw dashed rules when writing documents, such as g
6X\hdashrule[0.5ex]{4cm}{1pt}{3mm}x \\
7X\hdashrule[0.5ex]{4cm}{1mm}{3mm}x \\
8X\hdashrule[0.5ex]{4cm-3mm}{1mm}{3mm}\vrulemod[0.5ex]{3mm}{1mm}x \\
-9X\hdashrule[0.5ex]{4cm}{1mm}{3mm|3pt}x \\
-10X\hdashrule[0.5ex]{4cm}{1mm}{3mm|3pt,1mm|2pt}x \\
-11X\hdashrule[0.5ex]{4cm}{2pt,1pt,1pt}{3mm|3pt,1mm|2pt}x
+9X\hdashrule[0.5ex]{4cm}{1mm}{3mm:3pt}x \\
+10X\hdashrule[0.5ex]{4cm}{1mm}{3mm:3pt,1mm:2pt}x \\
+11X\hdashrule[0.5ex]{4cm}{2pt,1pt,1pt}{3mm:3pt,1mm:2pt}x
\end{demohigh}
\command{vrulemod}[\oarg{raise}\oarg{height}\oarg{depth}\marg{width}\marg{thickness list}]
The vertical model used to fill the dashed line. \meta{thickness list} is consistent with the \cs{hdashrule} command, \meta{width} represents the length of the component, and the three optional parameters are consistent with those of the \cs{raisebox} command.