biblatex-nejm

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

6 files changed, 124 insertions, 210 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-nejm/README b/Master/texmf-dist/doc/latex/biblatex-nejm/README
index a021a2c656f..1ff30d59c7d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-nejm/README
+++ b/Master/texmf-dist/doc/latex/biblatex-nejm/README
@@ -1,4 +1,4 @@
-%%$Id: nejm.bbx 9 2011-08-31 11:15:54Z marco $
+%%$Id: nejm.bbx 30 2018-07-28 11:01:00Z marco $
 
 README biblatex-nejm
 
@@ -6,12 +6,17 @@ This package provides only a formated numeric style of the package
 biblatex. The design based on the New England Journal of Medicine (NEJM).
 
 --------------------------------
-v.04
+version 0.5.0
+- compatibility with newer biblatex releases
+- bug fixes
+
+--------------------------------
+version 0.4.0
 - changed formating of date -- only year is printed
 - added option printlang
 
 --------------------------------
-v.03
+version 0.3.0
 - changed required cite style of biblatex to numeric-comp
 - changed required bibliography style of biblatex to standard
 - added option sorting=none as standard
@@ -20,9 +25,9 @@ v.03
 - execute option isbn=false
 
 --------------------------------
-v.02
+version 0.2.0
 - fixes bug
 
 --------------------------------
-v.01
+version 0.1.0
 - submitted style
diff --git a/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.pdf b/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.pdf
index bd926212980..a1438547b51 100644
--- a/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.tex b/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.tex
index d8b4ea09d08..898c5ae7f33 100644
--- a/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-nejm/biblatex-nejm.tex
@@ -2,7 +2,7 @@
 %%$Rev: 28 $
 %%$Author: marco $
 %%$Date: 2011-09-09 19:17:01 +0200 (Fr, 09. Sep 2011) $
-\def\biblatexnejmversiontex{v0.4}
+\def\biblatexnejmversiontex{v0.5}
 \def\biblatexnejmpackagenametex{biblatex-nejm.tex}
 \def\biblatexnejmsvntex$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
 
@@ -21,6 +21,8 @@
 \usepackage[style=nejm,backend=biber]{biblatex}
 \addbibresource{\jobname}
 
+\usepackage{hyperref}
+
 \newcommand*{\biber}{Biber\xspace}
 \newcommand*{\biblatex}{Biblatex\xspace}
 \newcommand*{\biblatexnejm}{biblatex-nejm\xspace}
@@ -31,7 +33,7 @@
   subtitle={Modification of \biblatex for New England Journal of Medicine (NEJM)},
   url={\biblatexctan},
   author={Marco Daniel},
-  email={marco.daniel@mada-nada.de},
+  email={},
   revision={\biblatexnejmversiontex},
   date={\biblatexnejmsvnbbx$Id: biblatex-nejm.tex 28 2011-09-09 17:17:01Z marco $}}
 
@@ -83,6 +85,11 @@
 \begin{document}
 
 \printtitlepage
+
+\vspace*{25px}
+
+Please submit all feedback, issues, and pull requests to the official repository: \url{https://github.com/marcodaniel/biblatex-nejm}
+
 \tableofcontents
 
 
@@ -91,6 +98,8 @@
 
 This package is a contributed \biblatex style. The idea base on a question at \href{http://tex.stackexchange.com/questions/26891/biblatex-style-file-for-new-england-journal-of-medicine-nejm/26894#26894}{Stack Exchange}. The package itself only redefine existing macros and use some of the \biblatex options. This package doesn't provide some new feature. If you want to use additional feature you can use the options and commands of the package \biblatex itself. 
 
+Please submit all feedback, issues, and pull requests to the official repository: \url{https://github.com/marcodaniel/biblatex-nejm}
+
 \subsection[About]{About \sty{biblatex}}
 \label{int:abt}
 
@@ -103,14 +112,12 @@ Copyright \textcopyright\ 2011 Marco Daniel. Permission is granted to copy, dist
 \subsection{Feedback}
 \label{int:feb}
 
-You can wrote me an \href{mailto:marco.daniel@mada-nada.de}{e-mail} or ask a question on \href{http://tex.stackexchange.com}{Stack Exchange}. 
-
-In both cases it is very important that you provide a \href{http://www.minimalbeispiel.de/mini-en.html}{minimal working example}.
+Please submit all feedback, issues, and pull requests to the official repository: \url{https://github.com/marcodaniel/biblatex-nejm}
 
 \section{Installation}
 \label{inst}
 
-The package is avaidable on \href{http://www.ctan.org}{CTAN}. It will be installed by you package manager (\href{http://www.tug.org/texlive}{TeX Live} or \href{http://www.miktex.org}{MikTeX}).
+The package is available on \href{http://www.ctan.org}{CTAN}. It will be installed by you package manager (\href{http://www.tug.org/texlive}{TeX Live} or \href{http://www.miktex.org}{MikTeX}).
 
 If you don't want to use the package manager you can install the files directly in the search path of your distribution or in you working folder.
 
@@ -184,7 +191,7 @@ Print the \bibfield{language}
 
 \end{optionlist}
 
-\subsection{Bibliopgraphy Entries}
+\subsection{Bibliography Entries}
 In relation to \secref{guidlines} the following code represented the examples in the \file{bib} file. The code will be automaticly used as the \file{bib} file.
 \begin{lstlisting}[style=bibtex]{}
 %% Examples for biblatex-nejm
@@ -241,29 +248,18 @@ In relation to \secref{guidlines} the following code represented the examples in
 In the following table I present the standard cite-command with their output. The list of avaidable cite-commands is much bigger. For more details see the documentation of \href{\biblatexctan}{\biblatex}
 
 \begin{table}[!ht]
-\tablesetup
-\renewcommand*\arraystretch{1.25}
-\begin{tabularx}{\textwidth}{@{}>{\ttfamily}p{80pt}*{3}{>{\qquad}c<{\qquad}}X@{}}
-\toprule
-\multicolumn{1}{@{}H}{\texttt{key}} &
-\multicolumn{1}{@{}H}{\texttt{\textbackslash cite}} &
-\multicolumn{1}{@{}H}{\texttt{\textbackslash parencite}}&
-\multicolumn{1}{@{}H}{\texttt{\textbackslash supercite}}&
-\multicolumn{1}{@{}H}{\texttt{\textbackslash textcite}}  \\
-\cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule(r){4-4}\cmidrule{5-5}
-Kuczmarski2000    & \cite{Kuczmarski2000}      & \parencite{Kuczmarski2000} 
-                  & \supercite{Kuczmarski2000} & \textcite{Kuczmarski2000}\\
-usposition2002    & \cite{usposition2002}      & \parencite{usposition2002}
-                  & \supercite{usposition2002} & \textcite{usposition2002}\\
-Goadsby2001       & \cite{Goadsby2001}         & \parencite{Goadsby2001}
-                  & \supercite{Goadsby2001}    & \textcite{Goadsby2001}\\
-Shapiro2000       & \cite{Shapiro2000}         & \parencite{Shapiro2000}
-                  & \supercite{Shapiro2000}    & \textcite{Shapiro2000}\\
-\bottomrule
-\end{tabularx}
-\caption{Output for diffenrent cite-commands}
+\begin{tabular}{lllll}
+\hline
+\texttt{key}  & \texttt{\textbackslash cite}  & \texttt{\textbackslash parencite}  & \texttt{\textbackslash supercite}  & \texttt{\textbackslash textcite}  \\ \hline
+Kuczmarski2000  & \cite{Kuczmarski2000}  & \parencite{Kuczmarski2000}  & \supercite{Kuczmarski2000}  & \textcite{Kuczmarski2000}  \\
+usposition2002 & \cite{usposition2002} & \parencite{usposition2002} & \supercite{usposition2002} & \textcite{usposition2002} \\
+Goadsby2001 & \cite{Goadsby2001} & \parencite{Goadsby2001} & \supercite{Goadsby2001} & \textcite{Goadsby2001} \\
+Shapiro2000 & \cite{Shapiro2000} & \parencite{Shapiro2000} & \supercite{Shapiro2000} & \textcite{Shapiro2000} \\ \hline
+\end{tabular}
+\caption{Output for different cite-commands}
 \label{use:cite}
 \end{table}
+
 \subsection{Result of the bibliography}
 
 \printbibliography
diff --git a/Master/texmf-dist/source/latex/biblatex-nejm/Makefile b/Master/texmf-dist/source/latex/biblatex-nejm/Makefile
new file mode 100644
index 00000000000..52136e14b29
--- /dev/null
+++ b/Master/texmf-dist/source/latex/biblatex-nejm/Makefile
@@ -0,0 +1,23 @@
+# Makefile for biblatex-nejm.tex
+# $Id: Makefile 22 2011-09-06 18:48:21Z marco $
+PACKAGE   = biblatex-nejm
+PDFLATEX  = pdflatex
+BACKEND   = biber
+
+all: pdf clean
+
+pdf: $(PACKAGE).tex
+	$(PDFLATEX) $(PACKAGE).tex
+	$(BACKEND)  $(PACKAGE)
+	$(PDFLATEX) $(PACKAGE).tex
+	$(PDFLATEX) $(PACKAGE).tex        
+clean:  
+	rm -f *.aux
+	rm -f *.bbl
+	rm -f *.bcf
+	rm -f *.blg
+	rm -f *.log
+	rm -f *.out
+	rm -f *.run.xml
+	rm -f *.toc
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.bbx b/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.bbx
index 00af201f37a..43630319e41 100644
--- a/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.bbx
@@ -1,144 +1,78 @@
-%% Copyright (C) 2011 by Marco Daniel 
-%% 
+%% Copyright (C) 2011, 2018 by Marco Daniel
+%%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
 %% 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
-%% 
+%%
 %% and version 1.3c or later is part of all distributions of LaTeX
 %% version 2008/05/04 or later.
-%% 
+%%
 %% This work has the LPPL maintenance status `maintained'.
-%% 
+%%
 %% The Current Maintainer of this work is Marco Daniel.
-%% 
+%%
 %% This work consists of the files nejm.bbx, nejm.cbx, biblatex-nejm.tex
 %% and biblatex-nejm.pdf
 
-%%$Id: nejm.bbx 28 2011-09-09 17:17:01Z marco $
-%%$Rev: 28 $
+%%$Id: nejm.bbx 30 2018-07-28 11:01:00Z marco $
+%%$Rev: 30 $
 %%$Author: marco $
-%%$Date: 2011-09-09 19:17:01 +0200 (Fr, 09. Sep 2011) $
-\def\biblatexnejmversionbbx{v0.4}
+%%$Date: 2018-07-28 13:01:00Z +0200 (Sa, 28. Jul 2018) $
+\def\biblatexnejmversionbbx{v0.5}
 \def\biblatexnejmpackagenamebbx{nejm.bbx}
 \def\biblatexnejmsvnbbx$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{nejm.bbx}[\biblatexnejmsvnbbx$Id: nejm.bbx 28 2011-09-09 17:17:01Z marco $ \biblatexnejmversionbbx: \biblatexnejmpackagenamebbx]
+\ProvidesFile{nejm.bbx}[\biblatexnejmsvnbbx$Id: nejm.bbx 30 2018-07-28 11:01:00Z marco $ \biblatexnejmversionbbx: \biblatexnejmpackagenamebbx]
 
 %use numeric.cbx as base
 %Warning if backend isn't biber
 \RequireBiber[2]
 %need style:
-\RequireBibliographyStyle{standard}
-
-%set options to biblatex
-\ExecuteBibliographyOptions
-  {
-    isbn         = false ,
-    labelnumber  = true ,
-    minnames     = 3 , 
-    maxnames     = 6 ,
-    firstinits   = true ,
-    terseinits   = true ,
-    sorting      = none ,
- %   language     = nejm ,
-  }
-
-
-%provide original option
-\providebool{bbx:subentry}
-\DeclareBibliographyOption{subentry}[true]{%
-  \setbool{bbx:subentry}{#1}}
+\RequireBibliographyStyle{numeric}
 
 \providetoggle{bbx:articledoi}
-\DeclareBibliographyOption{articledoi}[false]{%
+\DeclareBibliographyOption[boolean]{articledoi}[true]{%
   \settoggle{bbx:articledoi}{#1}}
 
 \providetoggle{bbx:articlein}
-\DeclareBibliographyOption{articlein}[false]{%
+\DeclareBibliographyOption[boolean]{articlein}[true]{%
   \settoggle{bbx:articlein}{#1}}
 
 \providetoggle{bbx:printlang}
-\DeclareBibliographyOption{printlang}[false]{%
+\DeclareBibliographyOption[boolean]{printlang}[true]{%
   \settoggle{bbx:printlang}{#1}}
 
+%set options to biblatex
+\ExecuteBibliographyOptions
+  {
+    isbn         = false ,
+    labelnumber  = true ,
+    minnames     = 3 ,
+    maxnames     = 6 ,
+    giveninits   = true ,
+    terseinits   = true ,
+    sorting      = none ,
+    date         = year ,
+    articledoi   = false,
+    articlein    = false,
+    printlang    = false,
+  }
 
-%specify language
-\DeclareListFormat{language}{%
-   \iftoggle{bbx:printlang}{%
-          \usebibmacro{list:delim}{%
-               \ifbibstring{#1}%
-                 {\bibxstring{#1}}%
-                 {\ifbibstring{lang#1}%
-                    {\bibxstring{lang#1}}%
-                    {#1}}}%
-             \ifbibstring{#1}%
-               {\bibstring{#1}}%
-               {\ifbibstring{lang#1}%
-                  {\bibstring{lang#1}}%
-                  {#1}}%
-          \usebibmacro{list:andothers}%
-   }{}%
-}
 
-%format date -- only year printed
-\@ifpackageloaded{babel}{%
- \edef\blx@tempa{\bbl@main@language}%
- }{%
- \edef\blx@tempa{\blx@languagename}%
-}
-\DefineBibliographyExtras{\blx@tempa}{%
-%<year><month><day>
-  \protected\def\mkbibdatelong#1#2#3{%
-    \stripzeros{\thefield{#1}}%
-    }%
-  \protected\def\mkbibdateshort#1#2#3{%
-    \mkdatezeros{\thefield{#1}}%
-   }%  
+\AtBeginDocument{%
+  \iftoggle{bbx:printlang}
+    {}
+    {\DeclareStyleSourcemap{
+       \maps[datatype=bibtex]{
+         \map{
+           \step[fieldset=language, null]
+         }
+       }
+     }}%
 }
 
-%Set environment
-\defbibenvironment{bibliography}
-  {\list
-     {\printtext[labelnumberwidth]{%
-	\printfield{prefixnumber}%
-	\printfield{labelnumber}}}
-     {\setlength{\labelwidth}{\labelnumberwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\bibitemsep}%
-      \setlength{\parsep}{\bibparsep}}%
-      \renewcommand*{\makelabel}[1]{\hss##1}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{shorthands}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\bibitemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{\hss##1}}}
-  {\endlist}
-  {\item}
-
-%%
-\DeclareBibliographyDriver{set}{%
-  \entryset
-    {\ifbool{bbx:subentry}
-       {\printfield[bibentrysetcount]{entrysetcount}%
-	\setunit*{\addnbspace}}
-       {}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{setpageref}%
-  \finentry}
-
 %remove punctuation and space after initials -- require biber
 \renewrobustcmd*{\bibinitperiod}{}
 %separator printed before the pages field
@@ -146,7 +80,7 @@
 %no bracktes in thebibliography and add dot
 \DeclareFieldFormat{labelnumberwidth}{#1\adddot}
 %not formating pages
-\DeclareFieldFormat*{pages}{#1}
+\DeclareFieldFormat*{pages}{\mkcomprange{#1}}
 %not formated journaltitle
 \DeclareFieldFormat*{journaltitle}{#1}
 %not formated title
@@ -154,62 +88,25 @@
 
 
 %Set name format
-\DeclareNameAlias{default}{last-first}
-\DeclareNameAlias{sortname}{last-first}
-%Not needed??
-\DeclareNameAlias{author}{last-first}
-\DeclareNameAlias{editor}{last-first}
-\DeclareNameAlias{translator}{last-first}
-
-%remove comma between familyname and firstname
-\renewbibmacro*{name:last-first}[4]{%
-  \ifuseprefix
-    {\usebibmacro{name:delim}{#3#1}%
-     \usebibmacro{name:hook}{#3#1}%
-     \ifblank{#3}{}{%
-       \ifcapital
-         {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
-     {\mkbibnameprefix{#3}\isdot}%
-       \ifpunctmark{'}{}{\bibnamedelimc}}%
-     \mkbibnamelast{#1}\isdot
-     \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
-     \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}}%remove \addcomma
-    {\usebibmacro{name:delim}{#1}%
-     \usebibmacro{name:hook}{#1}%
-     \mkbibnamelast{#1}\isdot
-     \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
-%     \ifblank{#2#3}{}{\addcomma}%%commented
-     \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
-     \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
+\DeclareNameAlias{default}{family-given}
+\DeclareNameAlias{sortname}{family-given}
+
+%remove comma between family name and given name
+\renewcommand*{\revsdnamepunct}{}
 
 %option articledoi -- no doi / eprint / url in article
-\newbibmacro*{doi+eprint+url-use}{%
-       \iftoggle{bbx:doi}%
-         {\printfield{doi}}%
-         {}%
-       \newunit\newblock
-       \iftoggle{bbx:eprint}%
-         {\usebibmacro{eprint}}%
-         {}%
-       \newunit\newblock
-       \iftoggle{bbx:url}%
-         {\usebibmacro{url+urldate}}%
-         {}%
-}
+\letbibmacro{doi+eprint+url-use}{doi+eprint+url}
 
 \renewbibmacro*{doi+eprint+url}{%
-  \ifentrytype{article}%
-    {%
-     \iftoggle{bbx:articledoi}%
-      {\usebibmacro{doi+eprint+url-use}}{}%
-    }{\usebibmacro{doi+eprint+url-use}
-    }%
+  \ifboolexpr{test {\ifentrytype{article}} and not togl {bbx:articledoi}}
+    {}
+    {\usebibmacro{doi+eprint+url-use}}%
 }
 
 %no bibstring in in article:
 \renewbibmacro*{in:}{%
-\ifentrytype{article}%
-    {\iftoggle{bbx:articlein}{\printtext{\bibstring{in}\intitlepunct}}{}}%
+  \ifboolexpr{test {\ifentrytype{article}} and not togl {bbx:articlein}}
+    {}
     {\printtext{\bibstring{in}\intitlepunct}}%
 }
 
@@ -223,26 +120,21 @@
 
 %Order year;volume:page
 \renewbibmacro*{issue+date}{%
-  \printtext{%
-    \iffieldundef{issue}
-      {\usebibmacro{date}}
-      {\printfield{issue}%
-       \setunit*{\addspace}%
-       \usebibmacro{date}}}%
+  \printfield{issue}%
+  \setunit*{\addspace}%
+  \usebibmacro{date}%
   \newunit}
 
 \renewbibmacro*{journal+issuetitle}{%
   \usebibmacro{journal}%
-  \setunit*{\addspace}%
-  \usebibmacro{issue+date}%
-  \setunit*{\addsemicolon}
   \iffieldundef{series}
     {}
     {\newunit
-     \printfield{series}%
-     \setunit{\addspace}}%
+     \printfield{series}}%
+  \setunit*{\addspace}%
+  \usebibmacro{issue+date}%
+  \setunit*{\addsemicolon}
   \usebibmacro{volume+number+eid}%
-  \setunit{\addspace}%
   \setunit{\addcomma\space}%
   \usebibmacro{issue}%
   \newunit}
diff --git a/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.cbx b/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.cbx
index 04a73e0c5fd..9b275b455e3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-nejm/nejm.cbx
@@ -1,12 +1,12 @@
 %copyright Marco Daniel
-%%$Id: nejm.cbx 28 2011-09-09 17:17:01Z marco $
-%%$Rev: 28 $
+%%$Id: nejm.bbx 30 2018-07-28 11:01:00Z marco $
+%%$Rev: 30 $
 %%$Author: marco $
-%%$Date: 2011-09-09 19:17:01 +0200 (Fr, 09. Sep 2011) $
-\def\biblatexnejmversioncbx{v0.4}
-\def\biblatexnejmpackagenamecbx{nejm.cbx}
-\def\biblatexnejmsvncbx$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
-\ProvidesFile{nejm.bbx}[\biblatexnejmsvncbx$Id: nejm.cbx 28 2011-09-09 17:17:01Z marco $ \biblatexnejmversioncbx: \biblatexnejmpackagenamecbx]
+%%$Date: 2018-07-28 13:01:00Z +0200 (Sa, 28. Jul 2018) $
+\def\biblatexnejmversionbbx{v0.5}
+\def\biblatexnejmpackagenamebbx{nejm.bbx}
+\def\biblatexnejmsvnbbx$#1: #2 #3 #4-#5-#6 #7 #8${#4/#5/#6\space }
+\ProvidesFile{nejm.bbx}[\biblatexnejmsvnbbx$Id: nejm.bbx 30 2018-07-28 11:01:00Z marco $ \biblatexnejmversionbbx: \biblatexnejmpackagenamebbx]
 
 \RequireCitationStyle{numeric-comp}
 
@@ -20,6 +20,4 @@
   {\usebibmacro{cite:dump}%
    \usebibmacro{postnote}}
 
-
-
 \endinput