summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oscola
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-22 22:03:54 +0000
committerKarl Berry <karl@freefriends.org>2014-05-22 22:03:54 +0000
commitf6f7618b25c3701babe5e37120df36136661f731 (patch)
tree2c259795242738e88dc0f6064d4e7fd06c0ba1d0 /Master/texmf-dist/tex/latex/oscola
parent87b302bc32ce01df3614c7a8e4be887218c657e2 (diff)
oscola (22may14)
git-svn-id: svn://tug.org/texlive/trunk@34207 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oscola')
-rw-r--r--Master/texmf-dist/tex/latex/oscola/english-oscola.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/oscola/oscola.bbx49
-rw-r--r--Master/texmf-dist/tex/latex/oscola/oscola.cbx29
3 files changed, 52 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx b/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx
index 5b746938941..27bef584746 100644
--- a/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx
+++ b/Master/texmf-dist/tex/latex/oscola/english-oscola.lbx
@@ -3,7 +3,7 @@
% oscola.lbx for copyright and licence information
\ProvidesFile{english-oscola.lbx}
-[2013/05/23 v 1.2 Biblatex localisation file for OSCOLA citations]
+[2014/05/22 v 1.4 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english}{english,british,american,
canadian,australian,newzealand,UKenglish,USenglish}
diff --git a/Master/texmf-dist/tex/latex/oscola/oscola.bbx b/Master/texmf-dist/tex/latex/oscola/oscola.bbx
index 11b465395d3..5c6d352c388 100644
--- a/Master/texmf-dist/tex/latex/oscola/oscola.bbx
+++ b/Master/texmf-dist/tex/latex/oscola/oscola.bbx
@@ -1,5 +1,5 @@
% Legal Style Citations using OSCOLA
-% Copyright Paul Stanley 2012
+% Copyright Paul Stanley 2014
% This work consists of oscola.bbx, english-oscola.lbx, oscola.lbx
% and oscola.ist.
% This work may be distributed and/or modified under the
@@ -13,7 +13,7 @@
% This work has the LPPL maintenance status 'maintained'.
% The current maintainer of this work is Paul Stanley (pstanley@essexcourt.net)
-\ProvidesFile{oscola.bbx}[2013/05/23 v1.2 Biblatex bibliography style for OSCOLA standard]
+\ProvidesFile{oscola.bbx}[2014/05/22 v1.4 Biblatex bibliography style for OSCOLA standard]
\RequireBibliographyStyle{authortitle}
@@ -78,7 +78,7 @@
\renewcommand*\bibinitdelim{}
\let\oldbibnamedelima\bibnamedelima
\let\oldbibnamedelimb\bibnamedelimb
-\let\oldbibnamedelimc\bibdamedelimc
+\let\oldbibnamedelimc\bibnamedelimc
\let\oldbibnamedelimd\bibnamedelimd
\let\oldbibnamedelimi\bibnamedelimi
\global\newtoggle{bbx@initsep}
@@ -109,7 +109,7 @@
doi=false,
eprint=false,
usetranslator=true,
- sorting=nity}
+ sorting=niyt}
\urlstyle{rm}% We don't want monospaced urls
@@ -442,6 +442,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareBibliographyDriver{article}{%
+ \bbx@resetpostnotedelim%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -934,6 +935,7 @@
\usebibmacro{editorstrg}%
\clearname{editor}}%
\usebibmacro{byeditorx}%
+ \newunit
\usebibmacro{bytranslator+others}}
\renewbibmacro*{bytypestrg}[2]{%
@@ -1312,7 +1314,7 @@
\printfield[parlt:num]{number}}
\renewbibmacro*{in:}{%
-{\printtext{\space\bibstring{in}\addspace}}}
+{\printtext{\space\midsentence\bibstring{in}\addspace}}}
\newbibmacro{institution+date}{%
\iflistundef{institution}
@@ -2049,10 +2051,11 @@
\renewbibmacro*{url+urldate}{%
\iffieldundef{url}
{}
- {\printfield{url}
+ {\printfield{url}%
\iffieldundef{urlyear}
- {}
+ {}%
{\setunit*{\addspace}%
+ \bbx@resetpostnotedelim%
\printtext{\printurldate}}}}
\newbibmacro{usjuriscitation}{%
@@ -2398,6 +2401,10 @@
\let\bbx@sccases\bbx@trash
\let\bbx@nicases\bbx@trash
\let\bbx@echrcases\bbx@trash
+\let\bbx@aucases\bbx@trash
+\let\bbx@uscases\bbx@trash
+\let\bbx@nzcases\bbx@trash
+\let\bbx@cacases\bbx@trash
\let\bbx@echrcommcases\bbx@trash
\let\bbx@eucases\bbx@trash
\let\bbx@eucasesnum\bbx@trash
@@ -2441,6 +2448,10 @@
\renewcommand\bbx@echrcases{cases}
\renewcommand\bbx@echrcommcases{cases}
\renewcommand\bbx@eucases{cases}
+\renewcommand\bbx@cacases{cases}
+\renewcommand\bbx@uscases{cases}
+\renewcommand\bbx@aucases{cases}
+\renewcommand\bbx@nzcases{cases}
\renewcommand\bbx@eucasesnum{trash}
\renewcommand\bbx@eucaseschron{trash}
\renewcommand\bbx@eucommcases{cases}
@@ -2543,8 +2554,12 @@
{\ifkeyword{eu}{\renewcommand{\bbx@relevantindex}{[\bbx@eucases]}}%
{\ifkeyword{echr}{\renewcommand{\bbx@relevantindex}{[\bbx@echrcases]}}%
{\ifkeyword{int}{\renewcommand{\bbx@relevantindex}{[\bbx@pilcases]}}%
+ {\ifkeyword{us}{\renewcommand{\bbx@relevantindex}{[\bbx@uscases]}}% ADDED
+ {\ifkeyword{ca}{\renewcommand{\bbx@relevantindex}{[\bbx@cacases]}}% ADDED
+ {\ifkeyword{au}{\renewcommand{\bbx@relevantindex}{[\bbx@aucases]}}% ADDED
+ {\ifkeyword{nz}{\renewcommand{\bbx@relevantindex}{[\bbx@nzcases]}}% ADDED
{\iffieldundef{keywords}{\renewcommand{\bbx@relevantindex}{[\bbx@encases]}}
- {\renewcommand{\bbx@relevantindex}{[\bbx@othercases]}}}}}}}}}}%
+ {\renewcommand{\bbx@relevantindex}{[\bbx@othercases]}}}}}}}}}}}}}}%
{}%
\ifboolexpr{ test {\ifentrytype{legal}}%
and test {\iffieldequals{entrysubtype}{\treatysubtype}} }%
@@ -2858,7 +2873,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareSortingScheme{nity}{
+\DeclareSortingScheme{niyt}{
\sort{
\field{presort}
}
@@ -2877,14 +2892,14 @@
\field{maintitle}
}
\sort{
- \field{sorttitle}
- \field{title}
- }
- \sort{
\field{sortyear}
\field{year}
}
\sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
\field[padside=left,padwidth=4,padchar=0]{volume}
\literal{0000}
}
@@ -2956,11 +2971,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareLabeltitle[misc]{%
- \field{shorttitle}
- \field{titleaddon}
- \field{title}}
+ \field{shorttitle}
+ \field{titleaddon}
+ \field{title}}
-\DeclareSourcemap{
+\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
\map[overwrite=false]{
\pertype{jurisdiction}
diff --git a/Master/texmf-dist/tex/latex/oscola/oscola.cbx b/Master/texmf-dist/tex/latex/oscola/oscola.cbx
index 7125ff94ea4..9ef6a26cd63 100644
--- a/Master/texmf-dist/tex/latex/oscola/oscola.cbx
+++ b/Master/texmf-dist/tex/latex/oscola/oscola.cbx
@@ -2,7 +2,7 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{oscola.cbx}[2013/05/23 v1.2 Biblatex citation style for OSCOLA standard]
+\ProvidesFile{oscola.cbx}[2014/05/22 v1.4 Biblatex citation style for OSCOLA standard]
\RequireCitationStyle{verbose-inote}
@@ -388,15 +388,15 @@
{\multicitedelim}
{\usebibmacro{postnote}}
-\DeclareCiteCommand{\textcite}[\cbx@textcite\footciteref]
- {\gdef\cbx@savedkeys{}}
- {\ifboolexpr{ test {\ifentrytype{jurisdiction}} or test{\ifentrytype{legislation}} }
- {\usebibmacro{title:or:shorttitle}}%
- {\printnames{labelname}}%
- \xappto\cbx@savedkeys{\thefield{entrykey},}}
- {\multinamedelim}
- {\protected@xappto\cbx@savedcites{%
- [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+%\DeclareCiteCommand{\textcite}[\cbx@textcite\footciteref]
+% {\gdef\cbx@savedkeys{}}
+% {\ifboolexpr{ test {\ifentrytype{jurisdiction}} or test{\ifentrytype{legislation}} }
+% {\usebibmacro{title:or:shorttitle}}%
+% {\printnames{labelname}}%
+% \xappto\cbx@savedkeys{\thefield{entrykey},}}
+% {\multinamedelim}
+% {\protected@xappto\cbx@savedcites{%
+% [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
\newbibmacro{title:or:shorttitle}{%
\ifciteseen
@@ -410,5 +410,14 @@
{\printfield{shorthand}}}%
{\printfield{title}}}
+\renewbibmacro{textcite}{%
+ \ifentrytype{jurisdiction}
+ {\usebibmacro{title:or:shorttitle}}
+ {\ifentrytype{legislation}
+ {\usebibmacro{title:or:shorttitle}}}
+ {\ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}}}
+
\endinput \ No newline at end of file