summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-publist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-12 21:08:34 +0000
committerKarl Berry <karl@freefriends.org>2017-04-12 21:08:34 +0000
commit27cdd6bfa8154741f66deea535349eedbc455a28 (patch)
tree36e5aa84b12912e18f18558af40ac992c0d722ee /Master/texmf-dist/tex/latex/biblatex-publist
parentd5e41f82da1e192ec3c1853e2b7bf780d43660ed (diff)
biblatex-publist (12apr17)
git-svn-id: svn://tug.org/texlive/trunk@43765 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-publist')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx4
2 files changed, 36 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
index 6e2ea492ece..01949e6cc79 100644
--- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
@@ -25,8 +25,8 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\bpl@version{1.6}
-\def\bpl@rdate{2017/04/02}
+\def\bpl@version{1.7}
+\def\bpl@rdate{2017/04/12}
\ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space
biblatex bibliography style (JSP)]
@@ -518,7 +518,8 @@
\if@hlauthor
\ifnameundef{author}
{}
- {\printnames{author}%
+ {\usebibmacro{marginyear}%
+ \printnames{author}%
\setunit{\addspace}%
\iffieldundef{nameaddon}
{}
@@ -528,7 +529,8 @@
\else% \if@hlauthor false
\ifnameundef{author}
{}
- {\usebibmacro{year+labelyear}\addspace%
+ {\usebibmacro{marginyear}%
+ \usebibmacro{year+labelyear}\addspace%
\printnames{author}%
\setunit{\addspace}%
\iffieldundef{nameaddon}
@@ -542,7 +544,8 @@
\if@hlauthor
\ifnameundef{editor}
{}
- {\printnames{editor}%
+ {\usebibmacro{marginyear}%
+ \printnames{editor}%
\setunit{\addspace}%
\usebibmacro{editorstrg}}
\adddot\addspace%
@@ -550,7 +553,8 @@
\else% \if@hlauthor false
\ifnameundef{editor}
{}
- {\usebibmacro{year+labelyear}%
+ {\usebibmacro{marginyear}%
+ \usebibmacro{year+labelyear}%
\addspace%
\printnames{editor}%
\setunit{\addspace}%
@@ -565,7 +569,8 @@
and
not test {\ifnameundef{editor}}
}
- {\printnames{editor}%
+ {\usebibmacro{marginyear}%
+ \printnames{editor}%
\setunit{\addcomma\space}%
\usebibmacro{editor+othersstrg}%
\adddot\addspace%
@@ -578,7 +583,8 @@
and
not test {\ifnameundef{editor}}
}
- {\usebibmacro{year+labelyear}%
+ {\usebibmacro{marginyear}%
+ \usebibmacro{year+labelyear}%
\addspace%
\printnames{editor}%
\setunit{\addcomma\space}%
@@ -620,29 +626,36 @@
}
\fi
}
-
-\newbibmacro*{year+labelyear}{%
+
+\newbibmacro*{marginyear}{%
+\if@marginyear%
\iffieldundef{year}{%
- \iffieldundef{pubstate}{\let\bbx@lasthash\undefined}{%
- \usebibmacro{date:labelyear+extrayear}%
- \if@marginyear%
+ \iffieldundef{pubstate}{}{%
\iffieldequals{pubstate}{\bbx@lasthash}{}{%
\printtext{\marginpar{\small\plmarginyear{\bibsentence\printfield{pubstate}}}}%
}%
- \fi
- \savefield{pubstate}{\bbx@lasthash}%
- \clearfield{pubstate}%
- }
+ }%
}{%
- \usebibmacro{date:labelyear+extrayear}%
- \if@marginyear%
\iffieldequals{labelyear}{\bbx@lasthash}{}{%
\printtext{\marginpar{\small\plmarginyear{\bibsentence\printfield{labelyear}}}}%
}%
- \fi
+ }%
+\fi
+}
+
+\newbibmacro*{year+labelyear}{%
+ \iffieldundef{year}{%
+ \iffieldundef{pubstate}{\let\bbx@lasthash\undefined}{%
+ \usebibmacro{date:labelyear+extrayear}%
+ \savefield{pubstate}{\bbx@lasthash}%
+ \clearfield{pubstate}%
+ }%
+ }{%
+ \usebibmacro{date:labelyear+extrayear}%
\savefield{labelyear}{\bbx@lasthash}%
\clearfield{year}%
- }}
+ }%
+}
\newbibmacro*{rauthor/label}{%
\ifnameundef{author}
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
index 39aedfe8445..c2075f4ba59 100644
--- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
@@ -26,8 +26,8 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\bpl@version{1.6}
-\def\bpl@rdate{2017/04/02}
+\def\bpl@version{1.7}
+\def\bpl@rdate{2017/04/12}
\ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space
biblatex citation style (JSP)]