texlive[66605] Master/texmf-dist: biblatex-apa (20mar23)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 20 21:31:17 CET 2023
Revision: 66605
http://tug.org/svn/texlive?view=revision&revision=66605
Author: karl
Date: 2023-03-20 21:31:17 +0100 (Mon, 20 Mar 2023)
Log Message:
-----------
biblatex-apa (20mar23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-misc.bib
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua
trunk/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,7 +1,7 @@
Permission is granted to copy, distribute and/or modify this software under
the terms of the LaTeX Project Public License, version
1.3c (http://www.latex-project.org/lppl.txt). The current
-maintainer is Philip Kime (© 2022).
+maintainer is Philip Kime (© 2023).
This package is a biblatex style for APA (American Psychological
Association) style compliant documents typeset in LaTeX. It
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-misc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-misc.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-misc.bib 2023-03-20 20:31:17 UTC (rev 66605)
@@ -0,0 +1,37 @@
+% Testing date formats for various localisations
+ at book{datetest1,
+ AUTHOR = {A},
+ DATE = {2020}
+}
+ at book{datetest2,
+ AUTHOR = {B},
+ DATE = {2020-07}
+}
+ at book{datetest3,
+ AUTHOR = {C},
+ DATE = {2020-07-16}
+}
+ at book{datetest4,
+ AUTHOR = {D},
+ DATE = {2020-07-12/2020-07-14}
+}
+ at book{datetest5,
+ AUTHOR = {E},
+ DATE = {2020-07-12/2020-08-14}
+}
+ at book{datetest6,
+ AUTHOR = {F},
+ DATE = {2020-07-12/2021-07-14}
+}
+ at book{datetest7,
+ AUTHOR = {G},
+ DATE = {2020-07/2020-08}
+}
+ at book{datetest8,
+ AUTHOR = {H},
+ DATE = {2020-07/2021-08}
+}
+ at book{datetest9,
+ AUTHOR = {I},
+ DATE = {2020-07/2021-07}
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-misc.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1102,6 +1102,18 @@
ORIGDATE = {1962}
}
+% See https://github.com/plk/biblatex-apa/issues/192
+% IN* should still put title in the front, even when there is an EDITOR
+% requires labelnametemplate for INBOOK (IN* is mapped to INBOOK) and
+% sorting changes (so title sorts before editor for IN*)
+ at INREFERENCE{10.2:35d,
+ TITLE = {Cleveland {FreeNet}},
+ BOOKTITLE = {Encyclopedia of {Cleveland} History},
+ EDITOR = {John J. Grabowski},
+ PUBLISHER = {Case Western Reserve University},
+ DATE = {2022}
+}
+
% (APA 10.2 Example 36)
% Note the special format of the ORIGDATE field and the resulting output.
% Biber supports considerable ISO8601 date formats like this with full
@@ -2449,7 +2461,7 @@
% (APA 10.16 Example 111)
@ONLINE{10.16:111a,
- AUTHOR = {{Centers for Disease Control and Prevention}},
+ AUTHOR = {{Centers for Disease Control and Prevention}},
TITLE = {People at High Risk of Developing Flu-related Complications},
DATE = {2018-01-23},
URL = {https://www.cdc.gov/flu/about/disease/high_risk.htm}
@@ -2456,7 +2468,7 @@
}
@ONLINE{10.16:111b,
- AUTHOR = {{World Health Organization}},
+ AUTHOR = {{World Health Organization}},
TITLE = {Questions and Answers on Immunization and Vaccine Safety},
DATE = {2018-03},
URL = {https://www.who.int/features/qa/84/en/}
@@ -2482,7 +2494,7 @@
}
@ONLINE{10.16:113b,
- AUTHOR = {{National Nurses United}},
+ AUTHOR = {{National Nurses United}},
TITLE = {What Employers Should do to Protect Nurses from {Zika}},
URL = {https://www.nationalnursesunited.org/pages/what-employers-should-do-to-protect-rns-from-zika}
}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,5 +1,5 @@
\documentclass[paper=a4]{article}
-\usepackage[american]{babel}
+\usepackage[ngerman,american]{babel}
\usepackage{csquotes}
\usepackage{shortvrb}
\usepackage{ifthen}
@@ -116,13 +116,17 @@
Within a paragraph, not in the narrative sense:\\
\apaex{\autocite{8.11a}}
-\noindent Within parentheses, use the |\nptextcite| command which is equivalent to
-the |\textcite| command but omits the parenthesis and uses commas instead.
+\noindent Within parentheses, use the |\nptextcite| command which is
+equivalent to the |\textcite| command but omits the parenthesis and uses
+commas instead. |\nptextcite| is not necessary when using a \texttt{luatex}
+based engine because with \texttt{luatex}, the style contains Lua code to
+do this automatically when using just |\textcite|.
See the |biblatex-apa| docs.\\
\apaex{(\nptextcite[see][for more detail]{8.11a})}\\
\apaex{(e.g., falsely balanced news coverage; \nptextcite{8.11a})}\\
\apaex{\textcite{8.11a} noted the dangers of falsely balanced news coverage.}\\
-\apaex{In \citeyear{8.11a}, \citeauthor{8.11a} noted the dangers of falsely balanced news coverage.}
+\apaex{In \citeyear{8.11a}, \citeauthor{8.11a} noted the dangers of falsely
+ balanced news coverage.}
\noindent\apa{8.12}\\
Citing multiple works:\\
@@ -589,6 +593,10 @@
\apaex{\parencite{10.2:35a,10.2:35b,10.2:35c}}\\
\apaex{\textcite{10.2:35a} and \textcite{10.2:35b} and \textcite{10.2:35c}}
+\noindent IN* should still put TITLE in the front, even when there is an EDITOR\footnote{\url{https://github.com/plk/biblatex-apa/issues/192}}:\\
+\apaex{\parencite{10.2:35d}}\\
+\apaex{\textcite{10.2:35d}}
+
\noindent\apa{10.2 Example 36}\\
\apaex{\parencite{10.2:36}}\\
\apaex{\textcite{10.2:36}}
@@ -1189,6 +1197,14 @@
\printbibliography[title={APA 11.9 References}]
\end{refsection}
+\newpage
+\subsection{Misc tests}
+\begin{refsection}[../bibtex/bib/biblatex-apa-test-misc.bib]
+\begin{otherlanguage}{ngerman}
+ \nocite{datetest1,datetest2,datetest3,datetest4,datetest5,datetest6,datetest7,datetest8,datetest9}
+ \printbibliography[title={German date tests}]
+\end{otherlanguage}
+\end{refsection}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2023-03-20 20:31:17 UTC (rev 66605)
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip at kime.org.uk},
- revision={9.16},
+ revision={9.17},
date={\today}}
\hypersetup{%
@@ -143,7 +143,8 @@
Thanks to Jürgen Spitzmüller for the DGPs localisation hints. Thanks to
Sergei Golovan for the Russian localisation. Thanks to Vítor Míguez for the
Galacian localisation. Thanks to Abdulkerim Gok for the Turkish
-translation.
+localisation. Thanks for Robert Fodor the Hungarian localisation. Thanks to
+Marcel Krüger for the Lua code for automating parentheses level checks.
\section{Use}\label{ref:use}
\label{use}
@@ -288,7 +289,9 @@
but does not put parentheses around the year and separates items with
commas. See examples using this command in \path{biblatex-apa-test.tex}.
There is also a multi-cite version |\nptextcites| that works in the same
-way as |\textcites|.
+way as |\textcites|. \textbf{NOTE}: it is not necessary to use |\nptextcite| when
+using a \texttt{luatex} based engine. The style contains Lua code to manage
+this situation automatically when using |\textcite|.
The |\fullcite| command uses ampersands, like the references section
and there is also a |\fullcitebib| command which is the same as
@@ -393,7 +396,16 @@
\begin{changelog}
+\begin{release}{9.17}{2023-03-20}
+\item Fixes for German compresses date ranges.
+\end{release}
+
\begin{release}{9.16}{2022-06-22}
+\item Added Lua to automate what |\nptextcite| does when using
+ \texttt{luatex} engines.
+\end{release}
+
+\begin{release}{9.16}{2022-06-22}
\item Minor documentation and bug fixes
\item Added Turkish localisation
\item Many German localisation enhancements
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{american}
\NewBibliographyString{publication}
@@ -287,7 +287,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -315,7 +315,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -361,7 +361,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2022/06/22\space v9.16\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2023/03/20\space v9.17\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{same} % APA examples all have URLs in same font as text
@@ -177,6 +177,7 @@
{\printtext{%
\mkbibdateapalong{#1year}{#1yeardivision}{#1month}{#1day}%
\dateeraprint{#1year}%
+ \dateuncertainprint
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
@@ -191,7 +192,7 @@
{\mkbibdateapalong{}{}{#1endmonth}{#1endday}}}%
{\mkbibdateapalong{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}%
\dateeraprint{#1endyear}}}
- {\addslash\mkbibdateapalongmdy{}{#1endyeardivision}{}{}}}%
+ {\addslash\mkbibdateapalong{}{#1endyeardivision}{}{}}}%
\enddateuncertainprint}}}}%
\endgroup}
@@ -306,6 +307,10 @@
}
}
+% Don't sort on EDITOR for INBOOK (IN* since IN* is mapped to INBOOK) as TITLE is used in place of author
+% if there is no AUTHOR
+\DeclareSortExclusion{inbook}{editor}
+
\DeclareLabelname{%
\field{shortauthor}
\field{author}
@@ -313,6 +318,13 @@
\field{editor}
}
+% Don't use EDITOR as labelname in INBOOK (IN* since IN* is mapped to INBOOK) as citations should be
+% via TITLE if there is no AUTHOR
+\DeclareLabelname[inbook]{%
+ \field{shortauthor}
+ \field{author}
+}
+
% Don't fall back on other year fields if there is no year, use
% "nodate" string
\DeclareLabeldate{%
@@ -620,7 +632,7 @@
\renewbibmacro*{author/editor}{%
\ifnameundef{author}
- {\ifnameundef{editor}
+ {\ifthenelse{\ifnameundef{editor}\OR\ifentrytype{inbook}}
{\usebibmacro{title}%
% need to clear all title fields so we don't get them again later
\clearfield{title}%
@@ -636,7 +648,7 @@
\newbibmacro*{author/editor:related}{%
\ifnameundef{author}
- {\ifnameundef{editor}
+ {\ifthenelse{\ifnameundef{editor}\OR\ifentrytype{inbook}}
{\usebibmacro{title}%
% need to clear all title fields so we don't get them again later
\clearfield{title}%
@@ -1538,7 +1550,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit{\printdelim{nametitledelim}}\newblock
+ \printdelim{nametitledelim}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
\usebibmacro{apa:related}%
@@ -2005,7 +2017,7 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \usebibmacro{location+publisher}%
+ \printlist{publisher}%
\newunit\newblock
\usebibmacro{doi+url}%
\newunit\newblock
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2022/06/22\space v9.16\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2023/03/20\space v9.17\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -258,7 +258,7 @@
% (APA 11) Bizarre and special rules for legal information
\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
-\DeclareFieldFormat[book,manual,report,preiodical,legmaterial,jurisdiction]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[book,manual,report,periodical,legmaterial,jurisdiction,video]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[legislation,legadminmaterial,legal]{citetitle}{#1}
\newbibmacro*{cite:noname}{%
@@ -507,7 +507,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 8.11) No parens round year for cites when the cite is in
-% parentheses. Use new command \nptextcite for such cites.
+% parentheses. Use new command \nptextcite for such cites
+% unless using luatex which does it automatically
\DeclareDelimAlias[nptextcite]{finalnamedelim}[parencite]{finalnamedelim}
@@ -620,4 +621,12 @@
\let\cbx at textcites@init\cbx at textcite@init
\pretocmd{\cbx at textcites@init}{\UseNextMultiCiteHook}{}{}
+\ifdef\luatexversion
+ {\directlua{require'apa'}%
+ \glet\textcitei\textcite
+ \glet\parencitei\parencite
+ \gdef\textcite{\BLTXAPAifInParensTF{\nptextcite}{\textcitei}}%
+ \gdef\parencite{\BLTXAPAifInParensTF{\nptextcite}{\parencitei}}}
+ {}
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2022/06/22\space v9.16\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2023/03/20\space v9.17\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua 2023-03-20 20:31:17 UTC (rev 66605)
@@ -0,0 +1,38 @@
+-- From Marcel Krüger's answer at https://tex.stackexchange.com/a/654261/80496
+
+-- How to translate boolean results to TeX macros selecting the right arguments
+local bool_to_token = {[false] = token.create'use_ii:nn', [true] = token.create'use_i:nn'}
+
+-- The codepoints we have to look for
+local left_paren = string.byte'('
+local right_paren = string.byte')'
+
+-- Some boilerplate to define an unexpandable command sequence from Lua
+local id = luatexbase.new_luafunction'BLTXAPAifInParensTF'
+token.set_lua('BLTXAPAifInParensTF', id, 'protected')
+lua.get_functions_table()[id] = function()
+
+ -- We want to look at the current list
+ local head = tex.nest.top.head
+
+ local level = 0
+ -- and look at all unprocessed characters
+ for _, char in node.traverse_char(head) do
+ -- Track the nesting level
+ if char == left_paren then
+ level = level + 1
+ elseif char == right_paren then
+ if level > 0 then
+ level = level - 1
+ else
+ -- Negative levels don't make sense, so we ignore the ) instead. Print a warning though to avoid surprises.
+ luatexbase.module_warning('biblatex-apa', '\z
+ Unable to reliably determine if inside parentheses\z
+ since the paragraphs contains an unmatched `)` - will be ignored\z
+ ')
+ end
+ end
+ end
+ -- Finally insert a macro which will select the first or second argument dependingon whether level > 0
+ token.put_next(bool_to_token[level > 0])
+end
Property changes on: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
@@ -286,7 +286,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +314,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
\NewBibliographyString{publication}
@@ -157,7 +157,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -185,7 +185,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -231,7 +231,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{british}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -189,7 +189,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -235,7 +235,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/catalan-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{catalan-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{catalan-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
% Translation based on:
% spanish-apa.lbx file (for source to translate from)
@@ -180,7 +180,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -208,7 +208,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
\NewBibliographyString{publication}
@@ -67,65 +67,65 @@
\DeclareBibliographyStrings{%
inherit = {danish},
-% jourarticle = {{article}{article}},%FIXME
-% tothe = {{to\space the}{to\space the}},%FIXME
-% ofthe = {{of\space the}{of\space the}},%FIXME
-% unitednations = {{United\space Nations}{U\adddot N\adddot}},
-% charter = {{charter}{charter}},
-% article = {{article}{art\adddot}},%FIXME
-% painting = {{painting}{painting}},%FIXME
-% present = {{present}{present}},%FIXME
-% song = {{song}{song}},%FIXME
-% album = {{album}{album}},%FIXME
-% map = {{map}{map}},%FIXME
-% photograph = {{photograph}{photograph}},%FIXME
-% photographs = {{photographs}{photographs}},%FIXME
-% powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
-% lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
-% podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
-% podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
-% interview = {{interview}{interview}},%FIXME
-% speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
-% lithograph = {{lithograph}{lith\adddot}},%FIXME
-% video = {{video}{video}},%FIXME
-% film = {{film}{film}},%FIXME
-% tvseries = {{TV\space series}{TV\space series}},%FIXME
-% tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
-% narrator = {{narrator}{narr\adddot}},%FIXME
-% narrators = {{narrators}{narrs\adddot}},%FIXME
-% producer = {{producer}{producer}},%FIXME
-% producers = {{producers}{producers}},%FIXME
- execproducer = {{producent}{producent}},
-% execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
-% execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
-% execdirectors = {{Executive\space Directors}{Exec\adddot\space Dirs\adddot}},%FIXME
+ jourarticle = {{artikel}{artikel}},
+ tothe = {{til}{til}},%FIXME - I am unsure of the context in which this would appear
+ ofthe = {{af}{af}},%FIXME - I am unsure of the context in which this would appear
+ unitednations = {{Forenede\space Nationer}{FN}},
+ charter = {{pagt}{pagt}},
+ article = {{artikel}{art\adddot}},
+ painting = {{maleri}{maleri}},
+ present = {{pr{\ae}sentation}{pr{\ae}sent\adddot}},
+ song = {{sang}{sang}},
+ album = {{album}{album}},
+ map = {{landkort}{landkort}},
+ photograph = {{fotografi}{fotografi}},
+ photographs = {{fotografier}{fotografier}},
+ powerpoint = {{PowerPoint-slides}{PowerPoint-slides}},
+ lecturenotes = {{forel{\ae}sningsnoter}{forel{\ae}sningsnoter}},
+ podcast = {{podcast}{podcast}},
+ podcastepisode = {{podcastafsnit}{podcastafsnit}},
+ interview = {{interview}{interv\adddot}},
+ speech = {{tale}{tale}},
+ lithograph = {{litografi}{litgr\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{tv-serie}{tv-serie}},
+ tvepisode = {{tv-serie-afsnit}{tv-serie-afsnit}},
+ narrator = {{indtaler}{indt\adddot}},
+ narrators = {{indtalere}{indt\adddot}},
+ producer = {{producer}{producer}},
+ producers = {{producere}{producere}},
+ execproducer = {{ledende\space producer}{led\addot\space prod\adddot}},
+ execproducers = {{ledende\space producere}{led\adddotspace prod\adddot}},
+ execdirector = {{ledende\space instrukt{\o}r}{led\adddotspace instr\adddot}},
+ execdirectors = {{ledende\space instrukt{\o}rer}{led\adddotspace instr\adddot}},
director = {{instrukt{\o}r}{instr\adddot}},
-% directors = {{directors}{dirs\adddot}},%FIXME
- writer = {{manuskript}{manuskript}},
-% writers = {{writers}{writers}},%FIXME
-% host = {{host}{host}},%FIXME
-% hosts = {{hosts}{hosts}},%FIXME
-% guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
-% guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ directors = {{instrukt{\o}rer}{instr\adddot}},
+ writer = {{manuskriptforfatter}{manuskriptforf\adddot}},
+ writers = {{manuskriptforfattere}{manuskriptforf\adddot}},
+ host = {{v{\ae}rt}{v{\ae}rt}},
+ hosts = {{v{\ae}rter}{v{\ae}rter}},
+ guestexpert = {{g{\ae}steekspert}{g{\ae}steeksp\adddot}},
+ guestexperts = {{g{\ae}steeksperter}{g{\ae}steeksp\adddot}},
with = {{med}{med}},
-% manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
-% maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
-% mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
-% supplement = {{supplement}{suppl\adddot}},%FIXME
-% part = {{part}{pt\adddot}},%FIXME
+ manunpub = {{upubliceret}{upubl\adddot}},
+ maninprep = {{under\space udarbejdelse}{under\space udarbejdelse}},%similar to standard biblatex "inpreparation" translation in danish.lbx
+ mansub = {{indsendt\space til\space bed{\o}mmelse}{indsendt\space til\space bed{\o}mmelse}},
+ supplement = {{supplement}{suppl\adddot}},
+ part = {{del}{del}},
revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
-% commenton = {{comment\space on}{comment\space on}},%FIXME
+ commenton = {{kommentar\space p{\aa}}{kommentar\space p{aa}}},% in the context: <comment on the blog post 'xxx'>
page = {{side}{{}s\adddot}},
- pages = {{sider}{{}s\adddot}},
+ pages = {{side}{{}s\adddot}},% in the context <side (s.) 16–17>, English: <pages (pp.) 16–17>. Not plural in Danish.
on = {{p{\aa}}{p{\aa}}},
retrieved = {{hentet}{hentet}},
- available = {{tilgængelig}{tilgængelig}},
+ available = {{tilg{\ae}ngelig}{tilg{\ae}ngelig}},
from = {{fra}{fra}},
archivedat = {{arkiveret\space ved}{arkiveret\space ved}},
reviewof = {{anmeldelse\space af}{anmeldelse\space af}},
-% paragraph = {{paragraph}{para\adddot}},%FIXME
-% paragraphs = {{paragraphs}{paras\adddot}},%FIXME
- january = {{januar}{januar}},
+ paragraph = {{afsnit}{afs\adddot}},
+ paragraphs = {{afsnit}{afs\adddot}},
+ january = {{januar}{januar}},%APA does not like abbreviating months, which the standard biblatex.lbx files do. Thus the months are duplicated here.
february = {{februar}{februar}},
march = {{marts}{marts}},
april = {{april}{april}},
@@ -137,22 +137,22 @@
october = {{oktober}{oktober}},
november = {{november}{november}},
december = {{december}{december}},
- mathesis = {{Speciale}{Speciale}},
- phdthesis = {{Ph.d.-afhandling}{Ph.d.-afhandling}},
- origyear = {{oprindeligt\space offentliggjort}{oprindeligt\space offentliggjort}},
+% mathesis = {{Kandidatspeciale}{Kandidatspeciale}},%not necessary as this translation is already provided from the standard biblatex danish.lbx repo
+% phdthesis = {{PhD-afhandling}{PhD-afhandling}},%not necessary as this translation is already provided from the standard biblatex danish.lbx repo
+ origyear = {{oprindeligt\space offentliggjort}{opr\adddotspace off\adddot}},
typechair = {{ordstyrer}{ordstyrer}},
typechairs = {{ordstyrere}{ordstyrere}},
- typevolume = {{bindredakt{\o}r}{bindred\adddot}},
- typevolumes = {{bindredakt{\o}rer}{bindred\adddot}},
+ typevolume = {{bindredakt{\o}r}{bindred\adddot}},%or 'symposiumredakt{\o}r'
+ typevolumes = {{bindredakt{\o}rer}{bindred\adddot}},%or 'symposiumredakt{\o}r'
typeseries = {{serieredakt{\o}r}{seriered\adddot}},
typeseriess = {{serieredakt{\o}rer}{seriered\adddot}},
typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
-% annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
-% beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
-% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
-% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
-% publication = {{Publication}{Publication}}
+ annodomini = {{e\adddot v\adddot t\adddot}{e\adddot v\adddot t\adddot}},%e.v.t. to keep it religiously neutral
+ beforechrist = {{f\adddot v\adddot t\adddot}{f\adddot v\adddot t\adddot}},%f.v.t. to keep it religiously neutral
+ commonera = {{v\adddot t\adddot}{v\adddot t\adddot}},%vor tidsregning, not applicable in Danish
+ beforecommonera = {{f\adddot v\adddot t\adddot}{f\adddot v\adddot t\adddot}},
+ publication = {{publikation}{publikation}}
}
%
@@ -173,7 +173,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -203,7 +203,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -189,7 +189,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -235,7 +235,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{english}
\NewBibliographyString{publication}
@@ -163,7 +163,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -191,7 +191,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -237,7 +237,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/finnish-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{finnish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{finnish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
% Translations based on:
% https://libguides.oulu.fi/tieteellinentiedonhankinta/apa
@@ -169,7 +169,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -197,7 +197,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -243,7 +243,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{french}
\NewBibliographyString{publication}
@@ -156,7 +156,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -184,7 +184,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -230,7 +230,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -173,7 +173,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -201,7 +201,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -247,7 +247,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
@@ -275,7 +275,39 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \renewcommand{\apashortdash}{~}%
+ \renewcommand*{\mkdaterangeapalongextra}[1]{%
+ \begingroup
+ \blx at metadateinfo{#1}%
+ \iffieldundef{#1year}{}
+ {\printtext[#1date]{%
+ \datecircaprint
+ \ifboolexpr{ test {\iffieldsequal{#1year}{#1endyear}}
+ and test {\iffieldsequal{#1month}{#1endmonth}}}
+ {\iffieldundef{#1endday}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{}{#1day}%
+ \bibdatedash%
+ \mkbibdateapalongextra{}{}{#1month}{#1endday}}}%
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}%
+ \dateeraprint{#1year}%
+ \dateuncertainprint%
+ \ifboolexpr{ not test {\iffieldundef{#1endyear}}
+ and (not test {\iffieldsequal{#1year}{#1endyear}}
+ or not test {\iffieldsequal{#1month}{#1endmonth}})}
+ {\bibdatedash
+ \iffieldequalstr{#1endyear}% open-ended range?
+ {}
+ {\bibstring{present}}}
+ {}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\iffieldsequal{#1month}{#1endmonth}
+ {}
+ {\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}%
+ \dateeraprint{#1endyear}%
+ \enddateuncertainprint}%
+ \endgroup}}%
+\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
@@ -286,7 +318,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +346,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
\NewBibliographyString{publication}
@@ -179,7 +179,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -207,7 +207,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -253,7 +253,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/hungarian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -0,0 +1,248 @@
+\ProvidesFile{hungarian-apa.lbx}[2022/07/25\space APA biblatex localisation - Hungarian]
+\InheritBibliographyExtras{hungarian}
+
+\NewBibliographyString{publication}
+\NewBibliographyString{jourarticle}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commenton}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{writer}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
+\NewBibliographyString{unitednations}
+\NewBibliographyString{charter}
+\NewBibliographyString{ofthe}
+\NewBibliographyString{tothe}
+
+\DeclareBibliographyStrings{%
+ inherit = {hungarian},
+ % deviations from biblatex.lbx
+ andothers = {{\'es munkat\'arsai}{\'es mtsai\adddot}},
+ % continuation of ~-apa.lbx
+ jourarticle = {{foly\'oirat cikk}{cikk}},
+% tothe = {{to\space the}{to\space the}}, % need example
+% ofthe = {{of\space the}{of\space the}}, % need example
+ unitednations = {{Egyes\"ult\space Nemzetek\space Szervezete}{ENSZ}},
+ charter = {{okirat}{okirat}},
+ article = {{\'ujs\'agcikk}{\'ujs\'agcikk}},
+ painting = {{festm\'eny}{festm\'eny}},
+ present = {{jelenkor}{jelen}},
+ song = {{dal}{dal}},
+ album = {{album}{album}},
+ map = {{t\'erk\'ep}{t\'erk\'ep}},
+ photograph = {{f\'enyk\'ep}{f\'enyk\'ep}},
+ photographs = {{f\'enyk\'epek}{f\'enyk\'epek}},
+ powerpoint = {{Powerpoint\space dia}{Powerpoint\space dia}},
+ lecturenotes = {{el\H{o}adas jegyzet}{jegyzet}},
+ podcast = {{podcast}{podcast}},
+ podcastepisode = {{podcast\space epiz\'od}{podcast\space ep\adddot}},
+ interview = {{interj\'u}{interj\'u}},
+ speech = {{hangfelv\'etel}{hangfelv\adddot}},
+ lithograph = {{k\H{o}nyomat}{k\H{o}nyomat}},
+ video = {{vide\'o}{vide\'o}},
+ film = {{film}{film}},
+ tvseries = {{t\'elev\'izi\'os\space sorozat}{t\'ev\'esorozat}},
+ tvepisode = {{t\'elev\'izi\'ossorozat-epiz\'od}{t\'ev\'esorozat-epiz\'od}},
+ narrator = {{narr\'ator}{narr\adddot}},
+ narrators = {{narr\'ator}{narr\adddot}},
+ producer = {{gy\'art\'svezet\H{o}}{producer}},
+ producers = {{gy\'art\'svezet\H{o}k}{producerek}},
+ execproducer = {{f\H{o}gy\'art\'svezet\H{o}}{f\H{o}gy\'art\'svezet\H{o}}},
+ execproducers = {{f\H{o}gy\'art\'svezet\H{o}k}{f\H{o}gy\'art\'svezet\H{o}k}},
+ execdirector = {{\"ugyvezet\H{o}\space igazgat\'o}{\"ugyv\adddotspace ig\adddot}},
+ execdirectors = {{\"ugyvezet\H{o}\space igazgat\'ok}{\"ugyv\adddotspace ig\adddot}},
+ director = {{igazgat\'o}{ig\adddot}},
+ directors = {{igazgat\'ok}{ig\adddot}},
+ writer = {{\'ir\'o}{\'ir\'o}},
+ writers = {{\'ir\'ok}{\'ir\'ok}},
+ host = {{m\H{u}sorvezet\H{o}}{m\H{u}sorvez\adddot}},
+ hosts = {{m\H{u}sorvezet\H{o}k}{m\H{u}sorvez\adddot}},
+ guestexpert = {{vend\'egszak\'ert\H{o}}{vend\'egszak\'ert\H{o}}},
+ guestexperts = {{vend\'egszak\'ert\H{o}k}{vend\'egszak\'ert\H{o}k}},
+ % with = {{with}{with}}, % in Hungarian syntax might be "and" unless order is changed since agglutinative
+ manunpub = {{kiadatlan\space k\'ezirat}{kiadatlan\space k\'ezirat}},
+ maninprep = {{k\'ezirat\space szerkeszt\'es\space alatt}{k\'ezirat\space szerkeszt\'es\space alatt}},
+ mansub = {{k\'ezirat\space kiad\'as\space alatt}{k\'ezirat\space kiad\'as\space alatt}},
+ supplement = {{p\'otk\"otet}{p\'otk\"otet}},
+ part = {{r\'esz}{r\adddot}},
+ revisededition = {{\'atdolgozott\space kiad\'as}{\'atdolg.\adddotspace kiad\adddot}},
+ % commenton = {{comment\space on}{comment\space on}}, % need example
+ page = {{oldal}{{}o\adddot}},
+ pages = {{oldal}{{}o\adddot}},
+ % on = {{on}{on}}, % FIXME example needed, also word order
+ % retrieved = {{retrieved}{retrieved}},
+ % available = {{available}{available}},
+ % from = {{from}{from}}, % FIXME example needed, also word order
+ archivedat = {{archiv\'al\'as\space ideje}{arch\adddotspace id\adddot}},
+ reprintas = {{ut\'annyom\'as\space c\'ime}{ut\'anny\adddotspace c\'ime}},
+ reprintfrom = {{ut\'annyom\'as\space forr\'asa}{ut\'anny\adddotspace forr\'asa}},
+ reviewof = {{recenz\'alt\space m\H{u}}{recenz\'alt\space m\H{u}}},
+ paragraph = {{bekezd\'es}{bek\adddot}},
+ paragraphs = {{bekezd\'es}{bek\adddot}},
+ mathesis = {{szakdolgozat}{szakdolg\adddot}},
+ phdthesis = {{doktori\space disszert\'aci\'o}{disszert\adddot}},
+ origyear = {{eredeti\space kiad\'as\space ideje}{eredetileg\space kiadva}},
+ typechair = {{tansz\'ekvezet\H{o}}{tansz\'ekv\adddot}},
+ typechairs = {{tansz\'ekvezet\H{o}}{tansz\'ekv\adddot}},
+ typevolume = {{k\"otetszerkeszt\H{o}}{k\"otetszerk\adddot}},
+ typevolumes = {{k\"otetszerkeszt\H{o}k}{k\"otetszerk\adddot}},
+ typeseries = {{sorozatszerkeszt\H{o}}{sorozatszerk\adddot}},
+ typeseriess = {{sorozatszerkeszt\H{o}k}{sorozatszerk\adddot}},
+ typevolseries = {{sorozat-\space \'es\space k\"otetszerkeszt\H{o}}{sor\adddotspace \'es\space k\"otetszerk\adddot}},
+ typevolseriess = {{sorozat-\space \'es\space k\"otetszerkeszt\H{o}k}{sor\adddotspace \'es\space k\"otetszerk\adddot}},
+ annodomini = {{Kr\adddotspace u\adddot}{Kr\adddotspace u\adddot}},
+ beforechrist = {{Kr\adddotspace e\adddot}{Kr\adddotspace e\adddot}},
+ commonera = {{i\adddotspace sz\adddot}{i\adddotspace sz\adddot}},
+ beforecommonera = {{i\adddotspace e\adddot}{i\adddotspace e\adddot}},
+ publication = {{publik\'aci\'o}{publ\adddot}}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Drop end* when they are the same as *
+% You must use \print*date to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3#4{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#2}% YEARDIVISION
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
+ \iffieldundef{#3}% MONTH
+ {}%
+ {\mkbibmonth{\thefield{#3}}}%
+ \iffieldundef{#4}% DAY
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#4}}%
+ \iffieldundef{#1}% YEAR
+ {}%
+ {\iffieldundef{#4}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}}%
+ {\addcomma\addspace}%
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -189,7 +189,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -235,7 +235,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
@@ -286,7 +286,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +314,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
@@ -131,7 +131,7 @@
\DeclareBibliographyStrings{%
inherit = {ngerman},
- inpress = {{\midsentence{}im Druck}{\midsentence{}im Druck}}, % adding \midsentence is a fix as this is supposed to begin lower case in every instance (in citations as well as references) according to the DGP's Richtlinien zur Manuskriptgestaltung (German APA)
+ inpress = {{im Druck}{im Druck}},
jourarticle = {{Artikel}{Artikel}},
tothe = {{zur}{zur}},
ofthe = {{der}{der}},
@@ -271,12 +271,39 @@
wyoming = {{Wyoming}{{W\adddot Y\adddot}}}
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Drop end* when they are the same as *
-% You must use \printdate to get here otherwise it will be ignored
-
\DeclareBibliographyExtras{%
+ \renewcommand*{\mkdaterangeapalongextra}[1]{%
+ \begingroup
+ \blx at metadateinfo{#1}%
+ \iffieldundef{#1year}{}
+ {\printtext[#1date]{%
+ \datecircaprint
+ \ifboolexpr{ test {\iffieldsequal{#1year}{#1endyear}}
+ and test {\iffieldsequal{#1month}{#1endmonth}}}
+ {\iffieldundef{#1endday}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{}{#1day}%
+ \bibdatedash%
+ \mkbibdateapalongextra{}{}{#1month}{#1endday}}}%
+ {\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}%
+ \dateeraprint{#1year}%
+ \dateuncertainprint%
+ \ifboolexpr{ not test {\iffieldundef{#1endyear}}
+ and (not test {\iffieldsequal{#1year}{#1endyear}}
+ or not test {\iffieldsequal{#1month}{#1endmonth}})}
+ {\bibdatedash
+ \iffieldequalstr{#1endyear}% open-ended range?
+ {}
+ {\bibstring{present}}}
+ {}%
+ \iffieldsequal{#1year}{#1endyear}
+ {\iffieldsequal{#1month}{#1endmonth}
+ {}
+ {\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}%
+ \dateeraprint{#1endyear}%
+ \enddateuncertainprint}%
+ \endgroup}}%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3#4{%
@@ -288,7 +315,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -316,7 +343,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -364,10 +391,10 @@
{\addspace}%
\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
-\UndeclareBibliographyExtras{%
- \restorecommand\mkdaterangeapalong
- \restorecommand\mkdaterangeapalongextra
-}
+% \UndeclareBibliographyExtras{%
+% \restorecommand\mkdaterangeapalong
+% \restorecommand\mkdaterangeapalongextra
+% }
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
\NewBibliographyString{publication}
@@ -122,7 +122,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -152,7 +152,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -200,7 +200,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
\NewBibliographyString{publication}
@@ -160,7 +160,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -190,7 +190,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -238,7 +238,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
@@ -5,6 +5,7 @@
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
\NewBibliographyString{publication}
+\NewBibliographyString{jourarticle}
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -177,7 +178,7 @@
execdirectors = {{ausf\adddot\space Reg\adddot}{ausf\adddot\space Reg\adddot}},
director = {{Reg\adddot}{Reg\adddot}},
directors = {{Reg\adddot}{Reg\adddot}},
- writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}}
+ writer = {{Autor\addslash\nbhyphen{}in}{Autor\addslash\nbhyphen{}in}},
% writers = {{writers}{writers}},%FIXME
host = {{Gastgeber\addslash\nbhyphen{}in}{Gastgeber\addslash\nbhyphen{}in}},
% hosts = {{hosts}{hosts}},%FIXME
@@ -189,6 +190,7 @@
mansub = {{Manuskript\space eingereicht\space zur\space Publikation}{Manuskript\space eingereicht\space zur\space Publikation}},
supplement = {{Supplement}{Suppl\adddot}},
% part = {{part}{pt\adddot}},%FIXME
+ abstract = {{Abstract}{Abstract}},
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
% commenton = {{comment\space on}{comment\space on}},%FIXME
@@ -215,6 +217,7 @@
% beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
% commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
% beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
+ nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}},
% publication = {{Publication}{Publication}},
alabama = {{Alabama}{{A\adddot L\adddot}}},
alaska = {{Alaska}{{A\adddot K\adddot}}},
@@ -285,7 +288,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -313,7 +316,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -366,7 +369,6 @@
\restorecommand\mkdaterangeapalongextra
}
-
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
\NewBibliographyString{publication}
@@ -161,7 +161,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -191,7 +191,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -239,7 +239,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
\NewBibliographyString{publication}
@@ -158,7 +158,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -186,7 +186,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -232,7 +232,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
\NewBibliographyString{publication}
@@ -168,7 +168,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -198,7 +198,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -245,6 +245,6 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
\NewBibliographyString{publication}
@@ -196,7 +196,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -226,7 +226,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -274,7 +274,7 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -173,7 +173,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -201,7 +201,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
\NewBibliographyString{publication}
@@ -158,7 +158,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -188,7 +188,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -236,6 +236,6 @@
{\iffieldundef{#3}%
{}%
{\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
@@ -286,7 +286,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
@@ -314,7 +314,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx 2023-03-20 20:29:55 UTC (rev 66604)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/turkish-apa.lbx 2023-03-20 20:31:17 UTC (rev 66605)
@@ -1,4 +1,4 @@
-\ProvidesFile{turkish-apa.lbx}[2022/06/22\space v9.16\space APA biblatex localisation]
+\ProvidesFile{turkish-apa.lbx}[2023/03/20\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{turkish}
\NewBibliographyString{publication}
@@ -277,7 +277,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -305,7 +305,7 @@
{}%
\iffieldundef{#1}% YEAR
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ {\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
@@ -351,7 +351,7 @@
{}%
{\addspace}}%
{\addcomma\addspace}%
- \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+ \iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
More information about the tex-live-commits
mailing list.