summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-12-02 20:59:02 +0000
committerKarl Berry <karl@freefriends.org>2024-12-02 20:59:02 +0000
commitb8efb48681a39135ef13dc17c5be3950d7d61fef (patch)
treec6f7b70ae7f3c47693874d850e45d915eefef848 /Master/texmf-dist/tex
parent1664fb836213172514d37adf6f04beede9047cd9 (diff)
biblatex-enc (2dec24)
git-svn-id: svn://tug.org/texlive/trunk@73019 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-enc/enc.bbx191
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-enc/enc.cbx20
2 files changed, 153 insertions, 58 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-enc/enc.bbx b/Master/texmf-dist/tex/latex/biblatex-enc/enc.bbx
index 4dada49c3cd..95c46d1ada4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-enc/enc.bbx
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/biblatex-enc/enc.cbx b/Master/texmf-dist/tex/latex/biblatex-enc/enc.cbx
index 4bd759c362d..0f3ffc5b05e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-enc/enc.cbx
+++ b/Master/texmf-dist/tex/latex/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