summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-10-06 20:20:02 +0000
committerKarl Berry <karl@freefriends.org>2017-10-06 20:20:02 +0000
commit64b30a9aceeb10a1ba5cb3d1cc5c7b74ecd36fbb (patch)
tree46829c71dc73aecba8836b8d14e620a924a405d6
parent37bdb67a3843248bbcf3c2fdf73a9b6f46107f85 (diff)
biblatex-philosophy (6oct17)
git-svn-id: svn://tug.org/texlive/trunk@45486 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdfbin873624 -> 874660 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zipbin9937 -> 9936 bytes
-rw-r--r--Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx29
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx5
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx2
14 files changed, 42 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
index fcf63c868eb..d7c9ec69f61 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
index 46c3761c908..e275adfaaa5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
Binary files differ
diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
index fb751761a1f..98eb66090db 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
@@ -101,7 +101,7 @@ This work has the LPPL maintenance status "author-maintained".
%<spanish-lbx>\ProvidesFile{spanish-philosophy.lbx}
%<french-lbx>\ProvidesFile{french-philosophy.lbx}
%<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx|french-lbx>
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
%</standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx|french-lbx>
%<*driver>
\documentclass[10pt]{ltxdoc}
@@ -272,7 +272,7 @@ hidelinks,
%</driver>
% \fi
%
-% \CheckSum{4310}
+% \CheckSum{4321}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -290,7 +290,8 @@ hidelinks,
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \changes{v1.9.6}{2017/09/14}{Maintenance release. Fixed a bug in \cmd{fullcite} command.}
+% \changes{v1.9.7}{2017/10/05}{Maintenance release. Fixed a bug in the \bibtype{set} bibliography driver.}
+% \changes{v1.9.6}{2017/09/14}{Maintenance release. Fixed a bug in the \cmd{fullcite} command.}
% \changes{v1.9.5}{2017/04/13}{Styles completely revised. Provided support for the \opt{mergedate} default option. \opt{latinemph} option defined globally. New values for \opt{scauthors} option. Support for the \bibtype{set} entries for \sty{modern} style. \opt{classical} option removed for Spanish. Provided experimental French localization module. Improved \opt{annotation} option. Updated documentation.}
% \changes{v1.9.4}{2017/03/21}{Maintenance release. Fixed some bugs in modern style.}
% \changes{v1.9.3}{2017/03/17}{Maintenance release. Reset \file{philosophy-verbose.cbx} to version 1.9. Moved \texttt{labelname} format from \file{philosophy-standard.bbx} to \file{philosophy-classic.cbx}.}
@@ -3012,15 +3013,13 @@ hidelinks,
\usebibmacro{pageref}%
\usebibmacro{finentry}}
% \end{macrocode}
-% In the \bibtype{set} entry type we restore the \sty{classic} style
-% from the second entry onward, using the |entrysetcount| counter. The \bibfield{annotation}
-% field is cleared before the first entry is processed and restored at the end of the set.
+% The \bibfield{annotation} field of the \bibtype{set} entry type
+% is cleared before the first entry is processed and restored at the end of the set.
% \begin{macrocode}
\DeclareBibliographyDriver{set}{%
\savefield{annotation}{\@phil@nnote}%
\clearfield{annotation}%
- \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
- {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
+ \entryset{}{}%
\newunit\newblock
\restorefield{annotation}{\@phil@nnote}%
\usebibmacro{pageref}%
@@ -4263,6 +4262,20 @@ hidelinks,
{}%
{}%
% \end{macrocode}
+% In the \bibtype{set} entry type we restore the \sty{classic} style
+% from the second entry onward, using the |entrysetcount| counter. The \bibfield{annotation}
+% field is cleared before the first entry is processed and restored at the end of the set.
+% \begin{macrocode}
+\DeclareBibliographyDriver{set}{%
+ \savefield{annotation}{\@phil@nnote}%
+ \clearfield{annotation}%
+ \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
+ {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
+ \newunit\newblock
+ \restorefield{annotation}{\@phil@nnote}%
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
+% \end{macrocode}
% \iffalse
%</modern-bbx>
% \fi
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
index 9c8be1093f1..c44ffff3382 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{english-philosophy.lbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\InheritBibliographyExtras{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
index 6c105632cda..d98bc35436b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{french-philosophy.lbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\InheritBibliographyExtras{french}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
index f9d499b8a51..1d911bb162e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{italian-philosophy.lbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\InheritBibliographyExtras{italian}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
index 8c03c904b71..b554f41a52a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-classic.bbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireBibliographyStyle{authoryear}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
index 369b699de1f..2446181a27b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-classic.cbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireCitationStyle{authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
index 4e16639e662..b765dde624c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.bbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireBibliographyStyle{philosophy-classic}
@@ -209,6 +209,15 @@
\printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
{}%
{}%
+\DeclareBibliographyDriver{set}{%
+ \savefield{annotation}{\@phil@nnote}%
+ \clearfield{annotation}%
+ \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
+ {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
+ \newunit\newblock
+ \restorefield{annotation}{\@phil@nnote}%
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
%%
%% Copyright 2009-2017 by Ivan Valbusa
%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
index e0c6152c165..1c06039e21d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.cbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireCitationStyle{philosophy-classic}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
index 5339a78c723..92ed63e80c4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-standard.bbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireBiber[3]
@@ -1534,8 +1534,7 @@
\DeclareBibliographyDriver{set}{%
\savefield{annotation}{\@phil@nnote}%
\clearfield{annotation}%
- \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
- {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
+ \entryset{}{}%
\newunit\newblock
\restorefield{annotation}{\@phil@nnote}%
\usebibmacro{pageref}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
index 32a9f858787..c0508a9259c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.bbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireBibliographyStyle{authortitle}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
index 04a56917012..96ee6845374 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.cbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\RequireCitationStyle{verbose-trad2}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
index 4d0778b38b0..087e2eb94e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{spanish-philosophy.lbx}
-[2017/09/14 v1.9.6 A set of styles for biblatex]
+[2017/10/05 v1.9.7 A set of styles for biblatex]
\InheritBibliographyExtras{spanish}