diff options
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib')
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile | 4 | ||||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md | 5 | ||||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf | bin | 465495 -> 465824 bytes | |||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf | bin | 473027 -> 473527 bytes | |||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf | bin | 469483 -> 470053 bytes | |||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx | 1023 | ||||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf | bin | 597953 -> 637441 bytes | |||
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf | bin | 469617 -> 469903 bytes |
8 files changed, 811 insertions, 221 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile index c51927feb8..c3e48e3484 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile @@ -3,8 +3,8 @@ PFX = biblatex- STY1 = oxnotes STYS = oxnotes oxyear oxnum oxalph VARS = ibid note inote trad1 trad2 trad3 -LANGS = american british english spanish -LANGX = spanish +LANGS = american british english spanish polish +LANGX = spanish polish TESTS = $(STYS) $(foreach sty, $(STYS), $(LANGX:%=%-$(sty))) AUX = aux,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,toc,vrb SHELL = bash diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md index c8b147bc81..a6d358af66 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md @@ -46,7 +46,7 @@ UNIX-like systems: oxnotes-trad1.cbx, oxnotes-trad2.cbx, oxnotes-trad3.cbx, oxyear.cbx, oxnum.cbx, oxalph.cbx - american-oxref.lbx, british-oxref.lbx, english-oxref.lbx, - spanish-oxref.lbx + spanish-oxref.lbx, polish.lbx - oxnotes.dbx, oxnotes-ibid.dbx, oxnotes-note.dbx, oxnotes-inote.dbx, oxnotes-trad1.dbx, oxnotes-trad2.dbx, oxnotes-trad3.dbx, oxyear.dbx, oxnum.dbx, oxalph.dbx @@ -89,7 +89,8 @@ first two steps. american-oxref.lbx, british-oxref.lbx, english-oxref.lbx, - spanish-oxref.lbx + spanish-oxref.lbx, + polish-oxref.lbx, oxalph.bbx, oxalph.cbx, oxalph.dbx, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf Binary files differindex 0ce372ce9b..464db54ffe 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf Binary files differindex 649083bbef..4ce50328b3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf Binary files differindex 7c8b8360de..cde0ea096b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx index 8c8c94d432..18bf56b898 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -87,6 +87,10 @@ \ProvidesFile{spanish-oxref.lbx} [\Version\space Spanish conventions required by the biblatex-oxref styles] %</lbx&es> +%<*lbx&pl> +\ProvidesFile{polish-oxref.lbx} + [\Version\space Polish conventions required by the biblatex-oxref styles] +%</lbx&pl> %<*doc&n> \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] @@ -220,6 +224,7 @@ Copyright (C) 2016–2023 Alex Ball \file{british-\jobname.lbx}{\from{\jobname.dtx}{lbx,gb}} \file{english-\jobname.lbx}{\from{\jobname.dtx}{lbx,en}} \file{spanish-\jobname.lbx}{\from{\jobname.dtx}{lbx,es}} + \file{polish-\jobname.lbx}{\from{\jobname.dtx}{lbx,pl}} \file{oxnotes-doc.tex}{\from{\jobname.dtx}{doc,n}} \file{oxnum-doc.tex}{\from{\jobname.dtx}{doc,m}} \file{oxalph-doc.tex}{\from{\jobname.dtx}{doc,a}} @@ -659,18 +664,24 @@ Copyright (C) 2016–2023 Alex Ball \newcounter{elementcount} \newcommand{\commaorandlist}[1]{% + % Counting up \renewcommand*{\do}[1]{\stepcounter{elementcount}}% \dolistloop{#1}% \ifnumgreater{\value{elementcount}}{2}{% - \def\finaland{, and }% + \def\thisfinaland{,\space and\space}% }{% - \def\finaland{ and }% + \def\thisfinaland{\space and\space}% }% + % Counting back down \renewcommand*{\do}[1]{% - \ifnumequal{\value{elementcount}}{1}{% - ##1% + \ifnumgreater{\value{elementcount}}{2}{% antipenultimate or earlier + ##1,\space }{% - \ifnumequal{\value{elementcount}}{2}{#1\finaland}{##1, }% + \ifnumequal{\value{elementcount}}{2}{% penultimate + ##1\thisfinaland + }{% last + ##1% + }% }% \addtocounter{elementcount}{-1}% }% @@ -678,6 +689,7 @@ Copyright (C) 2016–2023 Alex Ball \author{Alex Ball} \listadd\thetranslators{Bruno Maltras} +\listadd\thetranslators{Sebastian Wasiuta} \date{\printdateTeX{\filedate}} \begin{document} \thispagestyle{empty} @@ -799,7 +811,7 @@ UNIX-like systems: oxnotes-trad1.cbx, oxnotes-trad2.cbx, oxnotes-trad3.cbx, oxyear.cbx, oxnum.cbx, oxalph.cbx - american-oxref.lbx, british-oxref.lbx, english-oxref.lbx, - spanish-oxref.lbx + spanish-oxref.lbx, polish.lbx - oxnotes.dbx, oxnotes-ibid.dbx, oxnotes-note.dbx, oxnotes-inote.dbx, oxnotes-trad1.dbx, oxnotes-trad2.dbx, oxnotes-trad3.dbx, oxyear.dbx, oxnum.dbx, oxalph.dbx @@ -842,7 +854,8 @@ first two steps. american-oxref.lbx, british-oxref.lbx, english-oxref.lbx, - spanish-oxref.lbx + spanish-oxref.lbx, + polish-oxref.lbx, oxalph.bbx, oxalph.cbx, oxalph.dbx, @@ -1663,9 +1676,12 @@ This can be set globally or on a per-type or per-entry basis. \section{Works in foreign languages} -If you used a foreign language work, you might want to recommend a good translation. +If you used a work in a different language from the one in which you are currently writing, +you might want to recommend a good translation into the latter language. -\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.} +\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}. + The localized bibstring reflects the current localization language: + \enquote{English translation}, \enquote{traducido espa\~nol}, and so on.} \begin{bibexbox} %<n|m><NHR \S18.2.5*> @@ -1691,7 +1707,8 @@ If you used a foreign language work, you might want to recommend a good translat \end{Verbatim} \end{bibexbox} -\tip{To specify the translator up front, set the \code{relatedtype} to \code{bytranslator} instead.} +\tip{To specify the translator up front, or to recommend a translation into a third language, + set the \code{relatedtype} to \code{bytranslator} instead.} \begin{bibexbox} %<n|m><NHR \S18.2.14> @@ -7770,6 +7787,7 @@ rather than \pkg[biblatex]{oxref}.} \newcommand*{\uscasetitlepunct}{\addcomma\space} \renewcommand*{\relateddelim}{\addsemicolon\space} \DeclareDelimFormat{revsdnamedelim}{\addcomma} +\DeclareDelimFormat[pair]{revsdnamedelim}{} \DeclareDelimFormat{authortypedelim}{\addspace} \DeclareDelimFormat{editortypedelim}{\addspace} \DeclareDelimFormat{translatortypedelim}{\addspace} @@ -7846,7 +7864,7 @@ rather than \pkg[biblatex]{oxref}.} and test {\ifdefvoid{#2}}% }{}{% - \printdelim{revsdnamedelim}}% + \printdelim{revsdnamepunct}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% }{% @@ -7861,7 +7879,7 @@ rather than \pkg[biblatex]{oxref}.} and test {\ifdefvoid{#3}}% }{}{% - \printdelim{revsdnamedelim}}% + \printdelim{revsdnamepunct}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}} @@ -7871,9 +7889,22 @@ rather than \pkg[biblatex]{oxref}.} % the bibliography, but in natural order in citations. We implement this, along % with the case changing option, in the following name format. We also add a % second hash for checking if names (e.g.\@ |author| and |authoraddon|) are the -% same. +% same. We only need |name:revsdelim| on the first item, and only if it will be +% followed by something else. % % \begin{macrocode} +\renewbibmacro*{name:revsdelim}{% + \ifboolexpr{ + ( + test {\ifnumequal{\value{liststop}}{1}} + and + test \ifmorenames + ) + or + test {\ifnumequal{\value{liststop}}{2}} + } + {\printdelim{revsdnamedelim}} + {}} \def\blx@ox@lasthash{} \DeclareNameFormat{bib-family-given/cite-given-family}{% \iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}% @@ -7918,13 +7949,22 @@ rather than \pkg[biblatex]{oxref}.} \renewcommand*{\mkbibnametitle}[1]{##1}% }{}% \ifboolexpe{% - test {\ifnumgreater{\value{listcount}}{1}} - or ( + test {\ifnumequal{\value{listcount}}{\@ne}} + and + ( + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} + or + test {\ifandothers{\currentname}} + ) + and not + ( test {\ifdefvoid\namepartgiven} and test {\ifdefvoid\namepartprefix} ) - }{}{\usebibmacro{name:revsdelim}}% + }{\usebibmacro{name:revsdelim}}{}% }{% % \end{macrocode} % @@ -7967,6 +8007,10 @@ rather than \pkg[biblatex]{oxref}.} \savefield{hash}{\blx@ox@lasthash}% }% \ifitemannotation{inferred}{\bibclosebracket}{}% + \ifitemannotation{variant}{% + \global\settoggle{blx@ox@variantname}{true}% + }{% + \global\settoggle{blx@ox@variantname}{false}}% \usebibmacro{name:andothers}% \iffieldannotation{inferred}{% \ifboolexpr{ @@ -8012,7 +8056,9 @@ rather than \pkg[biblatex]{oxref}.} \usebibmacro{name:andothers}} % \end{macrocode} % -% We do likewise for the regular |family-given| format. +% We do likewise for the regular |family-given| format. Also, we only want to +% use the |name:revsdelim| on the last name in the list if it will be followed +% by \enquote{et al.}. % % \begin{macrocode} \DeclareNameFormat{family-given}{% @@ -8035,13 +8081,20 @@ rather than \pkg[biblatex]{oxref}.} }{% \global\settoggle{blx@ox@variantname}{false}}% \ifboolexpe{% - test {\ifnumgreater{\value{listcount}}{1}} - or ( + ( + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} + or + test {\ifandothers{\currentname}} + ) + and not + ( test {\ifdefvoid\namepartgiven} and test {\ifdefvoid\namepartprefix} ) - }{}{\usebibmacro{name:revsdelim}}% + }{\usebibmacro{name:revsdelim}}{}% \usebibmacro{name:andothers}} % \end{macrocode} % @@ -8068,21 +8121,46 @@ rather than \pkg[biblatex]{oxref}.} \DeclareFieldFormat{namevariant}{\mkbibparens{\bibstring{equals}\space #1}} % \end{macrocode} % -% We provide an alternative method that uses new name fields |authoraddon| and -% |editoraddon|. To do this, we define a bibmacro that reimplements the loopcode -% logic of \cs{printnames}, but operates on two name lists simultaneously; we use -% saveboxes to extract the hashes, and only print the alternative name if it has -% a different hash. The same technique is used by \textsf{oxyear} below to pair -% up names with the short form used in references, so this bibmacro is written -% to handle both cases. +% We have two use cases for a bibmacro that reimplements the loopcode logic of +% \cs{printnames}, but operates on two name lists simultaneously. One is to +% support the new name fields |authoraddon| and |editoraddon|; the other is to +% pair up names with the short form used in references, as required by +% \textsf{oxyear} below. +% +% We need to do this in a way that doesn't break the patterns used for +% configuring and adapting the punctuation that delimits the list items, so the +% |namepair:delim| macro does the same as |name:delim| but instead of reading +% the current counters, takes two extra arguments (in addition to the current name): +% the number of the current name pair and the total number of name pairs. +% The regular |finallistdelim| delimiter format looks up the value of the +% |liststop| counter, so we need to give it the right value. +% +% \begin{macrocode} +\newbibmacro*{namepair:delim}[3]{% + \ifnumgreater{#2}{\@ne}{% + \ifnumless{#2}{#3}{% + \printdelim{multinamedelim}% + }{% + \ifnumgreater{#3}{\c@maxnames}{% + \c@liststop\c@minnames + }{% + \c@liststop#3}% + \lbx@finalnamedelim{#1}}% + }{}} +% \end{macrocode} % % The |namepairs| bibmacro takes two arguments: the data fields holding the main -% name and alternative name respectively. +% name and alternative name respectively. When rendering the names, we use +% saveboxes to extract the hashes, and only print the alternative name if it has +% a different hash. In this case, we also switch to the \enquote{pair} +% delimiter context, where the |revsdnamedelim| (if any) is suppressed. % % \begin{macrocode} +\DeclareFieldFormat{expanded}{\mkbibparens{#1}} \newcounter{namepairs} \newsavebox{\blx@ox@namebox} \newsavebox{\blx@ox@altnamebox} +\newtoggle{blx@ox@thispairvariant}% \newbibmacro*{namepairs}[2]{% \setcounter{namepairs}{0}% \savebibmacro{name:andothers}% @@ -8106,21 +8184,19 @@ rather than \pkg[biblatex]{oxref}.} ) }{% \stepcounter{namepairs}% - \ifnumgreater{\value{namepairs}}{1}{% - \ifnumequal{\value{#1}}{2}{% - \setunit*{\addspace\bibstring{and}\addspace}% - }{% - \ifnumequal{\value{namepairs}}{\value{#1}}{% - \setunit*{\addcomma\space\bibstring{and}\addspace}% - }{% - \setunit*{\addcomma\space}% - }% - }% - }{}% \savebox{\blx@ox@namebox}{% \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% }% \let\blx@ox@firsthash=\blx@ox@lasthash + \savebox{\blx@ox@altnamebox}{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + }% + \let\blx@ox@secondhash=\blx@ox@lasthash + \iftoggle{blx@ox@variantname}{% + \toggletrue{blx@ox@thispairvariant}% + }{% + \togglefalse{blx@ox@thispairvariant}% + }% % \end{macrocode} % % This is the part intended for |authoraddon| and |editoraddon|. Note that it @@ -8128,20 +8204,28 @@ rather than \pkg[biblatex]{oxref}.} % % \begin{macrocode} \IfEndWith{#2}{addon}{% - \savebox{\blx@ox@altnamebox}{% - \printnames[by#1][\value{namepairs}-\value{namepairs}]{#2}% - }% - \let\blx@ox@secondhash=\blx@ox@lasthash + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}% \ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{% - \unhbox\blx@ox@namebox + \hbox{}\unhbox\blx@ox@namebox }{% - \unhbox\blx@ox@namebox\addspace - \iftoggle{blx@ox@variantname}{% + \iftoggle{blx@ox@thispairvariant}{% \ifbibliography{% - \printtext[namevariant]{\printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}% - }{}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + \setunit{\addspace}% + \printtext[namevariant]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}% + }{% + \hbox{}\unhbox\blx@ox@namebox + }% }{% - \printtext[nameaddon]{\unhbox\blx@ox@altnamebox}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + \setunit{\addspace}% + \printtext[nameaddon]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + }% }% }% % \end{macrocode} @@ -8152,15 +8236,19 @@ rather than \pkg[biblatex]{oxref}.} % % \begin{macrocode} }{% - \savebox{\blx@ox@altnamebox}{% - \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% - }% - \let\blx@ox@secondhash=\blx@ox@lasthash \ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{% - \unhbox\blx@ox@namebox + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}% + \hbox{}\unhbox\blx@ox@namebox }{% - \unhbox\blx@ox@altnamebox - \addspace\mkbibparens{\unhbox\blx@ox@namebox}% + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@altnamebox}{\value{namepairs}}{\value{#1}}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + \setunit{\addspace}% + \printtext[expanded]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + }% }% }% }% @@ -8725,7 +8813,7 @@ rather than \pkg[biblatex]{oxref}.} \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {\mkcomprange{#1}}% - {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}% + {\mkpageprefix[bookpagination][\mkcomprange]{#1}}% } % \end{macrocode} % @@ -8735,7 +8823,7 @@ rather than \pkg[biblatex]{oxref}.} \DeclareFieldFormat{postnote}{% \iffieldundef{pagination}% {\mkcomprange{#1}}% - {\mkcomprange[{\mkpageprefix}]{#1}}% + {\mkpageprefix[pagination][\mkcomprange]{#1}}% } % \end{macrocode} @@ -9299,6 +9387,7 @@ rather than \pkg[biblatex]{oxref}.} % considered on request. % % \begin{macrocode} +\newcommand*{\mkvolroman}[1]{\Rn{#1}} \DeclareFieldFormat[book,mvbook,bookinbook,inbook,suppbook,% collection,mvcollection,incollection,suppcollection,% proceedings,mvproceedings,inproceedings,% @@ -9306,11 +9395,11 @@ reference,mvreference,inreference]{volume}{% \IfSubStr{#1}{-}{% \StrCount{#1}{-}[\blx@ox@dashnum]% \StrBefore{#1}{-}[\blx@ox@volnum]% - \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash + \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash \StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]% - \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}% + \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}% }{% - \ifinteger{#1}{\Rn{#1}}{#1}}} + \ifinteger{#1}{\mkvolroman{#1}}{#1}}} % \end{macrocode} % % Where a multi-volume work is more like a series, the volume number and @@ -9377,6 +9466,37 @@ reference,mvreference,inreference]{volume}{% {Valid values are 'in' and 'out'.}}}} % \end{macrocode} % +% If there are the same number of locations and publishers, and there are more +% than one pair, we print them pairwaise rather than in two separate lists. In +% order to do this while retaining the normal mechanisms for punctuating the +% list, we need a |listpair:delim| macro similar to |namepair:delim| (above) +% that uses the generic list punctuation. Again, the three arguments are the +% item being printed, the number of the current item pair and the total number +% of item pairs. +% +% \begin{macrocode} +\newbibmacro*{listpair:delim}[3]{% + \ifnumgreater{#2}{\@ne}{% + \ifnumless{#2}{#3}{% + \printdelim{multilistdelim}% + }{% + \c@liststop#3% + \lbx@finallistdelim{#1}}% + }{}} +% \end{macrocode} +% +% We use this as the basis of a list format that will be applied to the location +% element of a location--publisher pair. +% +% \begin{macrocode} +\newcounter{locpubpairs} +\DeclareListFormat{locpub}{% + \usebibmacro{listpair:delim}% + {#1}{\value{locpubpairs}}{\value{location}}% + #1\isdot +} +% \end{macrocode} +% % When citing both the first and a later edition, the first one comes % first, and the later one comes after a semicolon. As per standard % \pkg{biblatex}, the elements of a single edition are separated by commas @@ -9385,7 +9505,7 @@ reference,mvreference,inreference]{volume}{% % origpublisher is also specified. % % \begin{macrocode} -\newcounter{locpubpairs} +\newsavebox{\blx@ox@locbox} \newbibmacro*{edition+publisher+location+date}{% \printlist{origlocation}% \iflistundef{origpublisher}% @@ -9406,10 +9526,11 @@ reference,mvreference,inreference]{volume}{% \setunit*{\addcomma\space}% % \end{macrocode} % -% If there are the same number of locations and publishers, and there -% are more than one pair, we print them pairwaise rather than in two +% As mentioned, if there are the same number of locations and publishers, and +% there are more than one pair, we print them pairwaise rather than in two % separate lists. This uses the same principle as the |namepairs| bibmacro, -% but does not have the list truncation apparatus. +% but does not have the list truncation apparatus. This time we use a savebox +% just for efficiency. % % \begin{macrocode} \ifboolexpr{% @@ -9424,19 +9545,8 @@ reference,mvreference,inreference]{volume}{% test {\ifnumcomp{\value{locpubpairs}}{<}{\value{publisher}}} }{% \stepcounter{locpubpairs}% - \ifnumcomp{\value{locpubpairs}}{>}{1}{% - \ifnumequal{\value{publisher}}{2}{% - \setunit*{\addspace\bibstring{and}\addspace}% - }{% - \ifnumequal{\value{locpubpairs}}{\value{publisher}}{% - \setunit*{\addcomma\space\bibstring{and}\addspace}% - }{% - \setunit*{\addcomma\space}% - }% - }% - }{}% - \printlist[][\value{locpubpairs}-\value{locpubpairs}]{location}% - \setunit*{\addcolon\space}% + \printlist[locpub][\value{locpubpairs}-\value{locpubpairs}]{location}% + \setunit{\addcolon\space}% \printlist[][\value{locpubpairs}-\value{locpubpairs}]{publisher}% }% \restorebibmacro{list:andothers}% @@ -11383,7 +11493,11 @@ reference,mvreference,inreference]{volume}{% \setcounter{blx@tmpcnt}{\value{listcount}}% \addtocounter{blx@tmpcnt}{1}% \ifnumequal{\value{blx@tmpcnt}}{\value{listtotal}}{% - #1\space\bibstring{and}\addspace + \ifnumgreater{\value{listtotal}}{2}{% + #1\finalandcomma\space\bibstring{and}\addspace + }{% + #1\space\bibstring{and}\addspace + } }{% #1\addcomma\space}}}% @@ -14256,11 +14370,6 @@ reference,mvreference,inreference]{volume}{% % \code{authoraddon} has not been provided. % % \begin{macrocode} -\xpatchbibmacro{namepairs}{% - \printnames[by#1]% -}{% - \printnames[#1]% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}} \xpatchbibmacro{author+altauthor}{% \printnames{author}% }{% @@ -15085,7 +15194,7 @@ reference,mvreference,inreference]{volume}{% \InheritBibliographyExtras{english} \DeclareBibliographyExtras{% \def\finalandcomma{\addcomma}% - \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}% + \def\blx@ox@langbibstring#1#2{#1\setunit*{\addspace}\bibstring{#2}}% } \UndeclareBibliographyExtras{% \def\blx@ox@langbibstring#1#2{\bibstring{#2}}% @@ -15296,11 +15405,11 @@ reference,mvreference,inreference]{volume}{% byreviser = {{revised by}{rev\adddot}}, byreviewer = {{reviewed by}{rev\adddot}}, bycollaborator = {{in collaboration with}{in collab\adddotspace with}}, - bytranslator = {{translated \lbx@lfromlang\ by}{trans\adddot\ \lbx@sfromlang}}, + bytranslator = {{translated by}{trans\adddot}}, bycommentator = {{commented by}{comm\adddot}}, byannotator = {{annotated by}{annot\adddot}}, - byeditortr = {{edited and translated \lbx@lfromlang\ by}% - {ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, + byeditortr = {{edited and translated by}% + {ed\adddotspace and trans\adddot}}, byeditorco = {{edited and commented by}% {ed\adddotspace and comm\adddot}}, byeditoran = {{edited and annotated by}% @@ -15311,16 +15420,16 @@ reference,mvreference,inreference]{volume}{% {ed.\adddotspace with foreword}}, byeditoraf = {{edited, with an afterword, by}% {ed.\adddotspace with afterword}}, - byeditortrco = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented by}% - {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortran = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}% - {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by}% - {with introduction, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, - byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by}% - {with foreword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, - byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by}% - {with afterword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, + byeditortrco = {{edited, translated\finalandcomma\ and commented by}% + {ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortran = {{edited, translated\finalandcomma\ and annotated by}% + {ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortrin = {{edited and translated, with an introduction, by}% + {with introduction, ed\adddotspace and trans\adddot}}, + byeditortrfo = {{edited and translated, with a foreword, by}% + {with foreword, ed\adddotspace and trans\adddot}}, + byeditortraf = {{edited and translated, with an afterword, by}% + {with afterword, ed\adddotspace and trans\adddot}}, byeditorcoin = {{edited and commented, with an introduction, by}% {with introduction, ed\adddotspace and comm\adddot}}, byeditorcofo = {{edited and commented, with a foreword, by}% @@ -15333,47 +15442,46 @@ reference,mvreference,inreference]{volume}{% {with foreword, ed\adddotspace and annot\adddot}}, byeditoranaf = {{edited and annotated, with an afterword, by}% {with afterword, ed\adddotspace and annot\adddot}}, - byeditortrcoin = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an introduction, by}% - {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortrcofo = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}% - {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}% - {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}% - {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}% - {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}% - {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - bytranslatorco = {{translated \lbx@lfromlang\ and commented by}% - {trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}% - {trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by}% - {trans\adddot\ \lbx@sfromlang\ with introduction}}, - bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}% - {trans\adddot\ \lbx@sfromlang\ with foreword}}, - bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}% - {trans\adddot\ \lbx@sfromlang\ with afterword}}, - bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}% - {with introduction, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}% - {with foreword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}% - {with afterword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}% - {with introduction, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}% - {with foreword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}% - {with afterword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, + byeditortrcoin = {{edited, translated\finalandcomma\ and commented, with an introduction, by}% + {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortrcofo = {{edited, translated\finalandcomma\ and commented, with a foreword, by}% + {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortrcoaf = {{edited, translated\finalandcomma\ and commented, with an afterword, by}% + {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortranin = {{edited, translated\finalandcomma\ and annotated, with an introduction, by}% + {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortranfo = {{edited, translated\finalandcomma\ and annotated, with a foreword, by}% + {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortranaf = {{edited, translated\finalandcomma\ and annotated, with an afterword, by}% + {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + bytranslatorco = {{translated and commented by}% + {trans\adddotspace and comm\adddot}}, + bytranslatoran = {{translated and annotated by}% + {trans\adddotspace and annot\adddot}}, + bytranslatorin = {{translated, with an introduction, by}% + {trans\adddotspace with introduction}}, + bytranslatorfo = {{translated, with a foreword, by}% + {trans\adddotspace with foreword}}, + bytranslatoraf = {{translated, with an afterword, by}% + {trans\adddotspace with afterword}}, + bytranslatorcoin = {{translated and commented, with an introduction, by}% + {with introduction, trans\adddotspace and comm\adddot}}, + bytranslatorcofo = {{translated and commented, with a foreword, by}% + {with foreword, trans\adddotspace and comm\adddot}}, + bytranslatorcoaf = {{translated and commented, with an afterword, by}% + {with afterword, trans\adddotspace and comm\adddot}}, + bytranslatoranin = {{translated and annotated, with an introduction, by}% + {with introduction, trans\adddotspace and annot\adddot}}, + bytranslatoranfo = {{translated and annotated, with a foreword, by}% + {with foreword, trans\adddotspace and annot\adddot}}, + bytranslatoranaf = {{translated and annotated, with an afterword, by}% + {with afterword, trans\adddotspace and annot\adddot}}, % \end{macrocode} % % The roles expressed as objects and terms for supplementary material % are not abbreviated. % % \begin{macrocode} - withintroduction = {{with an introduction by}{with an introduction by}}, withcommentator = {{with a commentary by}{with a commentary by}}, withannotator = {{with annotations by}{with annotations by}}, withintroduction = {{with an introduction by}{with an introduction by}}, @@ -15428,8 +15536,10 @@ reference,mvreference,inreference]{volume}{% % Languages are abbreviated. % % \begin{macrocode} - langamerican = {{English}{Eng\adddot}}, - langbrazilian = {{Brazilian}{Braz\adddot}}, + langamerican = {{American English}{Amer\adddotspace Eng\adddot}}, + langbasque = {{Basque}{Basq\adddot}}, + langbrazilian = {{Brazilian Portuguese}{Braz\adddotspace Port\adddot}}, + langbulgarian = {{Bulgarian}{Bulg\adddot}}, langcatalan = {{Catalan}{Catal\adddot}}, langcroatian = {{Croatian}{Croat\adddot}}, langczech = {{Czech}{Czech}}, @@ -15439,17 +15549,28 @@ reference,mvreference,inreference]{volume}{% langestonian = {{Estonian}{Eston\adddot}}, langfinnish = {{Finnish}{Finn\adddot}}, langfrench = {{French}{Fr\adddot}}, + langgalician = {{Galician}{Galic\adddot}}, langgerman = {{German}{Ger\adddot}}, langgreek = {{Greek}{Gr\adddot}}, + langhungarian = {{Hungarian}{Hung\adddot}}, langitalian = {{Italian}{It\adddot}}, + langjapanese = {{Japanese}{Jap\adddot}}, langlatin = {{Latin}{Lat\adddot}}, + langlatvian = {{Latvian}{Latv\adddot}}, + langlithuanian = {{Lithuanian}{Lith\adddot}}, + langmarathi = {{Marathi}{Mar\adddot}}, langnorwegian = {{Norwegian}{Norw\adddot}}, langpolish = {{Polish}{Pol\adddot}}, langportuguese = {{Portuguese}{Port\adddot}}, + langromanian = {{Romanian}{Rom\adddot}}, langrussian = {{Russian}{Russ\adddot}}, + langserbian = {{Serbian}{Serb\adddot}}, + langslovak = {{Slovak}{Slovak}}, langslovene = {{Slovene}{Slov\adddot}}, langspanish = {{Spanish}{Sp\adddot}}, langswedish = {{Swedish}{Swed\adddot}}, + langturkish = {{Turkish}{Turk\adddot}}, + langukrainian = {{Ukrainian}{Ukr\adddot}}, } % \end{macrocode} % @@ -15742,11 +15863,11 @@ reference,mvreference,inreference]{volume}{% byfounder = {{fundado por}{fund\adddotspace}}, bycontinuator = {{continuado por}{cont\adddotspace}}, bycollaborator = {{colaboraci\'on de}{col\adddotspace de}}, - bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddotspace \lbx@sfromlang}}, + bytranslator = {{traducido por}{trad\adddotspace}}, bycommentator = {{comentado por}{com\adddotspace}}, byannotator = {{anotado por}{anot\adddotspace}}, - byeditortr = {{editado y traducido \lbx@lfromlang\ por}% - {ed\adddotspace y trad\adddotspace \lbx@sfromlang}}, + byeditortr = {{editado y traducido por}% + {ed\adddotspace y trad\adddotspace}}, byeditorco = {{editado y comentado por}% {ed\adddotspace y com\adddotspace }}, byeditoran = {{edici\'on y notas de}% @@ -15757,16 +15878,16 @@ reference,mvreference,inreference]{volume}{% {ed\adddotspace y pr\'ol\adddotspace}}, byeditoraf = {{edici\'on y ep\'ilogo de}% {ed\adddotspace y ep\'il\adddotspace}}, - byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado por}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddotspace}}, - byeditortran = {{edici\'on, traducci\'on \lbx@lfromlang\ y notas de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y not\adddotspace}}, - byeditortrin = {{edici\'on, traducci\'on \lbx@lfromlang\ e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddotspace}}, - byeditortrfo = {{edici\'on, traducci\'on \lbx@lfromlang\ y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}}, - byeditortraf = {{editado, traducido \lbx@lfromlang\ y epilogado}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}}, + byeditortrco = {{editado, traducido y comentado por}% + {ed.,\addabbrvspace trad\adddotspace y com\adddotspace}}, + byeditortran = {{edici\'on, traducci\'on y notas de}% + {ed.,\addabbrvspace trad\adddotspace y not\adddotspace}}, + byeditortrin = {{edici\'on, traducci\'on e introducci\'on de}% + {ed.,\addabbrvspace trad\adddotspace e intr\adddotspace}}, + byeditortrfo = {{edici\'on, traducci\'on y pr\'ologo de}% + {ed.,\addabbrvspace trad\adddotspace y pr\'ol\adddotspace}}, + byeditortraf = {{editado, traducido y epilogado}% + {ed.,\addabbrvspace trad\adddotspace y ep\'il\adddotspace}}, byeditorcoin = {{editado, comentado e introducido}% {ed.,\addabbrvspace com\adddotspace e intr\adddotspace}}, byeditorcofo = {{edici\'on, comentarios y pr\'ologo de}% @@ -15779,40 +15900,40 @@ reference,mvreference,inreference]{volume}{% {ed.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, byeditoranaf = {{edici\'on, notas y ep\'ilogo de}% {ed.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, - byeditortrcoin = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}}, - byeditortrcofo = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}}, - byeditortrcoaf = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}}, - byeditortranin = {{edici\'on, traducci\'on \lbx@lfromlang, notas e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}}, - byeditortranfo = {{edici\'on, traducci\'on \lbx@lfromlang, notas y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}}, - byeditortranaf = {{edici\'on, traducci\'on \lbx@lfromlang, notas y ep\'ilogo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}}, - bytranslatorco = {{traducci\'on \lbx@lfromlang\ y comentarios de}% - {trad\adddotspace \lbx@sfromlang\ y com\adddotspace}}, - bytranslatoran = {{traducci\'on \lbx@lfromlang\ y notas de}% - {trad\adddotspace \lbx@sfromlang\ y not\adddotspace}}, - bytranslatorin = {{traducci\'on \lbx@lfromlang\ e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang\ e introd\adddotspace}}, - bytranslatorfo = {{traducci\'on \lbx@lfromlang\ y pr\'ologo de}% - {trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}}, - bytranslatoraf = {{traducci\'on \lbx@lfromlang\ y ep\'ilogo de}% - {trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}}, - bytranslatorcoin = {{traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}}, - bytranslatorcofo = {{traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}}, - bytranslatorcoaf = {{traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}}, - bytranslatoranin = {{traducci\'on \lbx@lfromlang, notas e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}}, - bytranslatoranfo = {{traducci\'on \lbx@lfromlang, notas y pr\'ologo}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}}, - bytranslatoranaf = {{traducci\'on \lbx@lfromlang, notas y ep\'ilogo}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}}, + byeditortrcoin = {{edici\'on, traducci\'on, comentarios e introducci\'on de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace e intr\adddotspace}}, + byeditortrcofo = {{edici\'on, traducci\'on, comentarios y pr\'ologo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}}, + byeditortrcoaf = {{edici\'on, traducci\'on, comentarios y ep\'ilogo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}}, + byeditortranin = {{edici\'on, traducci\'on, notas e introducci\'on de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}}, + byeditortranfo = {{edici\'on, traducci\'on, notas y pr\'ologo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, + byeditortranaf = {{edici\'on, traducci\'on, notas y ep\'ilogo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, + bytranslatorco = {{traducci\'on y comentarios de}% + {trad\adddotspace y com\adddotspace}}, + bytranslatoran = {{traducci\'on y notas de}% + {trad\adddotspace y not\adddotspace}}, + bytranslatorin = {{traducci\'on e introducci\'on de}% + {trad\adddotspace e introd\adddotspace}}, + bytranslatorfo = {{traducci\'on y pr\'ologo de}% + {trad\adddotspace y pr\'ol\adddotspace}}, + bytranslatoraf = {{traducci\'on y ep\'ilogo de}% + {trad\adddotspace y ep\'il\adddotspace}}, + bytranslatorcoin = {{traducci\'on, comentarios e introducci\'on de}% + {trad.,\addabbrvspace com\adddotspace e intr\adddotspace}}, + bytranslatorcofo = {{traducci\'on, comentarios y pr\'ologo de}% + {trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}}, + bytranslatorcoaf = {{traducci\'on, comentarios y ep\'ilogo de}% + {trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}}, + bytranslatoranin = {{traducci\'on, notas e introducci\'on de}% + {trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}}, + bytranslatoranfo = {{traducci\'on, notas y pr\'ologo}% + {trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, + bytranslatoranaf = {{traducci\'on, notas y ep\'ilogo}% + {trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, % \end{macrocode} % % The roles expressed as objects and terms for supplementary material @@ -15848,6 +15969,14 @@ reference,mvreference,inreference]{volume}{% % for shorthands and \enquote{at} to cite a page within a range. % % \begin{macrocode} + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, citedas = {{en adelante}{en adelante}}, thiscite = {{en}{en}}, % \end{macrocode} @@ -15855,50 +15984,510 @@ reference,mvreference,inreference]{volume}{% % Languages are abbreviated. % % \begin{macrocode} - langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddotspace}}, - langbrazilian = {{brasile\~no}{por\adddotspace bras\adddotspace}}, - langbulgarian = {{b\'ulgaro}{bul\adddotspace}}, - langcatalan = {{catal\'an}{cat\adddotspace}}, - langcroatian = {{croata}{hrv\adddotspace}}, - langczech = {{checo}{ces\adddotspace}}, - langdanish = {{dan\'es}{dan\adddotspace}}, - langdutch = {{neerland\'es}{nld\adddotspace}}, - langenglish = {{ingl\'es}{ing\adddotspace}}, - langestonian = {{estonio}{est\adddotspace}}, - langfinnish = {{fin\'es}{fin\adddotspace}}, - langfrench = {{franc\'es}{fra\adddotspace}}, - langgalician = {{gallego}{glg\adddotspace}}, - langgerman = {{alem\'an}{ale\adddotspace}}, - langgreek = {{griego}{gr\adddotspace}}, - langhungarian = {{h\'ungaro}{hun\adddotspace}}, - langitalian = {{italiano}{ita\adddotspace}}, - langjapanese = {{japon\'es}{jap\adddotspace}}, - langlatin = {{lat\'in}{lat\adddotspace}}, - langlatvian = {{lituano}{lit\adddotspace}}, - langnorwegian = {{noruego}{nor\adddotspace}}, - langpolish = {{polaco}{pol\adddotspace}}, - langportuguese = {{portugu\'es}{port\adddotspace}}, - langrussian = {{ruso}{rus\adddotspace}}, - langserbian = {{serbio}{srp\adddotspace}}, - langslovak = {{eslovaco}{slk\adddotspace}}, - langslovene = {{esloveno}{slv\adddotspace}}, - langspanish = {{espa\~nol}{esp\adddotspace}}, + langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddot}}, + langbasque = {{vasco}{vasc\adddot}}, + langbrazilian = {{portugu\'es brasile\~no}{por\adddotspace bras\adddot}}, + langbulgarian = {{b\'ulgaro}{bul\adddot}}, + langcatalan = {{catal\'an}{cat\adddot}}, + langcroatian = {{croata}{hrv\adddot}}, + langczech = {{checo}{ces\adddot}}, + langdanish = {{dan\'es}{dan\adddot}}, + langdutch = {{neerland\'es}{nld\adddot}}, + langenglish = {{ingl\'es}{ing\adddot}}, + langestonian = {{estonio}{est\adddot}}, + langfinnish = {{fin\'es}{fin\adddot}}, + langfrench = {{franc\'es}{fra\adddot}}, + langgalician = {{gallego}{glg\adddot}}, + langgerman = {{alem\'an}{ale\adddot}}, + langgreek = {{griego}{gr\adddot}}, + langhungarian = {{h\'ungaro}{hun\adddot}}, + langitalian = {{italiano}{ita\adddot}}, + langjapanese = {{japon\'es}{jap\adddot}}, + langlatin = {{lat\'in}{lat\adddot}}, + langlatvian = {{let\'on}{let\adddot}}, + langlithuanian = {{lituano}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, + langnorwegian = {{noruego}{nor\adddot}}, + langpolish = {{polaco}{pol\adddot}}, + langportuguese = {{portugu\'es}{port\adddot}}, + langrussian = {{ruso}{rus\adddot}}, + langserbian = {{serbio}{srp\adddot}}, + langslovak = {{eslovaco}{slk\adddot}}, + langslovene = {{esloveno}{slv\adddot}}, + langspanish = {{espa\~nol}{esp\adddot}}, langswedish = {{sueco}{sueco}}, - langukrainian = {{ucraniano}{ucr\adddotspace}}, + langturkish = {{turco}{turco}}, + langukrainian = {{ucraniano}{ucr\adddot}}, } % \end{macrocode} % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %</es> +%<*pl> +% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{Polish: polish-oxref.lbx} +% +% \setcounter{FancyVerbLine}{19} +% +% Thanks to Sebastian Wasiuta for contributing these translations and extras. +% +% We load the standard language-specific punctuation and date formatting. +% +% \begin{macrocode} +\InheritBibliographyExtras{polish} +% \end{macrocode} +% +% Here are some additional specific settings we need. +% +% There is no comma after forenames in the inverted position. +% +% \begin{macrocode} +\DeclareBibliographyExtras{% + \DeclareDelimFormat{revsdnamedelim}{}% +% \end{macrocode} +% +% We need to use the right case for month names in treaty execution dates. +% +% \begin{macrocode} + \savecommand\makebbx@dateii + \def\makebbx@dateii#1#2#3{% + \blx@imc@stripzeros{#3}~\lbx@pl@mkbibmonth{#2}% + \space + #1}% +% \end{macrocode} +% +% Volume numbers are expressed in uppercase Roman numerals. +% +% \begin{macrocode} + \savecommand\mkvolroman + \renewcommand*{\mkvolroman}[1]{\RN{#1}}% +% \end{macrocode} +% +% There is no compression of years. +% +% \begin{macrocode} + \savecommand\blx@ox@compyear + \renewcommand*{\blx@ox@compyear}[2]{#2}% +% \end{macrocode} +% +% There is no compression of pagination ranges. +% +% \begin{macrocode} + \savefieldformat{pages}% + \DeclareFieldFormat{pages}{% + \iffieldundef{bookpagination}% + {\mknormrange{#1}}% + {\mkpageprefix[bookpagination][\mknormrange]{#1}}% + }% + \savefieldformat{postnote}% + \DeclareFieldFormat{postnote}{% + \iffieldundef{pagination}% + {\mknormrange{#1}}% + {\mkpageprefix[pagination][\mknormrange]{#1}}% + }% +% \end{macrocode} +% +% We flip the word order when specifying the edition. +% +% \begin{macrocode} + \savefieldformat{edition}% + \DeclareFieldFormat{edition}{% + \ifinteger{#1} + {\bibstring{edition}~\mkbibordedition{#1}} + {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}}% +} +% \end{macrocode} +% +% Lastly we add code to undo these changes before switching to another language. +% +% \begin{macrocode} +\UndeclareBibliographyExtras{% + \DeclareDelimFormat{revsdnamedelim}{\addcomma}% + \restorecommand\makebbx@dateii + \restorecommand\mkvolroman + \restorecommand\blx@ox@compyear + \restorefieldformat{pages}% + \restorefieldformat{postnote}% + \restorefieldformat{edition}% +} +% \end{macrocode} +% +% We load the standard set of localization strings, then add our +% adjustments. +% +% \begin{macrocode} +\DeclareBibliographyStrings{% + inherit = {polish}, +% \end{macrocode} +% +% These are new strings defined by \pkg[biblatex]{oxref}: +% +% \begin{itemize} +% \item Roles expressed as functions +% \end{itemize} +% +% \begin{macrocode} + director = {{re\.{z}yser}{re\.{z}\adddot}}, + directors = {{re\.{z}yserzy}{re\.{z}\adddot}}, + performer = {{wykonawca}{wyk\adddot}}, + performers = {{wykonawcy}{wyk\adddot}}, + reader = {{czytelnik}{czytelnik}}, + readers = {{czytelnicy}{czytelnicy}}, + conductor = {{dyrygent}{dyr\adddot}}, + conductors = {{dyrygenci}{dyr\adddot}}, + serieseditor = {{redaktor serii}{red\adddotspace serii}}, + serieseditors = {{redaktor serii}{red\adddotspace serii}}, + holder = {{w\l a\'{s}ciciel}{w\l a\'{s}ciciel}}, + holders = {{w\l a\'{s}ciciele}{w\l a\'{s}ciciele}}, + editorcm = {{redaktor i~kompilator}{red\adddotspace i~kompilator}}, + editorcms = {{redaktorzy i~kompilatorzy}{red\adddotspace i~kompilatorzy}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Roles expressed as actions +% \end{itemize} +% +% \begin{macrocode} + byperformer = {{wykonawca}{wyk\adddot}}, + bydirector = {{re\.{z}yseria}{re\.{z}\adddot}}, + byreader = {{czyta}{czyta}}, + byconductor = {{kieruje}{kier\adddot}}, + byserieseditor = {{redakcja}{red\adddot}}, + byholder = {{w~posiadaniu}{w~posiadaniu}}, + byeditorcm = {{redakcja i~opracowanie}{red\adddotspace i~oprac\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Publication details +% \end{itemize} +% +% \begin{macrocode} + facsimile = {{wydanie faksymile}{wyd\adddotspace faksymile}}, + revised = {{wydanie poprawione}{wyd\adddotspace popr\adddot}}, + revisedenlarged = {{wydanie poprawione i~rozszerzone}{wyd\adddotspace popr\addotspace i~rozszerz\adddot}}, + revisedreprint = {{przedruk poprawiony}{przedr\adddotspace popr\adddot}}, + suppto = {{dodatek do}{dod\adddotspace do}}, + equals = {{=}{=}}, + original = {{oryginalny}{oryg\adddot}}, + amendedby = {{zmienione przez}{zmien\adddotspace przez}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Publication state +% \end{itemize} +% +% \begin{macrocode} + inpressin = {{z\l o\.{z}one do}{z\l o\.{z}one do}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Pagination +% \end{itemize} +% +% \begin{macrocode} + book = {{ksi\k{e}ga}{ks\adddot}}, + books = {{ksi\k{e}gi}{ks\adddot}}, + canto = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}}, + cantos = {{pie\'{s}ni}{pie\'{s}ni}}, + stanza = {{zwrotka}{zwr\adddot}}, + stanzas = {{zwrotki}{zwr\adddot}}, + act = {{akt}{a\adddot}}, + acts = {{akty}{aa\adddot}}, + scene = {{scena}{sc\adddot}}, + scenes = {{sceny}{sc\adddot}}, + folio = {{karta}{k\adddot}}, + folios = {{karty}{kk\adddot}}, + article = {{artyku\l }{art\adddot}}, + articles = {{artyku\l y}{art\adddot}}, + clause = {{klauzula}{klauz\adddot}}, + clauses = {{klauzule}{klauz\adddot}}, + regulation = {{rozporz\k{a}dzenie}{rozp\adddot}}, + regulations = {{rozporz\k{a}dzenia}{rozp\adddot}}, + rule = {{przepis}{przep\adddot}}, + rules = {{przepisy}{przep\adddot}}, + booktotal = {{ksi\k{e}ga}{ks\adddot}}, + booktotals = {{ksi\k{e}gi}{ks\adddot}}, + cantototal = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}}, + cantototals = {{pie\'{s}ni}{pie\'{s}ni}}, + stanzatotal = {{zwrotka}{zwr\adddot}}, + stanzatotals = {{zwrotki}{zwr\adddot}}, + acttotal = {{akt}{a\adddot}}, + acttotals = {{akty}{aa\adddot}}, + scenetotal = {{scena}{sc\adddot}}, + scenetotals = {{sceny}{sc\adddot}}, + foliototal = {{karta}{k\adddot}}, + foliototals = {{karty}{kk\adddot}}, + articletotal = {{artyku\l }{art\adddot}}, + articletotals = {{artyku\l y}{art\adddot}}, + clausetotal = {{klauzula}{klauz\adddot}}, + clausetotals = {{klauzule}{klauz\adddot}}, + regulationtotal = {{rozporz\k{a}dzenie}{rozp\adddot}}, + regulationtotals = {{rozporz\k{a}dzenia}{rozp\adddot}}, + ruletotal = {{przepis}{przep\adddot}}, + ruletotals = {{przepisy}{przep\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Types +% \end{itemize} +% +% \begin{macrocode} + facebook = {{wpis na Facebooku}{wpis na Facebooku}}, + tweet = {{wpis na Twitterze}{wpis na Twitterze}}, + podcast = {{podcast}{podcast}}, + clip = {{wideo}{wideo}}, + webcast = {{webcast}{webcast}}, + poster = {{plakat}{plakat}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Miscellaneous +% \end{itemize} +% +% \begin{macrocode} + nolocation = {{bez miejsca}{b\adddot m\adddot}}, + modified = {{ostatnio zmodyfikowany}{ostatnio zmodyf\adddot}}, + recorded = {{nagrane}{nagr\adddot}}, + uploaded = {{za\l adowane}{za\l ad\adddot}}, + filed = {{wniesione}{wniesione}}, + issued = {{wydany}{wyd\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Labels +% \end{itemize} +% +% \begin{macrocode} + anon = {{Anonim}{Anon\adddot}}, + pseudo = {{Pseudo-}{Ps\adddot-}}, + urldown = {{pobrane}{pobrane}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Country names, patents, and patent requests, +% \end{itemize} +% +% \begin{macrocode} + countryjp = {{Japonia}{JP}}, + patentjp = {{japo\'{n}ski patent}{jap\adddotspace pat\adddot}}, + patreqjp = {{japo\'{n}ski wniosek patentowy}{jap\adddotspace wniosek pat\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item These are borrowed from other styles. +% \end{itemize} +% +% \begin{macrocode} + 1column = {{jedna kolumna}{1\addnbspace kol\adddot}}, + 2column = {{dwie kolumny}{2\addnbspace kol\adddot}}, + inflayer = {{warstwa ni\.{z}sza}{warstwa ni\.{z}sza}}, + suplayer = {{warstwa wy\.{z}sza}{warstwa wy\.{z}sza}}, + paper = {{gazeta}{gazeta}}, + papyrus = {{papirus}{papirus}}, + parchment = {{pergamin}{pergamin}}, + eucase = {{sprawa}{sprawa}}, + eujoinedcases = {{po\l \k{a}czone sprawy}{po\l \k{a}czone sprawy}}, + commissiondecision = {{decyzja komisji}{decyzja komisji}}, + application = {{wniosek}{wniosek}}, + order = {{polecenie}{polecenie}}, + bill = {{rachunek}{rachunek}}, + draft = {{projekt}{proj\adddot}}, + opened = {{przed\l o\.{z}one do podpisu}{przed\l\adddotspace do podp\adddot}}, + signed = {{podpisane}{podpisane}}, + adopted = {{przyj\k{e}te}{przyj\k{e}te}}, + inforce = {{wesz\l o w~\.{z}ycie}{wesz\l o w~\.{z}ycie}}, +% \end{macrocode} +% +% The rest of these strings are overrides for the standard ones. +% +% \begin{macrocode} + byeditor = {{redakcja}{red\adddot}}, + bycompiler = {{opracowanie}{oprac\adddot}}, + byfounder = {{za\l o\.{z}one przez}{za\l o\.{z}\adddotspace przez}}, + bycontinuator = {{kontynuowane przez}{kont\adddotspace przez}}, + byredactor = {{redakcja}{red\adddot}}, + byreviser = {{poprawki}{popr\adddot}}, + byreviewer = {{recenzja}{rec\adddot}}, + bycollaborator = {{we wsp\'{o}\l pracy z}{we wsp\'{o}\l pr\adddotspace z}}, + bytranslator = {{t\l umaczenie}{t\l um\adddot}}, + bycommentator = {{komentarz}{kom\adddot}}, + byannotator = {{obja\'{s}nienia}{obja\'{s}n\adddot}}, + byeditortr = {{redakcja i~t\l umaczenie}% + {red\adddotspace i~t\l um\adddot}}, + byeditorco = {{redakcja i~komentarz}% + {red\adddotspace i~kom\adddot}}, + byeditoran = {{redakcja i~obja\'{s}nienia}% + {red\adddotspace i~obja\'{s}n\adddot}}, + byeditorin = {{redakcja i~wst\k{e}p}% + {red\adddotspace i~wst\k{e}p}}, + byeditorfo = {{redakcja i~przedmowa}% + {red\adddotspace i~przedm\adddot}}, + byeditoraf = {{redakcja i~pos\l owie}% + {red\adddotspace i~pos\l \adddot}}, + byeditortrco = {{redakcja, t\l umaczenie i~komentarz}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom\adddot}}, + byeditortran = {{redakcja, t\l umaczenie i~obja\'{s}nienia}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n\adddot}}, + byeditortrin = {{redakcja, t\l umaczenie, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace wst\k{e}p}}, + byeditortrfo = {{redakcja, t\l umaczenie, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace przedm\adddot}}, + byeditortraf = {{redakcja, t\l umaczenie, pos\l \adddot}% + {red.,\addabbrvspace t\l um.,\addabbrvspace pos\l \adddot}}, + byeditorcoin = {{redakcja, komentarz, wst\k{e}p}% + {red.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + byeditorcofo = {{redakcja, komentarz i~przedmowa}% + {red.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + byeditorcoaf = {{redakcja, komentarz, pos\l owie}% + {red.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + byeditoranin = {{redakcja, obja\'{s}nienia, wst\k{e}p}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + byeditoranfo = {{redakcja, obja\'{s}nienia, przedmowa}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + byeditoranaf = {{redakcja, obja\'{s}nienia, pos\l owie}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + byeditortrcoin = {{redakcja, t\l umaczenie, komentarz, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + byeditortrcofo = {{redakcja, t\l umaczenie, komentarz, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + byeditortrcoaf = {{redakcja, t\l umaczenie, komentarz, pos\l owie}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + byeditortranin = {{redakcja, t\l umaczenie, obja\'{s}nienia, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + byeditortranfo = {{redakcja, t\l umaczenie, obja\'{s}nienia, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + byeditortranaf = {{redakcja, t\l umaczenie, obja\'{s}nienia, pos\l owie}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + bytranslatorco = {{t\l umaczenie i~komentarz}% + {t\l um\adddotspace i~kom\adddot}}, + bytranslatoran = {{t\l umaczenie i~obja\'{s}nienia}% + {t\l um\adddotspace i~obja\'{s}n\adddot}}, + bytranslatorin = {{t\l umaczenie i~wst\k{e}p}% + {t\l um.,\addabbrvspace wst\k{e}p}}, + bytranslatorfo = {{t\l umaczenie i~przedmowa}% + {t\l um.,\addabbrvspace przedm\adddot}}, + bytranslatoraf = {{t\l umaczenie i~pos\l owie}% + {t\l um.,\addabbrvspace pos\l \adddot}}, + bytranslatorcoin = {{t\l umaczenie, komentarz i~wst\k{e}p}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + bytranslatorcofo = {{t\l umaczenie, komentarz i~przedmowa}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + bytranslatorcoaf = {{t\l umaczenie, komentarz i~pos\l owie}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + bytranslatoranin = {{t\l umaczenie, obja\'{s}nienia i~wst\k{e}p}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + bytranslatoranfo = {{t\l umaczenie, obja\'{s}nienia i~przedmowa}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + bytranslatoranaf = {{t\l umaczenie, obja\'{s}nienia i~pos\l owie}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, +% \end{macrocode} +% +% The roles expressed as objects and terms for supplementary material +% are not abbreviated. +% +% \begin{macrocode} + withcommentator = {{komentarz}{komentarz}}, + withannotator = {{obja\'{s}nienia}{obja\'{s}nienia}}, + withintroduction = {{wst\k{e}p}{wst\k{e}p}}, + withforeword = {{przedmowa}{przedmowa}}, + withafterword = {{pos\l owie}{pos\l owie}}, + introduction = {{wst\k{e}p}{wst\k{e}p}}, +% \end{macrocode} +% +% The translations and abbreviations for some publication details are different. +% +% \begin{macrocode} + newseries = {{nowa seria}{nowa seria}}, + oldseries = {{dawna seria}{dawna seria}}, + edition = {{wydanie}{wyd\adddot}}, + reviewof = {{recenzja}{rec\adddot}}, + reprintfrom = {{przedruk z}{przedr\adddotspace z}}, + translationas = {{t\l umaczenie polskie}{t\l um\adddotspace pol\adddotspace}}, + origpubin = {{pierwodruk w}{pierwodr\adddotspace w}}, +% \end{macrocode} +% +% We use a different translation for \enquote{paragraph}. +% +% \begin{macrocode} + paragraph = {{ust\k{e}p}{ust\adddot}}, + paragraphs = {{ust\k{e}py}{ust\adddot}}, +% \end{macrocode} +% +% \emph{New Hart's Rules} uses \enquote{accessed} for URL dates. +% +% \begin{macrocode} + urlseen = {{dost\k{e}p}{dost\k{e}p}}, +% \end{macrocode} +% +% Scholarly citation terms are abbreviated. Oxford style is to use \enquote{henceforth} +% for shorthands and \enquote{at} to cite a page within a range. +% +% \begin{macrocode} + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, + citedas = {{dalej}{dalej}}, + thiscite = {{na}{na}}, +% \end{macrocode} +% +% Languages are abbreviated. +% +% \begin{macrocode} + langamerican = {{ameryka\'{n}ski angielski}{amer\adddotspace ang\adddot}}, + langbasque = {{baskijski}{bask\adddot}}, + langbrazilian = {{brazylijski portugalski}{braz\adddot port\adddot}}, + langbulgarian = {{bu\l garski}{bu\l g\adddot}}, + langcatalan = {{katalo\'{n}ski}{katal\adddot}}, + langcroatian = {{chorwacki}{chorw\adddot}}, + langczech = {{czeski}{czeski}}, + langdanish = {{du\'{n}ski}{du\'{n}\adddot}}, + langdutch = {{holenderski}{holend\adddot}}, + langenglish = {{angielski}{ang\adddot}}, + langestonian = {{esto\'{n}ski}{est\adddot}}, + langfinnish = {{fi\'{n}ski}{fi\'{n}\adddot}}, + langfrench = {{francuski}{fr\adddot}}, + langgalician = {{galicyjski}{galic\adddot}}, + langgerman = {{niemiecki}{niem\adddot}}, + langgreek = {{grecki}{gr\adddot}}, + langhungarian = {{w\k{e}gierski}{w\k{e}g\adddot}}, + langitalian = {{w\l oski}{w\l \adddot}}, + langjapanese = {{japo\'{n}ski}{jap\adddot}}, + langlatin = {{\l aci\'{n}ski}{\l ac\adddot}}, + langlatvian = {{\l otewski}{\l ot\adddot}}, + langlithuanian = {{litewski}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, + langnorwegian = {{norweski}{norw\adddot}}, + langpolish = {{polski}{pol\adddot}}, + langportuguese = {{portugalski}{port\adddot}}, + langromanian = {{rumu\'{n}ski}{rum\adddot}}, + langrussian = {{rosyjski}{ros\adddot}}, + langserbian = {{serbski}{serb\adddot}}, + langslovak = {{s\l owacki}{s\l c\adddot}}, + langslovene = {{s\l owe\'{n}ski}{s\l owe\'{n}\adddot}}, + langspanish = {{hiszpa\'{n}ski}{hiszp\adddot}}, + langswedish = {{szwedzki}{szw\adddot}}, + langturkish = {{turecki}{tur\adddot}}, + langukrainian = {{ukrai\'{n}ski}{ukr\adddot}}, +} +% \end{macrocode} +% +% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%</pl> % \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{Other languages} % -% Currently \pkg[biblatex]{oxref} only supports English (British and American) -% and Spanish explicitly, but if there is demand more languages may be added. If -% you would like to contribute support for your language, a list of the -% non-standard bibliography strings requiring definition may be found in -% section~\ref{sec:setup}. +% Currently \pkg[biblatex]{oxref} only supports English (British and American), +% Spanish, and Polish explicitly, +% but if there is demand more languages may be added. If you would like to +% contribute support for your language, a list of the non-standard bibliography +% strings requiring definition may be found in section~\ref{sec:setup}. % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %</lbx> diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf Binary files differindex 08147694cc..5834fb1590 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf Binary files differindex 89a6515237..61c1abb84e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf |