diff options
28 files changed, 149 insertions, 309 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index 278b343b807..f164e495855 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 6.5 +Version 6.7 Permission is granted to copy, distribute and/or modify this software under the terms of the LaTeX Project Public License, version diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index c53b43e47ed..949d8897188 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -534,4 +534,35 @@ ISSUE = {Spring}, PAGES = {100--103}, YEAR = {2001} -}
\ No newline at end of file +} + +% Testing only first name initials as per +% http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html +@article{first, + Author = {Yuri Brown and William Campbell}, + Journal = {Research}, + Title = {A first article}, + Year = {2004} +} + +@article{second, + Author = {Anne Campbell and Mike Muncer and Brian Gorman}, + Journal = {Research}, + Title = {A second article}, + Year = {1993} +} + +@article{fourth, + Author = {Lucy Smith and Anne Campbell and Keith Adams}, + Journal = {Research}, + Title = {A fourth article}, + Year = {1992} +} + +@article{third, + Author = {William Campbell and Carl Bush and Andy Brunell}, + Journal = {Research}, + Title = {A third article}, + Year = {2005} +} + diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf Binary files differindex 396eed47ac5..afbbdec05eb 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index 1d4c7e68b2d..15f725144d2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -94,19 +94,21 @@ \begin{document} \section*{|biblatex-apa| style examples} This file typesets just about all useful examples from -\apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. Please refer to the +\apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. Also included are some +clarifications from the APA blog +(\url{http://blog.apastyle.org/apastyle/}). Please refer to the |biblatex-apa-test-references.bib| file for details on the references entries. The |.bib| key for each entry in the References section is listed for convenience in the left margin. The keys are not arbitrary and consist of the APA section they are taken from (7.01--7.11), followed by a colon, -followed by the example number. This makes it easier to cross-reference -the typeset examples with the commented |.bib| file. I chose not to put the +followed by the example number. This makes it easier to cross-reference the +typeset examples with the commented |.bib| file. I chose not to put the examples in the References section in example number order so that the APA requirements for References list alphabetisation and order could also be demonstrated. \section*{Citations} -\begin{refsection}[biblatex-apa-test-citations] +\begin{refsection}[../bibtex/bib/biblatex-apa-test-citations] \noindent Please see accompanying file |biblatex-apa-test-citations.bib| for the bibliographic entries which these examples use. @@ -249,14 +251,9 @@ the author:\\ \noindent\apa{6.14}\\ Citations of an entry with an author who shares a -surname with another entry always appears with initials\footnote{This is, - as with automatic name list disambiguation, fairly deep magic only - possible with biblatex 1.4+ and biber 0.9+}. Note that the APA example -for this is not really correct for any automated system as the ambiguous -surname should be disambiguated with initials in both cases---we still -don't really know in the APA example whether the Light in the 2008 paper is -the same as the Light in the 2006. The disambiguation performed by biblatex -makes this clear (or as clear as it can be):\\ +surname with another entry always appears with initials when primary +author. It is not explicit in the APA 6th edition manual but initials only +appear with primary authors\footnote{\url{http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html}}:\\ \apaex{\textcite{6.14}}\\ \apaex{\textcite{7.01:3b}} @@ -409,8 +406,14 @@ these appear in references\\ \noindent Testing seasonal periodical citations\\ \apaex{\textcite{season1}} +% Testing first list name initials only as per +% http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html +First citation:\\ +\apaex{\parencite{first,second,third,fourth}}\\ +\apaex{\parencite{first,second,third,fourth}} + \end{refsection} -\begin{refsection}[biblatex-apa-test-references] +\begin{refsection}[../bibtex/bib/biblatex-apa-test-references] \nocite{*} \end{refsection} \newpage diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf Binary files differindex 1f18deff182..c4d767a8e52 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 38c7d1f3513..c95ddbdf55d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -25,7 +25,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={6.5}, + revision={6.7}, date={\today}} \hypersetup{% @@ -426,6 +426,14 @@ applied to the data stream by |biber| and does not change your \file{.bib}. \begin{changelog} +\begin{release}{6.7}{2015-01-23} +\item Bug fixes +\end{release} + +\begin{release}{6.6}{2014-10-23} +\item Bug fixes +\end{release} + \begin{release}{6.5}{2014-04-16} \item Bug fixes \item Slovenian localisation diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/reference.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/reference.pdf Binary files differdeleted file mode 100644 index ff0b3ff84ac..00000000000 --- a/Master/texmf-dist/doc/latex/biblatex-apa/reference.pdf +++ /dev/null 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 5e6d41a84a6..2d9519b1a4f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{american-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -45,18 +45,6 @@ execproducer = {{executive producer}{executive producer}}, director = {{director}{director}}, writer = {{writer}{writer}}, - january = {{January}{January}}, - february = {{February}{February}}, - march = {{March}{March}}, - april = {{April}{April}}, - may = {{May}{May}}, - june = {{June}{June}}, - july = {{July}{July}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{October}{October}}, - november = {{November}{November}}, - december = {{December}{December}}, mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}}, phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, origyear = {{original\space work\space published}{original\space work\space published}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 7f6f1607f20..ac5e9c37500 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2014/04/16\space v6.5\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2015/01/23\space v6.7\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -221,7 +221,8 @@ datelabel=apalong,% origdate=apalong,% urldate=apalong,% - eventdate=comp} + eventdate=comp, + dateabbrev=false} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 3c1556815f8..1f6f4cfc5c7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -11,21 +11,8 @@ %% This work has the LPPL maintenance status `maintained'. %% %% The Current Maintainer of this work is Philip Kime. -%% -%% This work consists of the files: -%% -%% apa.cbx (biblatex citation style) -%% apa.bbx (biblatex references style) -%% apa.dbx (biblatex style data model) -%% *.lbx (localisation files for APA-specific strings) -%% biblatex-apa.pdf (Style documentation) -%% biblatex-apa.tex (Style documentation source) -%% biblatex-apa-test.pdf (Style examples) -%% biblatex-apa-test.tex (Style examples source) -%% biblatex-apa-test-citations.bib (Style examples - citations) -%% biblatex-apa-test-references.bib (Style examples - references) - -\ProvidesFile{apa.cbx}[2014/04/16\space v6.5\space APA biblatex citation style] + +\ProvidesFile{apa.cbx}[2015/01/23\space v6.7\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -83,6 +70,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.11) Suffices are not shown in citations % (APA 6.12) 3-5 authors have "et al." after first cite +% (Blog http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author % #1 = last name % #2 = last name (initials) @@ -94,6 +82,9 @@ % #8 = name affix (initials) \newbibmacro*{labelname:doname}[8]{% + \ifnumcomp{\value{listcount}}{>}{1} + {\setcounter{uniquename}{0}} + {}% \ifcase\value{uniquename}% \ifuseprefix {\usebibmacro{name:last}{#1}{#3}{#5}{}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 1d3a3a191b6..7d360372ddf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.dbx}[2014/04/16\space v6.5\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2015/01/23\space v6.7\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx index e96fcf6fe7d..3e0c8e65e9e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{austrian-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % (APA 6.22) The example abbreviations @@ -27,18 +27,6 @@ \DeclareBibliographyStrings{% inherit = {austrian}, - january = {{J\"anner}{J\"anner}}, - february = {{Februar}{Februar}}, - march = {{M\"arz}{M\"arz}}, - april = {{April}{April}}, - may = {{Mai}{Mai}}, - june = {{Juni}{Juni}}, - july = {{Juli}{Juli}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{Oktober}{Oktober}}, - november = {{November}{November}}, - december = {{Dezember}{Dezember}}, revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, @@ -75,7 +63,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -93,7 +81,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -123,7 +111,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx index 12c4536e314..8dd20f9a17c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{brazilian-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations @@ -62,7 +62,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -78,7 +78,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -106,7 +106,7 @@ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx index 775142a689d..68ad344e6a8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{british-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{with}{with}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{January}{January}}, - february = {{February}{February}}, - march = {{March}{March}}, - april = {{April}{April}}, - may = {{May}{May}}, - june = {{June}{June}}, - july = {{July}{July}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{October}{October}}, - november = {{November}{November}}, - december = {{December}{December}}, mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}}, phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, origyear = {{original\space work\space published}{original\space work\space published}}, @@ -80,7 +68,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -96,7 +84,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -124,7 +112,7 @@ {}% {\addspace}}% {\addcomma\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx index d4db9183e83..71dfc48f1dd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{dutch-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{met}{met}},% FIXME: check paragraph = {{par\adddot}{par\adddot}}, paragraphs = {{par\adddot}{par\adddot}}, - january = {{januari}{januari}}, - february = {{februari}{februari}}, - march = {{maart}{maart}}, - april = {{april}{april}}, - may = {{mei}{mei}}, - june = {{juni}{juni}}, - july = {{juli}{juli}}, - august = {{augustus}{augustus}}, - september = {{september}{september}}, - october = {{oktober}{oktober}}, - november = {{november}{november}}, - december = {{december}{december}}, mathesis = {{masterscriptie}{masterscriptie}}, phdthesis = {{proefschrift}{proefschrift}}, origyear = {{origineel\space werk\space gepubliceerd}{origineel\space werk\space gepubliceerd}}, @@ -80,7 +68,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -96,7 +84,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -124,7 +112,7 @@ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx index e6996ebf746..8b1afeffd7a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{english-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -45,18 +45,6 @@ execproducer = {{executive producer}{executive producer}}, director = {{director}{director}}, writer = {{writer}{writer}}, - january = {{January}{January}}, - february = {{February}{February}}, - march = {{March}{March}}, - april = {{April}{April}}, - may = {{May}{May}}, - june = {{June}{June}}, - july = {{July}{July}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{October}{October}}, - november = {{November}{November}}, - december = {{December}{December}}, mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}}, phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, origyear = {{original\space work\space published}{original\space work\space published}}, 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 4ef649c745b..f76714753b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{french-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -28,18 +28,6 @@ \DeclareBibliographyStrings{% inherit = {french}, inpress = {{sous presse}{sous presse}},% remove when biblatex has it - january = {{janvier}{janvier}}, - february = {{f\'evrier}{f\'evrier}}, - march = {{mars}{mars}}, - april = {{avril}{avril}}, - may = {{mai}{mai}}, - june = {{juin}{juin}}, - july = {{juillet}{juillet}}, - august = {{ao\^ut}{ao\^ut}}, - september = {{septembre}{septembre}}, - october = {{octobre}{octobre}}, - november = {{novembre}{novembre}}, - december = {{d\'ecembre}{d\'ecembre}}, revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddot\space R\'ev\adddot}}, page = {{Page}{{}p\adddot}}, pages = {{Pages}{{}p\adddot}}, @@ -75,7 +63,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -91,7 +79,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -119,7 +107,7 @@ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 93c632b3f17..8c49ff5af5d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -27,18 +27,6 @@ \DeclareBibliographyStrings{% inherit = {german}, - january = {{Januar}{Januar}}, - february = {{Februar}{Februar}}, - march = {{M\"arz}{M\"arz}}, - april = {{April}{April}}, - may = {{Mai}{Mai}}, - june = {{Juni}{Juni}}, - july = {{Juli}{Juli}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{Oktober}{Oktober}}, - november = {{November}{November}}, - december = {{Dezember}{Dezember}}, revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, @@ -75,7 +63,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -93,7 +81,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -123,7 +111,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx index 8c062952280..4049e234f3f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{greek-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{with}{with}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{Ιανουάριος}{Ιανουάριος}}, - february = {{Φεβρουάριος}{Φεβρουάριος}}, - march = {{Μάρτιος}{Μάρτιος}}, - april = {{Απρίλιος}{Απρίλιος}}, - may = {{Μάϊος}{Μάϊος}}, - june = {{Ιούνιος}{Ιούνιος}}, - july = {{Ιούλιος}{Ιούλιος}}, - august = {{Αύγουστος}{Αύγουστος}}, - september = {{Σεπτέμβριος}{Σεπτέμβριος}}, - october = {{Οκτώβριος}{Οκτώβριος}}, - november = {{Νοέμβριος}{Νοέμβριος}}, - december = {{Δεκέμβριος}{Δεκέμβριος}}, mathesis = {{Μεταπτυχιακή εργασία}{Μεταπτυχιακή\addabbrvspace εργασία}}, phdthesis = {{Διδακτορική\addabbrvspace διατριβή}{Διδακτορική\addabbrvspace διατριβή}}, origyear = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}}, @@ -98,7 +86,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -114,7 +102,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -142,7 +130,7 @@ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx index 10af2339760..ca12d91253d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{italian-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{with}{with}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{Gennaio}{Gennaio}}, - february = {{Febbraio}{Febbraio}}, - march = {{Marzo}{Marzo}}, - april = {{Aprile}{Aprile}}, - may = {{Maggio}{Maggio}}, - june = {{Giugno}{Giugno}}, - july = {{Luglio}{Luglio}}, - august = {{Agosto}{Agosto}}, - september = {{Settembre}{Settembre}}, - october = {{Ottobre}{Ottobre}}, - november = {{Novembre}{Novembre}}, - december = {{Deicembre}{Dicembre}}, mathesis = {{Tesi\space di\space laurea}{Tesi\space di\space laurea}}, phdthesis = {{Tesi\space di\space dottorato}{Tesi\space di\space dottorato}}, origyear = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}}, @@ -80,7 +68,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -96,7 +84,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -124,7 +112,7 @@ {}% {\addspace}}% {\addcomma\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx index e9726465311..cf09edd1297 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{naustrian-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations @@ -27,18 +27,6 @@ \DeclareBibliographyStrings{% inherit = {naustrian}, - january = {{J\"anner}{J\"anner}}, - february = {{Februar}{Februar}}, - march = {{M\"arz}{M\"arz}}, - april = {{April}{April}}, - may = {{Mai}{Mai}}, - june = {{Juni}{Juni}}, - july = {{Juli}{Juli}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{Oktober}{Oktober}}, - november = {{November}{November}}, - december = {{Dezember}{Dezember}}, revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, @@ -75,7 +63,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -93,7 +81,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -123,7 +111,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % 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 90aae382166..99acc065c91 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{ngerman-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -27,18 +27,6 @@ \DeclareBibliographyStrings{% inherit = {ngerman}, - january = {{Januar}{Januar}}, - february = {{Februar}{Februar}}, - march = {{M\"arz}{M\"arz}}, - april = {{April}{April}}, - may = {{Mai}{Mai}}, - june = {{Juni}{Juni}}, - july = {{Juli}{Juli}}, - august = {{August}{August}}, - september = {{September}{September}}, - october = {{Oktober}{Oktober}}, - november = {{November}{November}}, - december = {{Dezember}{Dezember}}, revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, @@ -75,7 +63,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -93,7 +81,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -123,7 +111,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx index 1867bdebaf7..b8e182f6bf6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norsk-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{med}{med}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{januar}{januar}}, - february = {{februar}{februar}}, - march = {{mars}{mars}}, - april = {{april}{april}}, - may = {{mai}{mai}}, - june = {{juni}{juni}}, - july = {{juli}{juli}}, - august = {{august}{august}}, - september = {{september}{september}}, - october = {{oktober}{oktober}}, - november = {{november}{november}}, - december = {{desember}{desember}}, mathesis = {{Masteroppgave}{Masteroppgave}}, phdthesis = {{Doktoravhandling}{Doktoravhandling}}, origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}}, @@ -80,7 +68,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -98,7 +86,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -128,7 +116,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx index 0f6e88b30cb..cee11ffd407 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norwegian-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{med}{med}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{januar}{januar}}, - february = {{februar}{februar}}, - march = {{mars}{mars}}, - april = {{april}{april}}, - may = {{mai}{mai}}, - june = {{juni}{juni}}, - july = {{juli}{juli}}, - august = {{august}{august}}, - september = {{september}{september}}, - october = {{oktober}{oktober}}, - november = {{november}{november}}, - december = {{desember}{desember}}, mathesis = {{Masteroppgave}{Masteroppgave}}, phdthesis = {{Doktoravhandling}{Doktoravhandling}}, origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}}, @@ -80,7 +68,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -98,7 +86,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -128,7 +116,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx index 128d4bad48a..6eb8669f1dc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nynorsk-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations @@ -43,18 +43,6 @@ with = {{med}{med}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{januar}{januar}}, - february = {{februar}{februar}}, - march = {{mars}{mars}}, - april = {{april}{april}}, - may = {{mai}{mai}}, - june = {{juni}{juni}}, - july = {{juli}{juli}}, - august = {{august}{august}}, - september = {{september}{september}}, - october = {{oktober}{oktober}}, - november = {{november}{november}}, - december = {{desember}{desember}}, mathesis = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}}, phdthesis = {{Doktoravhandling}{Doktoravhandling}}, origyear = {{opphavleg\space publisert}{opphavleg\space publisert}}, @@ -80,7 +68,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -98,7 +86,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -128,7 +116,7 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx index 3e205e1e6d0..8c399ffe1da 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{slovene-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations @@ -55,18 +55,6 @@ execproducer = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}}, director = {{re\v{z}iser}{re\v{z}iser}}, writer = {{avtor}{avtor}}, - january = {{januar}{januar}}, - february = {{februar}{februar}}, - march = {{marec}{marec}}, - april = {{april}{april}}, - may = {{maj}{maj}}, - june = {{junij}{junij}}, - july = {{julij}{julij}}, - august = {{avgust}{avgust}}, - september = {{september}{september}}, - october = {{oktober}{oktober}}, - november = {{november}{november}}, - december = {{december}{december}}, datejanuary = {{januarja}{januarja}}, datefebruary = {{februarja}{februarja}}, datemarch = {{marca}{marca}}, @@ -113,7 +101,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -131,7 +119,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -161,7 +149,6 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}} -} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx index 16d7fba8a24..49cd4699b95 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{spanish-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -42,21 +42,22 @@ october = {{octubre}{octubre}}, november = {{noviembre}{noviembre}}, december = {{diciembre}{diciembre}}, + nodate = {{s\adddot f\adddot}{s\adddot f\adddot}}, mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}}, phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}}, - revisededition = {{Edici\'on\space Revisada}{\'Ed\adddot\space R\'ev\adddot}}, - producer = {{producer}{producer}}, - execproducer = {{executive producer}{executive producer}}, + revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}}, + producer = {{productor}{productor}}, + execproducer = {{productor ejecutivo}{productor ejecutivo}}, director = {{director}{director}}, - writer = {{writer}{writer}}, - with = {{with}{with}}, + writer = {{escritor}{escritor}}, + with = {{con}{con}}, page = {{P\'agina}{{}p\adddot}}, pages = {{P\'aginas}{{}pp\adddot}}, on = {{el}{el}}, retrieved = {{Recuperado}{Recuperado}}, available = {{disponible}{disponible}}, from = {{desde}{desde}}, - archivedat = {{archivado en}{archiv\'es\space \`a}}, + archivedat = {{archivado en}{archivado en}}, reviewof = {{revisi\'on\space de}{revisi\'on\space de}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, @@ -79,7 +80,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% @@ -95,37 +96,35 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#2}% {}% {\iffieldundef{#1}% {}% {\addcomma\addspace}% - \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% {}% - {\addspace}% - \stripzeros{\thefield{#3}}}}% + {\stripzeros{\thefield{#3}}\addspace de\addspace}}% + \mkbibmonth{\thefield{#2}}% +}}% \protected\def\mkbibdateapalongmdy#1#2#3{% \iffieldundef{#3}% {}% - {\stripzeros{\thefield{#3}}}% + {el\addspace\stripzeros{\thefield{#3}}}% \iffieldundef{#2}% - {}% + {\addspace{en}\addspace}% {\iffieldundef{#3}% - {}% - {\addspace}% - \mkbibmonth{\thefield{#2}}}% + {en\addspace}% + {\addspace{de}\addspace}% + \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}% \iffieldundef{#1}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {\iffieldundef{#2}% {}% {\addspace}% \thefield{#1}}}} - -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx index faed28d311b..5aafb66b208 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swedish-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2015/01/23\space v6.7\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations @@ -47,18 +47,6 @@ with = {{med}{med}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - january = {{januari}{januari}}, - february = {{februari}{februari}}, - march = {{mars}{mars}}, - april = {{april}{april}}, - may = {{maj}{maj}}, - june = {{juni}{juni}}, - july = {{juli}{juli}}, - august = {{augusti}{augusti}}, - september = {{september}{september}}, - october = {{oktober}{oktober}}, - november = {{november}{november}}, - december = {{december}{december}}, mathesis = {{examensuppsats}{examensuppsats}}, phdthesis = {{doktorsavhandling}{doktorsavhandling}}, origyear = {{originalarbete\space publicerat}{originalarbete\space publicerat}}, @@ -77,7 +65,7 @@ \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -95,7 +83,7 @@ \protected\def\mkbibdateapalongextra#1#2#3{% \iffieldundef{#1}% {}% - {\thefield{#1}\printfield{extrayear}}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% \iffieldundef{#3}% {}% {\iffieldundef{#1}% @@ -125,6 +113,6 @@ {\iffieldundef{#2}% {}% {\addspace}% - \thefield{#1}}}} + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} \endinput |