diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
5 files changed, 76 insertions, 68 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx index 91a4c1210ba..fda11b61c9b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -66,23 +66,29 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.10 Example 68) Drop end* when they are the same as * +% You must use \printdate to get here otherwise it will be ignored \DefineBibliographyExtras{american}{% \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#1} - {} - {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}} - {} - {\thefield{#1},\space}}% - \iffieldundef{#2} + \ifthenelse{\iffieldundef{#1}\OR% + \(\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}\)} + {} + {\thefield{#1}% + \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% + \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} + {} + {\addcomma\addspace}}% + \ifthenelse{\iffieldundef{#2}\OR% + \(\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}\)} {} - {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}} - {} - {\mkbibmonth{\thefield{#2}}\addspace}% - \iffieldundef{#3} - {} - {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}} + {\mkbibmonth{\thefield{#2}}% + \ifthenelse{\(\equal{#2}{month}\AND\iffieldundef{day}\)\OR% + \(\equal{#2}{endmonth}\AND\iffieldundef{endday}\)} + {} + {\addspace}}% + \ifthenelse{\iffieldundef{#3}\OR% + \(\equal{#3}{endday}\AND\iffieldsequal{day}{endday}\)} {} - {\stripzeros{\thefield{#3}}}}}}} + {\stripzeros{\thefield{#3}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 4fd11e27717..e48423c38b1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -216,12 +216,6 @@ {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} {\addspace\&\space}}}} - % {\ifstrequal{\currentlist}{author} - % {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} - % {\ifthenelse{\boolean{bbx:editorinauthpos}} - % {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space} - % {\addspace\&\space}}}}} - % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -248,13 +242,7 @@ {\iffieldundef{origyear} {\printtext[parens]{\usebibmacro{cite:noyear}}} {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}} - {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{issue}} - {\printtext[yearorunkyear]{\printfield{labelyear}\printfield{extrayear}}} - {\iffieldundef{day} - {\printtext[yearorunkyear]{\printfield{labelyear}\printfield{extrayear}% - \usebibmacro{monthorissue}}} - {\printtext[parens]{\printfield{labelyear}\printfield{extrayear}\addcomma\space\printfield{month}\space\printfield{day}}}}}} - + {\printtext[yearorunkyear]{\printdate}}} \DeclareFieldFormat{yearorunkyear}{% \ifthenelse{\iffieldequalstr{usere}{unkdate}\OR\iffieldequalstr{usere}{unkauthdate}} @@ -471,7 +459,9 @@ \renewbibmacro*{author/editor}{% \ifnameundef{author} - {\usebibmacro{editorinauthpos}} + {\ifnameundef{editor} + {} + {\usebibmacro{editorinauthpos}}} {\global\boolfalse{bbx:editorinauthpos}% \usebibmacro{author}}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx index 0724ba6e083..640ee2c2a38 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -61,23 +61,29 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.10 Example 68) Drop end* when they are the same as * +% You must use \printdate to get here otherwise it will be ignored \DefineBibliographyExtras{french}{% \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#1} - {} - {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}} - {} - {\thefield{#1},\space}}% - \iffieldundef{#2} + \ifthenelse{\iffieldundef{#1}\OR% + \(\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}\)} + {} + {\thefield{#1}% + \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% + \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} + {} + {\addcomma\addspace}}% + \ifthenelse{\iffieldundef{#2}\OR% + \(\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}\)} {} - {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}} - {} - {\mkbibmonth{\thefield{#2}}\addspace}% - \iffieldundef{#3} - {} - {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}} + {\mkbibmonth{\thefield{#2}}% + \ifthenelse{\(\equal{#2}{month}\AND\iffieldundef{day}\)\OR% + \(\equal{#2}{endmonth}\AND\iffieldundef{endday}\)} + {} + {\addspace}}% + \ifthenelse{\iffieldundef{#3}\OR% + \(\equal{#3}{endday}\AND\iffieldsequal{day}{endday}\)} {} - {\stripzeros{\thefield{#3}}}}}}} + {\stripzeros{\thefield{#3}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx index 23350780985..5f90c08248a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -62,23 +62,26 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.10 Example 68) Drop end* when they are the same as * -\DefineBibliographyExtras{american}{% +% You must use \printdate to get here otherwise it will be ignored +\DefineBibliographyExtras{german}{% \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#1} - {} - {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}} - {} - {\thefield{#1},\space}}% - \iffieldundef{#2} + \ifthenelse{\iffieldundef{#1}} {} - {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}} - {} - {\mkbibmonth{\thefield{#2}}\addspace}% - \iffieldundef{#3} - {} - {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}} + {\thefield{#1}% + \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% + \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} + {} + {\addcomma\addspace}}% + \ifthenelse{\iffieldundef{#3}} {} - {\stripzeros{\thefield{#3}}}}}}} + {\stripzeros{\thefield{#3}}% + \ifthenelse{\(\equal{#3}{day}\AND\iffieldundef{month}\)\OR% + \(\equal{#2}{endday}\AND\iffieldundef{endmonth}\)} + {} + {\adddot\addspace}}% + \ifthenelse{\iffieldundef{#2}} + {} + {\mkbibmonth{\thefield{#2}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx index cbb24b450a5..484f9f88c48 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -62,23 +62,26 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.10 Example 68) Drop end* when they are the same as * -\DefineBibliographyExtras{american}{% +% You must use \printdate to get here otherwise it will be ignored +\DefineBibliographyExtras{ngerman}{% \protected\def\mkbibdatelong#1#2#3{% - \iffieldundef{#1} - {} - {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}} - {} - {\thefield{#1},\space}}% - \iffieldundef{#2} + \ifthenelse{\iffieldundef{#1}} {} - {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}} - {} - {\mkbibmonth{\thefield{#2}}\addspace}% - \iffieldundef{#3} - {} - {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}} + {\thefield{#1}% + \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR% + \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)} + {} + {\addcomma\addspace}}% + \ifthenelse{\iffieldundef{#3}} {} - {\stripzeros{\thefield{#3}}}}}}} + {\stripzeros{\thefield{#3}}% + \ifthenelse{\(\equal{#3}{day}\AND\iffieldundef{month}\)\OR% + \(\equal{#2}{endday}\AND\iffieldundef{endmonth}\)} + {} + {\adddot\addspace}}% + \ifthenelse{\iffieldundef{#2}} + {} + {\mkbibmonth{\thefield{#2}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |