biblatex-publist (14mar14)

git-svn-id: svn://tug.org/texlive/trunk@33176 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 95 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/README b/Master/texmf-dist/doc/latex/biblatex-publist/README
index 7c92f87e3d4..969ab5d5d71 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/README
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/README
@@ -42,6 +42,11 @@ instructions.
 
 == CHANGES ==
 
+* V. 0.9 (2014-03-13):
+	- Fix problem with multi-token names.
+	- Support name prefix in \omitname.
+	- Support for pubstate.
+
 * V. 0.8 (2013-08-16):
 	- Add custom sorting schemes "ddnt", "ydmdnt" and "dnt".
 	- Revise the documentation.
diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf
index 8446de0bd25..4353280a56d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex
index c268b298766..2159d706d7a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex
@@ -53,7 +53,7 @@
 \thanks{\protect\href{mailto:juergen@spitzmueller.org}{juergen (at) spitzmueller (dot) org}.}%
 }
 
-\date{Version 0.8, 16/08/2013}
+\date{Version 0.9, 13/03/2014}
 \maketitle
 
 \begin{abstract}
@@ -62,8 +62,8 @@
 publications. The style file draws on \bibltx's \emph{authoryear} style, but
 provides some extra features needed for publication lists, such as the omission
 of the own name from author or editor data. The package requires at least version
-2.0 of the \bibltx\ package.\footnote{For \bibltx, see
-\url{http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex}.}
+2.0 of the \bibltx\ package\footnote{For \bibltx, see
+\url{http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex}.} and \texttt{biber}.
 \end{abstract}
 
 \section{Aim of the package}
@@ -98,7 +98,7 @@ The standard way of using the package is to load the style file via
 \begin{quote}
 \begin{lstlisting}[language={[LaTeX]TeX},moretexcs={[1]{omitname}}]
 \usepackage[bibstyle=publist]{biblatex}
-\omitname[first name]{surname}
+\omitname[first name][von-part]{surname}
 \end{lstlisting}
 \end{quote}
 The \jcsmacro*{omitname} macro (at least with the mandatory
@@ -126,7 +126,8 @@ options provided by the \bibltx\ package itself%
 \footnote{Please refer to the \bibltx\ manual \cite{bibltx} for those.}):
 \begin{description}
 \item [{\joption{omitname}=<surname>}]
-\item [{\joption{omitfirstname=<first name>}}] ~
+\item [{\joption{omitfirstname=<first name>}}]
+\item [{\joption{omitnameprefix=<von-part>}}] ~
 
 This is an alternative to the \jcsmacro{omitname} macro
 described in sec.~\ref{sec:standard-usage}. However, due to the
@@ -136,12 +137,13 @@ if your name does not consist of non-ASCII characters. Hence, the
 
 \item [{\joption{boldyear{[}=true|false{]}}}] default: \emph{true}.
 
-By default, the year is printed in bold face. To prevent this, pass the
+By default, the year (or pubstate, if no year is given) is printed in bold face.
+To prevent this, pass the
 option \joption{boldyear=false} to \bibltx.
 
 \item [{\joption{marginyear{[}=true|false{]}}}] default: \emph{false}.
 
-With this option set to \joption{true}, the publication year will
+With this option set to \joption{true}, the publication year (or pubstate) will
 be printed in the margin once a new year starts. The option also has
 the effect that all marginpars are printed ``reversed'', i.\,e.
 on the left side in one-sided documents (via \jfcsmacro{reversemarginpar}).
@@ -345,6 +347,14 @@ That is, to sort your talks in descending order by full date in your CV, use:
 
 \section{Revision Log}
 \begin{description}
+\item [{V.~0.9~(2014-03-13):}]~
+
+\begin{itemize}
+\item Fix problem with multi-token names.
+\item Support name prefix in \jcsmacro{omitname}.
+\item Support pubstate.
+\end{itemize}
+
 \item [{V.~0.8~(2013-08-16):}]~
 
 \begin{itemize}
@@ -398,9 +408,9 @@ Gregorio.%
 
 Thanks go to Enrico Gregorio (egreg on \emph{tex.stackexchange.com})
 for helping me with correct name parsing (actually, the code the package
-uses is completely his), Marko BudiĻi\'{c} and Yannick Kalff for testing
-and bug reports, Nicolas Markey for \emph{publist.bst} and of course
-Philipp Lehman (not only) for \bibltx.
+uses is completely his), Marko BudiĻi\'{c}, Clea F. Rees and Yannick Kalff
+for testing and bug reports, Nicolas Markey for \emph{publist.bst} and of
+course Philipp Lehman (not only) for \bibltx.
 
 \begin{thebibliography}{1}
 \bibitem{bibltx}Lehman, Philipp (with Audrey Boruvka, Philip Kime
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
index a965ffe197e..56751334857 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{0.8}
-\def\bpl@rdate{2013/08/16}
+\def\bpl@version{0.9}
+\def\bpl@rdate{2014/03/13}
 
 \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space
                            biblatex bibliography style (JSP)]
@@ -60,11 +60,24 @@
 % The omitted name of the publication list author
 \def\bpl@osurname{}
 \def\bpl@ofirstname{}
+\def\bpl@ovonpart{}
 %
 % Manual way to specify omitted name
-\providecommand\omitname[2][]{%
-  \def\bpl@osurname{#2}
+\def\omitname{%
+   \@ifnextchar[%
+     {\omitname@i}
+     {\omitname@i[]}%
+}
+\def\omitname@i[#1]{%
+   \@ifnextchar[%
+     {\omitname@ii{#1}}
+     {\omitname@ii{#1}[]}%
+}
+\def\omitname@ii#1[#2]#3{%
+  % Do stuff
+  \def\bpl@osurname{#3}
   \ifx\@empty#1\else\def\bpl@ofirstname{#1}\fi
+  \ifx\@empty#2\else\def\bpl@ovonpart{#2}\fi
 }
 
 %
@@ -82,6 +95,8 @@
 
 \DeclareBibliographyOption{omitfirstname}{\def\bpl@ofirstname{#1}}
 
+\DeclareBibliographyOption{omitnameprefix}{\def\bpl@ovonpart{#1}}
+
 \newif\if@marginyear\@marginyearfalse
 \DeclareBibliographyOption{marginyear}[true]{%
     \ifstrequal{#1}{true}{\@marginyeartrue\reversemarginpar}{\@marginyearfalse}
@@ -160,10 +175,13 @@
 
 %
 % Helper function:
-% Removing braces from names, courtesy of egreg at
-% http://tex.stackexchange.com/a/79583/19291
+% Removing braces from names (courtesy of egreg at
+% http://tex.stackexchange.com/a/79583/19291)
+% and normalize spaces
 \def\bpl@normalize#1#2{%
   \begingroup
+  \def\bibnamedelima{ }%
+  \def\bibnamedelimb{ }%
   \def\IeC##1{##1}%
   \protected@edef\@tempa{#1}%
   \gdef\@gtempa{}%
@@ -188,24 +206,32 @@
 \DeclareIndexNameFormat{authorfiltered}{%
    \bpl@normalize{#1}{\bpl@tsurname}%
    \bpl@normalize{#3}{\bpl@tfirstname}%
+   \bpl@normalize{#5}{\bpl@tvonpart}%
    \bpl@normalize{\bpl@osurname}{\bpl@esurname}%
    \bpl@normalize{\bpl@ofirstname}{\bpl@efirstname}%
+   \bpl@normalize{\bpl@ovonpart}{\bpl@evonpart}%
    \ifboolexpr{
       test { \ifdefstrequal{\bpl@esurname}{\bpl@tsurname} }
       and
-      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) }
+      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) 
+      and
+      ( test { \ifdefstrequal{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) }
     {\addtocategory{filtered}{\thefield{entrykey}}}
     {}}
 
 \DeclareIndexNameFormat{editorfiltered}{%
    \edef\bpl@tsurname{#1}%
    \edef\bpl@tfirstname{#3}%
+   \edef\bpl@tvonpart{#5}%
    \bpl@normalize{\bpl@osurname}{\bpl@esurname}%
    \bpl@normalize{\bpl@ofirstname}{\bpl@efirstname}%
+   \bpl@normalize{\bpl@ovonpart}{\bpl@evonpart}%
    \ifboolexpr{
       test { \ifdefstrequal{\bpl@esurname}{\bpl@tsurname} }
       and
-      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) }
+      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) 
+      and
+      ( test { \ifdefstrequal{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) }
     {\addtocategory{filtered}{\thefield{entrykey}}}
     {}}
 
@@ -230,12 +256,16 @@
    % Exclude omitted author
    \bpl@normalize{#1}{\bpl@tsurname}%
    \bpl@normalize{#3}{\bpl@tfirstname}%
+   \bpl@normalize{#5}{\bpl@tvonpart}%
    \bpl@normalize{\bpl@osurname}{\bpl@esurname}%
    \bpl@normalize{\bpl@ofirstname}{\bpl@efirstname}%
+   \bpl@normalize{\bpl@ovonpart}{\bpl@evonpart}%
    \ifboolexpr{
       test { \ifdefstrequal{\bpl@esurname}{\bpl@tsurname} }
       and
-      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) }
+      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) 
+      and
+      ( test { \ifdefstrequal{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) }
           {\toggletrue{myselfprec}\toggletrue{hadmyself}%
            \ifthenelse{\value{listcount}=1\AND\value{liststop}=1}
                    {\stepcounter{liststop}}{}}
@@ -274,7 +304,9 @@
    \ifboolexpr{
       test { \ifdefstrequal{\bpl@esurname}{\bpl@tsurname} }
       and
-      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) }
+      ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) 
+      and
+      ( test { \ifdefstrequal{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) }
           {\toggletrue{myselfprec}\toggletrue{hadmyself}%
            \ifthenelse{\value{listcount}=1\AND\value{liststop}=1}
                    {\stepcounter{liststop}}{}}
@@ -360,32 +392,47 @@
      \clearname{editor}}
     {}}
 
-\newbibmacro*{date:labelyear+extrayear}{%
-   \mkbibbold{\printtext{%
-      \iffieldundef{month}{%
+\newbibmacro*{date:makedate}{%
+  \printtext{%
+     \iffieldundef{year}{%
+       \iffieldundef{pubstate}{}{%
+          \printfield{pubstate}%
+        }%
+      }{%
+       \iffieldundef{month}{%
          \printdateextra}%
         {\printdate}%
       }%
-    }%
+     }%
+}
+
+\newbibmacro*{date:labelyear+extrayear}{%
+   \mkbibbold{\usebibmacro{date:makedate}}%
 }
 
 \AtBeginDocument{%
 \if@unboldyear
 \renewbibmacro*{date:labelyear+extrayear}{%
-    \printtext{%
-      \iffieldundef{month}{%
-         \printdateextra}%
-        {\printdate}%
-    }%
+   \usebibmacro{date:makedate}%
 }
 \fi
 }
     
 \newbibmacro*{year+labelyear}{%
-  \iffieldundef{year}
-    {\let\bbx@lasthash\undefined}
-    {\usebibmacro{date:labelyear+extrayear}%
-     \if@marginyear
+  \iffieldundef{year}{%
+    \iffieldundef{pubstate}{\let\bbx@lasthash\undefined}{%
+     \usebibmacro{date:labelyear+extrayear}%
+     \if@marginyear%
+     \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{\printfield{labelyear}}}}%
      }%