Readying 6.3

plk · Oct 25, 2013 · 5fef7bc · 5fef7bc
1 parent 044062d
commit 5fef7bc
Show file tree

Hide file tree

Showing 26 changed files with 84 additions and 40 deletions.
diff --git a/README b/README
@@ -1,4 +1,4 @@
-Version 6.2
+Version 6.3
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version

diff --git a/RELEASE b/RELEASE
@@ -5,4 +5,4 @@ Update version string in:
 * apa.bbx
 * apa.dbx
 * *.lbx
-
+* Generate 2 PDFs before packaging
diff --git a/american-apa.lbx b/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations

diff --git a/apa.bbx b/apa.bbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2013/10/19\space v6.2\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2013/10/27\space v6.3\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text

diff --git a/apa.cbx b/apa.cbx
@@ -25,7 +25,7 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.cbx}[2013/10/19\space v6.2\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2013/10/27\space v6.3\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -64,7 +64,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand*{\parencite}[\mkbibparens]
   {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
@@ -73,7 +74,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -169,6 +171,12 @@
 %            need to be repeated but the full years must be repeated with
 %            their extrayear postfixes
 % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
+\def\citeresetapa{\global\let\cbx@apa@names\@empty}
+\citeresetapa
+\def\cbx@apa@ifnamesaved{%
+  \xifinlist{\thefield{namehash}}{\cbx@apa@names}
+    {\@firstoftwo}
+    {\@secondoftwo}}
 
 \newbibmacro*{cite:author}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -183,7 +191,7 @@
 % Normal cite
      {\ifnameundef{shortauthor}
         {\printnames[labelname][-\value{listtotal}]{labelname}}%
-        {\ifciteseen
+        {\cbx@apa@ifnamesaved
           {\printnames{shortauthor}}
           {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
       \savefield{namehash}{\cbx@lasthash}}}%
@@ -204,7 +212,7 @@
 % Normal cite
      {\ifnameundef{shortauthor}
         {\printnames[labelname][-\value{listtotal}]{labelname}}%
-        {\ifciteseen
+        {\cbx@apa@ifnamesaved
           {\printnames{shortauthor}}
           {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
       \setunit{\nameyeardelim}%
@@ -240,7 +248,7 @@
     % Normal full cite
          {\printnames[labelname][-\value{listtotal}]{labelname}}
     % Cite using short author
-         {\ifciteseen
+         {\cbx@apa@ifnamesaved
            {\printnames{shortauthor}}
            {\printnames[labelname][-\value{listtotal}]{author}}}%
   % Year
@@ -250,7 +258,7 @@
   % Put the shortauthor inside the year brackets if necessary
         \ifnameundef{shortauthor}
          {}
-         {\ifciteseen
+         {\cbx@apa@ifnamesaved
            {}
            {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
   % Actual year printing
@@ -309,9 +317,8 @@
   {\iffieldundef{postnote}
      {}
      {\nameyeardelim
-      \printfield{postnote}}}
-
-
+      \printfield{postnote}}%
+   \usebibmacro{cite:post}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -349,7 +356,8 @@
       \global\let\blx@related@loop\@empty}
     {\thefield{entrytype}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand{\fullcitebib}
   {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
@@ -367,7 +375,8 @@
       \global\boolfalse{bbx:in}}
     {\thefield{entrytype}}\finentry}
   {\item}
-  {\endlist}
+  {\endlist
+   \usebibmacro{cite:post}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -385,6 +394,11 @@
   \global\boolfalse{cbx:parens}%
   \global\undef\cbx@lasthash}
 
+\newbibmacro*{cite:post}{%
+  \xifinlist{\thefield{namehash}}{\cbx@apa@names}
+    {}
+    {\listxadd{\cbx@apa@names}{\thefield{namehash}}}}
+
 \newbibmacro*{cite:labelyear}{%
   \printfield{labelyear}}
 
@@ -411,15 +425,17 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand*{\cite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{citeyear}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand{\footcite}[\mkbibfootnote]
   {\bibsentence
@@ -428,7 +444,8 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim}
 
@@ -438,14 +455,16 @@
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}
-  {\usebibmacro{textcite:postnote}}
+  {\usebibmacro{textcite:postnote}%
+   \usebibmacro{cite:post}}
 
 \DeclareCiteCommand{\citeauthor}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite:author}}
   {}
-  {\usebibmacro{postnote}}
+  {\usebibmacro{postnote}%
+   \usebibmacro{cite:post}}
 
 \endinput
diff --git a/apa.dbx b/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}[2013/10/19\space v6.2\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2013/10/27\space v6.3\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{

diff --git a/austrian-apa.lbx b/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % (APA 6.22) The example abbreviations

diff --git a/biblatex-apa-test-citations.bib b/biblatex-apa-test-citations.bib
@@ -120,6 +120,20 @@ @MISC{6.13h
   YEAR           = {2005},
 }
 
+@MISC{6.13i,
+  AUTHOR         = {{The American Psychological Association}},
+  SHORTAUTHOR    = {APA},
+  TITLE          = {Title1},
+  YEAR           = {2005},
+}
+
+@MISC{6.13j,
+  AUTHOR         = {{The American Psychological Association}},
+  SHORTAUTHOR    = {APA},
+  TITLE          = {Title2},
+  YEAR           = {2006},
+}
+
 % (APA 6.14)
 @BOOK{6.14,
   AUTHOR         = {I. Light},

diff --git a/biblatex-apa-test.tex b/biblatex-apa-test.tex
@@ -228,7 +228,7 @@ \section*{Citations}
 & \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}}\\\\
 \parbox{2cm}{\raggedright Groups (readily identified through abbreviation) as authors}
 & \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}} & 
-\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}}\citereset
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}}\citereset\citeresetapa
 & \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}
 & \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}\\\\
 \parbox{2cm}{\raggedright Groups (no abbreviation) as authors}
@@ -240,6 +240,13 @@ \section*{Citations}
 \end{tabular}
 \end{center}
 
+\noindent\apa{6.13}\\
+Author abbreviations should work between citations of different works by
+the author:\\
+\apaex{\parencite{6.13i}}\\
+\apaex{\parencite{6.13i}}\\
+\apaex{\parencite{6.13j}}
+
 \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,

diff --git a/biblatex-apa.tex b/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.2},
+  revision={6.3},
   date={\today}}
 
 \hypersetup{%
@@ -425,6 +425,10 @@ \section{Revision history}\label{rev}
 
 \begin{changelog}
 
+\begin{release}{6.3}{2013}
+\item Fixed issue where |SHORTAUTHOR| was only being used for exact same citations.
+\end{release}
+
 \begin{release}{6.2}{2013-10-19}
 \item Corrected Dutch translations
 \item Fixed Norwegian lbx corruption

diff --git a/brazilian-apa.lbx b/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations

diff --git a/british-apa.lbx b/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations

diff --git a/dutch-apa.lbx b/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations

diff --git a/english-apa.lbx b/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations

diff --git a/french-apa.lbx b/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations

diff --git a/german-apa.lbx b/german-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % (APA 6.22) The example abbreviations

diff --git a/greek-apa.lbx b/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 % (APA 6.22) The example abbreviations

diff --git a/italian-apa.lbx b/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 % (APA 6.22) The example abbreviations

diff --git a/naustrian-apa.lbx b/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % (APA 6.22) The example abbreviations

diff --git a/ngerman-apa.lbx b/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % (APA 6.22) The example abbreviations

diff --git a/norsk-apa.lbx b/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 % (APA 6.22) The example abbreviations

diff --git a/norwegian-apa.lbx b/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 % (APA 6.22) The example abbreviations

diff --git a/nynorsk-apa.lbx b/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (APA 6.22) The example abbreviations

diff --git a/reference.pdf b/reference.pdf
diff --git a/spanish-apa.lbx b/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced

diff --git a/swedish-apa.lbx b/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2013/10/19\space v6.2\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations