From b22aad90dc8e64704563e9f4582aa48ba0089430 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 10 Apr 2017 22:02:23 +0000 Subject: biblatex-publist git-svn-id: svn://tug.org/texlive/trunk@43740 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-publist/README | 5 + .../latex/biblatex-publist/biblatex-publist.pdf | Bin 300081 -> 300472 bytes .../latex/biblatex-publist/biblatex-publist.tex | 53 ++++++---- .../tex/latex/biblatex-publist/publist.bbx | 111 +++++++++++++++------ .../tex/latex/biblatex-publist/publist.cbx | 4 +- 5 files changed, 118 insertions(+), 55 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/README b/Master/texmf-dist/doc/latex/biblatex-publist/README index 038de43e44e..11327904270 100644 --- a/Master/texmf-dist/doc/latex/biblatex-publist/README +++ b/Master/texmf-dist/doc/latex/biblatex-publist/README @@ -45,6 +45,11 @@ instructions. == CHANGES == +* V. 1.6 (2017-04-02): + - New option 'nameorder' that allows to change the ordering of author and editor + name ("given-family" vs. "family-given" [= default]). + - Use proper name delimiters also for bookauthor. + * V. 1.5 (2017-02-28): - Fix extra "and" in name list with plauthorhandling=highlight. - Whitespace fix with plauthorhandling=highlight. 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 d34198ef882..9311eceae37 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf and b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf differ 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 95aa2dddc49..52a40a0abc2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex +++ b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex @@ -79,7 +79,7 @@ \thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}% } -\date{Version 1.5, 2017/02/28} +\date{Version 1.6, 2017/04/02} \maketitle \begin{abstract} @@ -149,12 +149,12 @@ in gardening? In: \emph{Gardening Practice} 24, pp.~10--15. If \joption{plauthorhandling=highlight} is used (see next section), the plauthor will be printed in bold face instead, as in: \begin{quote} - John Doe, \textbf{Me Myself} and Mary Hall \textbf{1987}. Are there new trends + Doe, John, \textbf{Myself, Me} and Hall, Mary, \textbf{1987}. Are there new trends in gardening? In: \emph{Gardening Practice} 24, pp.~10--15. \end{quote} -\subsection{Additional options} +\subsection{Additional options}\label{sec:addopts} Currently, the following additional options are provided (next to the options provided by the \bibltx\ package itself% @@ -177,6 +177,11 @@ By default, the publist author (as defined with \jmacro{plauthor}) is omitted fr the author or editor list. If you use the option \joption{plauthorhandling=highlight}, it is highlighted instead (i.\,e., set in bold face by default; see sec.~\ref{sec:auxmacros} how to change that). +\item [{\joption{nameorder{[}=family-given|given-family{]}}}] default: \emph{family-given}. + +By default, the author and editor names with \joption{plauthorhandling=highlight} are output in the order ``Lastname, Given Names''. +To change the order to ``Given Names Lastname'', pass the option \joption{nameorder=given-family} to \bibltx. + \item [{\joption{boldyear{[}=true|false{]}}}] default: \emph{true}. By default, the year (or pubstate, if no year is given) is printed in bold face. @@ -239,6 +244,11 @@ where is the name of the biblatex bibliography style (\emph{bbx}) yo Note, though, that there is (and can be) no guarantee that \bpl\ will work with all styles, although it has been successfully tested with several. Be prepared to bump into \LaTeX\ errors and carefully check the output for correctness if you try a different base style. +Note, further, that the order of author's and editor's given and family names is hardcoded in +\bpl\ due to the complex omission\slash highlighting mechanism. This might +differ from what you expect with specific base styles. To change the order, +use the package option \joption{nameorder} (see sec.~\ref{sec:addopts}). + \section{Localization} @@ -299,7 +309,7 @@ Then a typical file would look like example~\ref{example} (p.~\pageref{example}) frame=single, label={example}, language={[LaTeX]TeX}, - moretexcs={[4]{plauthorname,addbibresource,printbibliography,maketitle}}] + moretexcs={[5]{plauthorname,addbibresource,printbibliography,maketitle,newrefsection}}] \documentclass{article} \usepackage[T1]{fontenc} \usepackage[latin9]{inputenc} @@ -321,22 +331,19 @@ Then a typical file would look like example~\ref{example} (p.~\pageref{example}) \maketitle \section{Monographs} -\begin{refsection}[mymonographs] +\newrefsection[mymonographs] \nocite{*} \printbibliography[heading=none] -\end{refsection} \section{Proceedings} -\begin{refsection}[myproceedings] +\newrefsection[myproceedings] \nocite{*} \printbibliography[heading=none] -\end{refsection} \section{Articles} -\begin{refsection}[myarticles] +\newrefsection[myarticles] \nocite{*} \printbibliography[heading=none] -\end{refsection} \end{document} \end{lstlisting} @@ -348,13 +355,12 @@ such as the following: \begin{lstlisting}[caption={Adding foreign reviews}, frame=single, language={[LaTeX]TeX}, - moretexcs={[3]{bibfont,subsubsection,printbibliography}}] + moretexcs={[4]{bibfont,subsubsection,printbibliography,newrefsection}}] \subsubsection*{Reviews of my thesis} -\begin{refsection}[mythesis-reviews] +\newrefsection[mythesis-reviews] \renewcommand\bibfont{\small} \nocite{*} \printbibliography[heading=none,env=reviews] -\end{refsection} \end{lstlisting} \end{quote} @@ -373,10 +379,8 @@ which has to be passed to \jfcsmacro{printbibliography}, as in: frame=single, language={[LaTeX]TeX}, moretexcs={[1]{printbibliography}}] -\begin{refsection}[mybibliography] \nocite{*} \printbibliography[heading=none,filter=mine] -\end{refsection} \end{lstlisting} \end{quote} @@ -424,12 +428,19 @@ That is, to sort your talks in descending order by full date in your CV, use: \section{Revision Log} \begin{description} -\item [{V.~1.5 (2017-02-28):}]~ - \begin{itemize} - \item Fix extra \emph{and} in name list with \joption{plauthorhandling=highlight}. - \item Whitespace fix with \joption{plauthorhandling=highlight}. - \item Use proper name delimiters. -\end{itemize} + \item [{V.~1.6 (2017-04-02):}]~ + \begin{itemize} + \item New option \joption{nameorder} that allows to change the ordering of author and editor + name (\joption{given-family} vs. \joption{family-given} [=~default]). + \item Use proper name delimiters also for bookauthor. + \end{itemize} + + \item [{V.~1.5 (2017-02-28):}]~ + \begin{itemize} + \item Fix extra \emph{and} in name list with \joption{plauthorhandling=highlight}. + \item Whitespace fix with \joption{plauthorhandling=highlight}. + \item Use proper name delimiters. + \end{itemize} \item [{V.~1.4 (2017-02-12):}]~ \begin{itemize} diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx index d4571010559..6e2ea492ece 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.5} -\def\bpl@rdate{2017/02/28} +\def\bpl@version{1.6} +\def\bpl@rdate{2017/04/02} \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space biblatex bibliography style (JSP)] @@ -79,6 +79,11 @@ \ifstrequal{#1}{highlight}{\@hlauthortrue}{\@hlauthorfalse} } +\newif\if@givenfirst\@givenfirstfalse +\DeclareBibliographyOption{nameorder}[family-given]{% + \ifstrequal{#1}{given-family}{\@givenfirsttrue}{\@givenfirstfalse} +} + % Check if users have defined different base styles % If not, use authoryear. \newif\ifbpl@standardbasestyle\bpl@standardbasestylefalse @@ -319,17 +324,33 @@ {\finalnamedelim}% }% \iftoggle{ismyself}{\plauthorhl{% - \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% - \namepartfamily% - \ifgiveninits - {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% - {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi }}{% - \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% - \namepartfamily% - \ifgiveninits - {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% - {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi }% \usebibmacro{name:andothers}% \else% \if@hlauthor false @@ -396,17 +417,33 @@ {\finalnamedelim}% }% \iftoggle{ismyself}{\plauthorhl{% - \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% - \namepartfamily% - \ifgiveninits - {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% - {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% - }}{% - \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% - \namepartfamily% - \ifgiveninits - {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% - {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi + }}{% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi }% \usebibmacro{name:andothers}% \else% \if@hlauthor false @@ -452,13 +489,23 @@ } \DeclareNameFormat{bookauthor}{% - \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% - \namepartfamily% - \ifgiveninits - {\ifdefvoid{\namepartgiveni}{}{\addcomma\space\namepartgiveni}}% - {\ifdefvoid{\namepartgiven}{}{\addcomma\space\namepartgiven}}% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi \ifthenelse{\value{listcount}<\value{liststop}} - {\addslash} + {\ifnumless{\value{listcount}}{\value{liststop}-1}% + {\multinamedelim}% + {\finalnamedelim}}% {}% \usebibmacro{name:andothers}} @@ -477,7 +524,7 @@ {} {\mkbibbrackets{\bibstring{alias}% \addspace\printfield{nameaddon}}}} - \addspace\usebibmacro{year+labelyear}% + \adddot\addspace\usebibmacro{year+labelyear}% \else% \if@hlauthor false \ifnameundef{author} {} @@ -498,7 +545,7 @@ {\printnames{editor}% \setunit{\addspace}% \usebibmacro{editorstrg}} - \addspace% + \adddot\addspace% \usebibmacro{year+labelyear}% \else% \if@hlauthor false \ifnameundef{editor} @@ -521,7 +568,7 @@ {\printnames{editor}% \setunit{\addcomma\space}% \usebibmacro{editor+othersstrg}% - \addspace% + \adddot\addspace% \usebibmacro{year+labelyear}% \clearname{editor}} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx index 01be6f83c81..39aedfe8445 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.5} -\def\bpl@rdate{2017/02/28} +\def\bpl@version{1.6} +\def\bpl@rdate{2017/04/02} \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space biblatex citation style (JSP)] -- cgit v1.2.3