summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-22 01:15:02 +0000
committerKarl Berry <karl@freefriends.org>2014-01-22 01:15:02 +0000
commit14b940d3a9e9e7be69d633ba04b359fb4a9e358a (patch)
tree0955cf7b1b482131090e61c9d9b7e3b927d292e5 /Master/texmf-dist/tex
parentaed84d3dacda585be994298bcd449fdb99fa01ab (diff)
biblatex-swiss-legal (21jan14)
git-svn-id: svn://tug.org/texlive/trunk@32750 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.bbx198
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.cbx129
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.bbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-de.lbx533
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-fr.lbx73
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.bbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.bbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.bbx58
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.cbx98
12 files changed, 917 insertions, 232 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.bbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.bbx
index 13041060df0..3ca4226fa81 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.bbx
@@ -1,7 +1,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-BASE : BIBLIOGRAPHY %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,7 +20,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{biblatex-swiss-legal-base.bbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-base.bbx}[2014/01/21 v1.1.2 alpha]
\RequireBiber[2]
@@ -31,6 +31,9 @@
% Commande choisissant le fichier .lbx
\DeclareLanguageMapping{french}{biblatex-swiss-legal-fr}
+\DeclareLanguageMapping{german}{biblatex-swiss-legal-de}
+\DeclareLanguageMapping{germanb}{biblatex-swiss-legal-de}
+\DeclareLanguageMapping{ngerman}{biblatex-swiss-legal-de}
%%%%%%%%%%% NOUVELLES COMMANDES DE BIBLIOGRAPHIE %%%%%%%%%%%%%%%%
@@ -44,15 +47,15 @@
\printbibliography[type=online, heading=subbibliography, title=Sources en ligne]
-\vspace{2cm}
+\bigskip
}
% Commandes pour la citation uniforme des numéros
-\newcommand{\parN}{n$^{\textrm{\tiny{o}}}$\addnbthinspace}
-\newcommand{\parNN}{n$^{\textrm{\tiny{os}}}$\addnbthinspace}
-\newcommand{\chaN}[2]{\S~#1 #2}
-\newcommand{\chaparN}[2]{\S~#1 \parN #2}
-\newcommand{\chaparNN}[2]{\S~#1 \parNN #2}
+
+
+\providecommand{\chaN}[2]{\S~#1 #2}
+\providecommand{\chaparN}[2]{\S~#1 \parN #2}
+\providecommand{\chaparNN}[2]{\S~#1 \parNN #2}
%%%%%%%%%%% OPTIONS DE BIBLIOGRAPHIE ET DE CITATION %%%%%%%%%%%%%%%%
@@ -143,7 +146,7 @@
abbreviate=true,
date=long,
dateabbrev=false,
-ibidtracker=true,
+ibidtracker=context,
maxbibnames=99,
maxcitenames=4,
mincrossrefs=1,
@@ -349,13 +352,13 @@ titleit=true
\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
- \usebibmacro{name:last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{#5}{#7}%
+ \usebibmacro{name:last}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#3}{#5}{#7}%
\or
\ifuseprefix
- {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{#5}{#8}}
- {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{#6}{#8}}%
+ {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#4}{#5}{#8}}
+ {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#4}{#6}{#8}}%
\or
- \usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{#5}{#7}%
+ \usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#3}{#5}{#7}%
\fi
\usebibmacro{name:andothers}}
@@ -364,15 +367,15 @@ titleit=true
\DeclareNameFormat*{author}{%
\iftoggle{bbx:firstnames}%
- {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#3}{#5}{#7}}%
+ {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#3}{}{#7}}%
{\ifcase\value{uniquename}%
- \usebibmacro{name:last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{#5}{#7}%
+ \usebibmacro{name:last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{}{#7}%
\or%
\ifuseprefix
- {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{#5}{#8}}
+ {\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{}{#8}}
{\usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{#6}{#8}}%
\or
- \usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{#5}{#7}%
+ \usebibmacro{name:last-first}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{}{#7}%
\fi
\usebibmacro{name:andothers}}%
}
@@ -385,15 +388,15 @@ titleit=true
\DeclareNameFormat*{translator}{%
\iftoggle{bbx:firstnames}%
- {\usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#3}{#5}{#7}}%
+ {\usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}{#3}{}{#7}}%
{\ifcase\value{uniquename}%
- \usebibmacro{name:last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{#5}{#7}%
+ \usebibmacro{name:last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{}{#7}%
\or%
\ifuseprefix
- {\usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{#5}{#8}}
+ {\usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{}{#8}}
{\usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#4}{#6}{#8}}%
\or
- \usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{#5}{#7}%
+ \usebibmacro{name:first-last}{\ifblank{#5}{}{\textsc{#5}\addspace}#1}{#3}{}{#7}%
\fi
\usebibmacro{name:andothers}}%
}
@@ -424,22 +427,22 @@ titleit=true
\iftoggle{bbx:editorssc}% <= test pour savoir si l'option editorssc est activée.
{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}% Si oui: particule et nom en petites capitales
{\ifblank{#5}{}{\textnormal{#5}\addspace}\textnormal{#1}}%
- }{#3}{#5}{#7}% Prénom
- }%
+ }{#3}{}{#7}% Prénom
+ \ignorespaces}%
{% Les prénoms ne sont pas imprimés donc potentiel besoin de désambiguation
\ifcase\value{uniquename}% A) PAS de désambiguation nécessaire
\usebibmacro{name:last}{%
\iftoggle{bbx:editorssc}% <= test pour savoir si l'option editorssc est activée.
{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}% Si oui: particule et nom en petites capitales
{\ifblank{#5}{}{\textnormal{#5}\addspace}\textnormal{#1}}%
- }{#3}{#5}{#7}%
+ }{#3}{}{#7}%
\or% B) DESAMBIGUATION avec initiales
\ifuseprefix
{\usebibmacro{name:last-first}{%
\iftoggle{bbx:editorssc}% <= test pour savoir si l'option editorssc est activée.
{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}% Si oui: particule et nom en petites capitales
{\ifblank{#5}{}{\textnormal{#5}\addspace}\textnormal{#1}}%
- }{#4}{#5}{#8}}
+ }{#4}{}{#8}}
{\usebibmacro{name:last-first}{%
\iftoggle{bbx:editorssc}% <= test pour savoir si l'option editorssc est activée.
{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}% Si oui: particule et nom en petites capitales
@@ -450,15 +453,15 @@ titleit=true
\iftoggle{bbx:editorssc}% <= test pour savoir si l'option editorssc est activée.
{\ifblank{#5}{}{\textsc{#5}\addspace}\textsc{#1}}% Si oui: particule et nom en petites capitales
{\ifblank{#5}{}{\textnormal{#5}\addspace}\textnormal{#1}}%
- }{#3}{#5}{#7}%
+ }{#3}{}{#7}%
\fi%
}
- \usebibmacro{name:andothers}% Séparations entre les noms
+ \usebibmacro{name:andothers}\ignorespaces% Séparations entre les noms
}
\ifthenelse{\value{listcount}=\value{liststop}}% Mention "(éditeur)": seulement à la fin de la liste
{\ifthenelse{\value{listtotal}=1}% si la liste ne comporte qu'un nom
- {\addspace\mkbibparens{\biblcstring{editor}}}% alors on utilise le string editor
- {\addspace\mkbibparens{\biblcstring{editors}}}% sinon, on utilise le string editors
+ {\addspace\mkbibparens{\bibstring{editor}}}% alors on utilise le string editor
+ {\addspace\mkbibparens{\bibstring{editors}}}% sinon, on utilise le string editors
}%
{}%
}
@@ -746,7 +749,7 @@ titleit=true
{% a) Cas o˘ l'option abrjournal est activée => on vérifie s'il existe un string (cas échéant, on imprime le string en abrégé), puis on imprime la référence de manière raccourcie
\iffieldbibstring{journaltitle}
{% aa) s'il existe un string pour le nom de la revue
- \bibsstring{\thefield{journaltitle}}%
+ \midsentence\bibsstring{\thefield{journaltitle}}% le midsentence empêche la capitalisation automatique après les deux points en allemand
}%
{% bb) s'il n'existe pas de string pour le nom de la revue
\printfield{journaltitle}%
@@ -788,6 +791,18 @@ titleit=true
}
+% considérant et page topique dans la jurisprudence
+
+\newbibmacro{recitalandpage}{%
+\iffieldundef{usere}% Considérant et page topique
+ {}%
+ {\addcomma\addspace\bibsstring{recital}\addspace\printfield{usere}%
+ \iffieldundef{userf}%
+ {}%
+ {\addspace\mkbibparens{\printfield{userf}}}%
+ }%
+}
+
% Référence principale de la jurisprudence
\newbibmacro{mainref}{%
@@ -823,19 +838,15 @@ titleit=true
\iflistundef{language}% Langue de l'arrêt original
{}%
{\addspace\mkbibbrackets{\thelist{language}}}%
-\iffieldundef{usere}% Considérant et page topique
- {}
- {\addcomma\addspace\bibsstring{recital}\addspace\printfield{usere}%
- \iffieldundef{userf}
- {}
- {\addspace\mkbibparens{\printfield{userf}}}
- }%
+\usebibmacro{recitalandpage}%
}
% Liaison entre référence principale et référence secondaire
\newbibmacro{interref}{%
+\iffieldundef{howpublished}{}%
+{%
\iffieldequalstr{howpublished}{publ}% Liaison entre référence principale et secondaire
{\iftoggle{bbx:abrjournal}%
{\newunit}%
@@ -849,7 +860,7 @@ titleit=true
}%
{\printfield{howpublished}}%
\newunit%
-}
+}}
% Pages
@@ -1026,25 +1037,90 @@ titleit=true
% Ibidem
-\newbibmacro{ibidem}{%
-\ifcitation{% N'est utilisé que si l'on est dans une citation
- \iffieldequalstr{entrytype}{customb}%
- {\bibstring{lastruling}}%
- {\iffieldequalstr{entrytype}{jurisdiction}%
- {\bibstring{lastruling}}%
- {\emph{\bibcpstring{ibidem}}}%
- }%
- }%
- {}%
-}
+\newcommand{\bbltxsl@lastrulingcited@text}{}
+\newcommand{\bbltxsl@lastrulingcited@foot}{}
\newcommand{\testibid}[1]{%
-\ifciteibid%
- {\usebibmacro{ibidem}}%
- {#1}%
+\ifcitation{% N'est utilisé que si l'on est dans une citation
+\ifdefequal{\blx@imc@ifciteibid}{\@secondoftwo}% Si l'option ibidtracker=false est activée
+ {#1}% La citation est imprimée sans autre contrôle
+ {% Si n'importe quelle autre variable est utilisée
+\ifthenelse{%
+ \iffieldequalstr{entrytype}{jurisdiction}%
+ }%
+ {% Si type = @jurisdiction
+ \ifdefequal{\blx@imc@ifciteibid}{\blx@ifciteibid@context}% Option ibidtracker=context
+ {%
+ \iftoggle{blx@footnote}%
+ {\iffieldequals{entrykey}{\bbltxsl@lastrulingcited@foot}%
+ {\bibcpstring{lastruling}}% oui = string lastruling
+ {#1\savefield{entrykey}{\bbltxsl@lastrulingcited@foot}}}%
+ {\iffieldequals{entrykey}{\bbltxsl@lastrulingcited@text}%
+ {\bibcpstring{lastruling}}% oui = string lastruling
+ {#1\savefield{entrykey}{\bbltxsl@lastrulingcited@text}}}%
+ }%
+ {%
+ \ifdefequal{\blx@imc@ifciteibid}{\blx@ifciteibid@constrict}% Option ibidtracker=constrict
+ {%
+ \iftoggle{blx@footnote}%
+ {\iffieldequals{entrykey}{\bbltxsl@lastrulingcited@foot}%
+ {\bibcpstring{lastruling}}% oui = string lastruling
+ {#1\savefield{entrykey}{\bbltxsl@lastrulingcited@foot}}}%
+ {\iffieldequals{entrykey}{\bbltxsl@lastrulingcited@text}%
+ {\bibcpstring{lastruling}}% oui = string lastruling
+ {#1\savefield{entrykey}{\bbltxsl@lastrulingcited@text}}}%
+ }%
+ {% Option ibidtracker=true ou Option ibidtracker=strict
+ \iffieldequals{entrykey}{\bbltxsl@lastrulingcited@text}% Si l'arrêt actuel est le même que le précédent cité
+ {\bibcpstring{lastruling}}% oui = string lastruling
+ {#1\savefield{entrykey}{\bbltxsl@lastrulingcited@text}\savefield{crossref}{\bbltxsl@lastrulingcited@foot}}% non = référence normale + enregistrement de l'entrykey actuelle pour le test dans l'entrée suivante
+ }%
+ }%
+ }
+ {% Si type n'est pas @ jurisdiction
+ \iffieldequalstr{entrytype}{customb}% Si type = @customb
+ {%
+ \ifdefequal{\blx@imc@ifciteibid}{\blx@ifciteibid@context}% Option ibidtracker=context
+ {%
+ \iftoggle{blx@footnote}%
+ {\iffieldequals{crossref}{\bbltxsl@lastrulingcited@foot}%
+ {\bibcpstring{lastruling}\newblock\usebibmacro{recitalandpage}}% oui = string lastruling + consid et page
+ {#1\savefield{crossref}{\bbltxsl@lastrulingcited@foot}}}%
+ {\iffieldequals{crossref}{\bbltxsl@lastrulingcited@text}%
+ {\bibcpstring{lastruling}\newblock\usebibmacro{recitalandpage}}% oui = string lastruling + consid et page
+ {#1\savefield{crossref}{\bbltxsl@lastrulingcited@text}}}%
+ }%
+ {%
+ \ifdefequal{\blx@imc@ifciteibid}{\blx@ifciteibid@constrict}% Option ibidtracker=constrict
+ {%
+ \iftoggle{blx@footnote}%
+ {\iffieldequals{crossref}{\bbltxsl@lastrulingcited@foot}%
+ {\bibcpstring{lastruling}\newblock\usebibmacro{recitalandpage}}% oui = string lastruling + consid et page
+ {#1\savefield{crossref}{\bbltxsl@lastrulingcited@foot}}}%
+ {\iffieldequals{crossref}{\bbltxsl@lastrulingcited@text}%
+ {\bibcpstring{lastruling}\newblock\usebibmacro{recitalandpage}}% oui = string lastruling + consid et page
+ {#1\savefield{crossref}{\bbltxsl@lastrulingcited@text}}}%
+ }%
+ {% Option ibidtracker=true ou Option ibidtracker=strict
+ \iffieldequals{crossref}{\bbltxsl@lastrulingcited@text}% Si l'arrêt actuel est le même que le précédent cité
+ {\bibcpstring{lastruling}\newblock\usebibmacro{recitalandpage}}% oui = string lastruling + consid et page
+ {#1\savefield{crossref}{\bbltxsl@lastrulingcited@text}\savefield{crossref}{\bbltxsl@lastrulingcited@foot}}% non = référence normale + enregistrement de l'entrykey actuelle pour le test dans l'entrée suivante
+ }%
+ }%
+ }%
+ {\ifciteibid% Si le type n'est ni @jurisdiction ni @customb.
+ {\emph{\bibcpstring{ibidem}}}%
+ {#1}%
+ \savefield{entrykey}{\bbltxsl@lastrulingcited@text}% Enregistrement de l'entrykey actuelle
+ \savefield{entrykey}{\bbltxsl@lastrulingcited@foot}% Enregistrement de l'entrykey actuelle
+ }%
+ }%
+}}%
+{#1}%
}
-%\testibid{%
+
+
%%%%%%%%%%% DRIVERS %%%%%%%%%%%%%
@@ -1084,7 +1160,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1110,7 +1186,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1136,7 +1212,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1155,7 +1231,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1182,7 +1258,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1336,7 +1412,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1352,7 +1428,7 @@ titleit=true
\usebibmacro{library}%
\usebibmacro{resume}%
\usebibmacro{note}%
- \finentry%
+% \finentry%
}}
@@ -1412,7 +1488,7 @@ titleit=true
\usebibmacro{resume}%
\usebibmacro{note}%
\usebibmacro{library}%
- \finentry%
+% \finentry%
}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.cbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.cbx
index 5f52b3b39fc..45e1dd09f7a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-base.cbx
@@ -1,7 +1,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-BASE : CITATIONS %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,7 +19,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{biblatex-swiss-legal-base.cbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-base.cbx}[2014/01/21 v1.1.2 alpha]
\RequireBibliographyStyle{biblatex-swiss-legal-base}
@@ -174,131 +174,6 @@ not test {\iffieldundef{postnote}}
{\multicitedelim}%
{\usebibmacro{postnote}}%
-%%%%%%%%%%% COMMANDES SPECIFIQUES POUR LES CITATIONS DE JURISPRUDENCE (expérimental) %%%%%%%%%%%
-
-% Commandes pour l'utilisateur
-
-\usepackage{xargs}
-
-\newcommandx{\jdcite}[5][1,2,3,4]{%
-\ifdef{\jurisdiction@prenote}%
- {\renewcommand{\jurisdiction@prenote}{#1}}% Actualisation de la commande \jurisdiction@prenote avec le contenu du champ #1
- {\newcommand{\jurisdiction@prenote}{#1}}%
-\ifdef{\jurisdiction@recital}%
- {\renewcommand{\jurisdiction@recital}{#3}}% Actualisation de la commande \jurisdiction@recital avec le contenu du champ #3
- {\newcommand{\jurisdiction@recital}{#3}}%
-\ifdef{\jurisdiction@page}%
- {\renewcommand{\jurisdiction@page}{#4}}% Actualisation de la commande \jurisdiction@page avec le contenu du champ #4
- {\newcommand{\jurisdiction@page}{#4}}%
-\jurisdiction@cite%
-[#1]%
-[#2]%
-{#5}%
-}
-
-%%% UTILISER ifstrempty pour savoir si un argument est vide => si oui, le redéfinir avec l'argument suivant
-%%% le problème des multicitecommands subsiste. il faudrait essayer de faire un test \value{multicitecount}<{multicitetotal}. Mais ça ne résout de loin pas tous les problèmes.
-
-
-% Interface avec biblatex
-
-\DeclareCiteCommand{\jurisdiction@cite}[]%
- {% PRECODE
- \usebibmacro{prenote}%
- \ifcsempty{jurisdiction@prenote}% test pour savoir s'il y a quelque chose dans le champ optionnel prenote.
- {\bibsentence}% s'il n'y a rien, le bibstring (p. ex. Arrêt précité) suivant est capitalisé
- {\midsentence}% s'il y a quelque chose, le bibstring suivant commence par une minuscule
-}%
- {% LOOPCODE
- \usebibmacro{citeindex}%
-\iffieldequalstr{entrytype}{jurisdiction}% test pour être sur qu'on est dans une fiche @jurisdiction
-{\usebibmacro{jurisdiction@details}}% si c'est bien le cas, on utilise le macro jurisdiction@details
-{% <= Un message d'erreur apparaît si on est pas dans une fiche @jurisdiction
-\PackageError{biblatex-swiss-legal}{Use the \protect\jdcite\space command \MessageBreak ONLY for 'jurisdiction' entry types!}{Replace the entrykey by an \MessageBreak entrykey corresponding to a 'jurisdiction' entry.}%
-}%
-}%
- {\multicitedelim}% SEPCODE
- {\usebibmacro{postnote}}% POSTCODE
-
-\DeclareMultiCiteCommand{\jurisdiction@cites}{\jurisdiction@cite}{\multicitedelim}
-
-
-
-
-
-%% Macro détaillée
-
-\newbibmacro{jurisdiction@details}{%
-\ifciteibid% Test pour savoir si l'arrêt vient d'être cité
- {\ifcsempty{jurisdiction@recital}% Si oui, on se demande si un numéro de considérant a été défini
- {\usebibmacro{ibid}}% Si ça n'est pas le cas, le bibstring lastruling uniqument s'imprime
- {\usebibmacro{ibid}\addcomma\addspace\bibsstring{recital}\addspace\jurisdiction@recital% Sinon, impression du bibstring + considérant + év. page.
- \ifcsempty{jurisdiction@page}%
- {}%
- {\addspace\mkbibparens{\jurisdiction@page}}%
- }%
- }%
- {%
-\printfield{usera}%
-\iffieldundef{userb}%
- {}%
- {\newunit\printfield{userb}}%
-\iffieldundef{userc}%
- {}%
- {\newunit\printfield{userc}}%
-\iffieldundef{userd}%
- {}%
- {\newunit\printfield{userd}}%
-\iffieldequalstr{usera}{ATF}% <= La date ne s'imprime que s'il ne s'agit pas d'un ATF.
- {}%
- {\iffieldundef{origyear}%
- {}%
- {\addspace\mkbibparens{\printfield{origday}\adddot\printfield{origmonth}\adddot\printfield{origyear}}}%
- }%
-\iftoggle{bbx:jstitles}% <= Option pour activer / désactiver la mention du titre dans les citations d'arrêts
- {\iffieldundef{title}%
- {}%
- {\newunit%
- \printfield{title}}%
- }%
- {}%
-\iflistundef{language}%
- {}%
- {\addspace\mkbibbrackets{\printlist{language}}}%
-\ifcsempty{jurisdiction@recital}%
- {}%
- {%
- \addcomma\addspace\bibsstring{recital}\addspace\jurisdiction@recital%
- \ifcsempty{jurisdiction@page}%
- {}%
- {\addspace\mkbibparens{\jurisdiction@page}}%
- }%
-\iffieldequalstr{howpublished}{publ}
- {\newunit}%
- {\newblock}%
-\iffieldbibstring{howpublished}%
- {\bibsstring{\thefield{howpublished}}}% Dans les citations, on va toujours utiliser le string abrégé.
- {\printfield{howpublished}}%
-\newunit%
- \iffieldbibstring{journaltitle}
- {% aa) s'il existe un string pour le nom de la revue
- \bibsstring{\thefield{journaltitle}}%
- }%
- {% bb) s'il n'existe pas de string pour le nom de la revue
- \printfield{journaltitle}%
- }%
- \newunit%
- \usebibmacro{date}%
- \newunit%
- \printfield{volume}%
- \newunit%
- \iffieldundef{number}%
- {}%
- {\bibsstring{number}\addnbthinspace\printfield{number}}%
- \newunit%
- \printfield{pages}%
-}%
-}
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.bbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.bbx
index b33d8a1cb82..3ead6cbf777 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.bbx
@@ -4,7 +4,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-BIBLIOGRAPHY : BIBLIOGRAPHY %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
-\ProvidesFile{biblatex-swiss-legal-bibliography.bbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-bibliography.bbx}[2014/01/21 v1.1.2 alpha]
\RequireBibliographyStyle{biblatex-swiss-legal-base}
@@ -44,15 +44,15 @@ shortform=false,
% Sélection des drivers de bibliographie ou exclusion de la bibliographie
-\DeclareBibliographyDriver{book}{\usebibmacro{book:full}}
-\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}}
-\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}}
-\DeclareBibliographyDriver{article}{\usebibmacro{article:full}}
-\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}}
+\DeclareBibliographyDriver{book}{\usebibmacro{book:full}\finentry}
+\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}\finentry}
+\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}\finentry}
+\DeclareBibliographyDriver{article}{\usebibmacro{article:full}\finentry}
+\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}\finentry}
\ExecuteBibliographyOptions[customa]{skipbib=true}%
-\DeclareBibliographyDriver{jurisdiction}{\usebibmacro{jurisdiction:full}}
+\DeclareBibliographyDriver{jurisdiction}{\usebibmacro{jurisdiction:full}\finentry}
\ExecuteBibliographyOptions[customb]{skipbib=true}%
-\DeclareBibliographyDriver{online}{\usebibmacro{online:full}}
-\DeclareBibliographyDriver{legislation}{\usebibmacro{legislation:full}}
+\DeclareBibliographyDriver{online}{\usebibmacro{online:full}\finentry}
+\DeclareBibliographyDriver{legislation}{\usebibmacro{legislation:full}\finentry}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.cbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.cbx
index fbefe26c973..fdc96a4edfd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-bibliography.cbx
@@ -4,7 +4,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-BIBLIOGRAPHY : CITATIONS %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
-\ProvidesFile{biblatex-swiss-legal-bibliography.cbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-bibliography.cbx}[2014/01/21 v1.1.2 alpha]
\RequireCitationStyle{biblatex-swiss-legal-base}
\RequireBibliographyStyle{biblatex-swiss-legal-bibliography}
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-de.lbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-de.lbx
new file mode 100644
index 00000000000..f0a2b2bcc60
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-de.lbx
@@ -0,0 +1,533 @@
+
+%%% BIBLATEX-SWISS-LEGAL : GERMAN STRINGS %%%
+
+
+% Copyright 2014 Adrien Vion / Fabian Mörtl
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status 'maintained'.
+ %
+ % The Current Maintainer of this work is Adrien Vion.
+
+% Encoding of this file: UTF8. Code is ASCII compatible.
+
+\ProvidesFile{biblatex-swiss-legal-de.lbx}[2014/01/21 v1.1.2 alpha]
+
+\InheritBibliographyStrings{ngerman}
+\InheritBibliographyExtras{ngerman}
+
+%%%%%%%%%%% NOUVEAUX STRINGS %%%%%%%%%%%%%%
+
+% Allgemeine Abk\"urzungen
+
+\NewBibliographyString{%
+ad,
+article,%
+articlede,%
+articles,%
+articlesde,%
+inyear,
+forthc,%
+genintro,%
+habth,%
+library,%
+note,%
+othertitle,
+prelrem,%
+sametitle,
+shortform,
+sineloco,%
+sineanno,%
+sinelocoetanno,%
+}
+
+% Rechtsprechung
+
+\NewBibliographyString{%
+ataf,
+atc,%
+atf,%
+atfb,%
+atfnp,%
+atfpp,
+atpf,
+bge,%
+bgeup,
+cjue,%
+comm,%
+lastruling,%
+recital,%
+publ,%
+publcomm,%
+res,%
+rescomm,
+transl,%
+translcomm,
+translres,%
+translrescomm,
+}
+
+% Kantone
+\NewBibliographyString{%
+ag,
+ai,
+ar,
+be,
+bl,
+bs,
+fr,
+ge,
+gl,
+gr,
+ju,
+lu,
+ne,
+nw,
+ow,
+sg,
+sh,
+so,
+sz,
+tg,
+ti,
+ur,
+vd,
+vs,
+zg,
+zh,
+}
+
+% Kommentare
+\NewBibliographyString{%
+bk,
+bsk,
+cr,
+hk,
+kuko,
+beckkuko,
+mnk,
+nmk,
+ofk,
+palandt,
+shk,
+stk,
+zk,
+}
+
+% Sammlungen
+\NewBibliographyString{%
+ableu,
+abnr,
+absr,
+as,
+bbl,
+boce,
+bocn,
+ff,
+fjs,
+joue,
+ro,
+rs,
+sjk,
+spr,
+sr,
+tdp,
+siwr,
+}
+
+% Schweizerische Zeitschriften
+\NewBibliographyString{%
+abow,
+absh,
+agve,
+ajp,
+arbr,
+argvp,
+asa,
+assistalex,
+asyl,
+bez,
+blschk,
+blvge,
+bjm,
+bvr,
+can,
+caplaw,
+cas,
+dc,
+db,
+dep,
+digma,
+dpc,
+dta,
+dtao,
+egvsz,
+euz,
+fampra,
+forpen,
+geskr,
+gvpsg,
+gvpzg,
+have,
+hill,
+ingres,
+ipd,
+iusfocus, %%%%
+jaac,
+jar,
+jl,
+jt,
+leges,
+lgve,
+mbvn,
+medialex,
+mp,
+mra,
+notalex,
+pbg,
+pja,
+pkg,
+pld,
+pra,
+pvg,
+ranb,
+rdaf,
+rds,
+rdt,
+reas,
+recht,
+reprax,
+rf,
+rfj,
+rjb,
+rjj,
+rjn,
+rma,
+rnrf,
+rps,
+rsas,
+rsc,
+rsda,
+rsdie,
+rsj,
+rspc,
+rvj,
+sd,
+sic,
+sj,
+smi,%%%
+st,
+succ,
+szier,%%%
+trex,
+zbl,
+zeso,
+zgrg,%%%%
+zr,
+zsis,
+zzz,%%%%
+}
+
+% Ausl\"andische Zeitschriften
+\NewBibliographyString{%
+acp,
+baur,
+bghz,
+cur,
+elj,
+ercl,
+erpl,
+eur,
+euvr,
+euzw,
+grur,
+grurrr,
+grurint,
+grurprax,
+jbl,
+jde,
+jite,
+juru,
+jurzeit,
+jusch,
+njw,
+njw-rr,
+rabels,
+redc,
+rida,
+zip,
+}
+
+%%%%%%%%%%% (UM)DEFINIERUNG DER STRINGS %%%%%%%%%%%%%%
+
+
+\DeclareBibliographyStrings{%
+inherit = {ngerman},
+% Allgemeine Abk\"urzungen
+ad = {{zu}{zu}},
+article = {{Artikel}{Art\adddot}},
+articlede = {{\S}{\S}},
+articles = {{Artikel}{Art\adddot}},
+articlesde = {{\S\S}{\S\S}},
+shortform = {{zitiert}{zit\adddot}},
+abstract = {{Zusammenfassung}{Zusammenf\adddot}},
+andothers = {{\mkbibemph{et alii}}{\mkbibemph{et\addabbrvspace al\adddot}}},
+forthc = {{noch nicht erschienen}{noch nicht erschienen}},
+bytranslator = {{\"Ubersetzung \lbx@lfromlang von}{\"Ubersetzung \lbx@sfromlang von}},
+edition = {{Auflage}{Aufl\adddot}},
+editor = {{Herausgeber}{Hrsg\adddot}},
+editors = {{Herausgeber}{Hrsg\adddot}},
+genintro = {{Allgemeine Einleitung}{Allg\adddot\addabbrvspace Einl\adddot}},
+in = {{in}{in}},
+inpress = {{im Druck}{im Druck}},
+inpreparation = {{in Vorbereitung}{in Vorbereitung}},
+inyear = {{in}{in}},
+library = {{Signatur}{Sig\adddot}},%
+note = {{Notiz}{Notiz}},
+othertitle = {{des Werks erschienen unter dem Titel}{des Werks erschienen unter dem Titel}}, %% not sure
+page = {{S\adddot}{S\adddot}},
+pages = {{S\adddot}{S\adddot}},
+paragraph = {{\parN}{\parN}},
+paragraphs = {{\parNN}{\parNN}},
+phdthesis = {{Dissertation}{Diss\adddot}},
+prelrem = {{Vorbemerkungen}{Vorb\adddot}},
+sametitle = {{des Werks erschienen unter dem gleichen Titel}{des Werks erschienen unter dem gleichen Titel}}, %% not sure
+seenote = {{siehe Fussnote}{s\adddot\addabbrvspace Fn}},
+sequens = {{f\adddot}{f\adddot}},
+sequentes = {{ff}{ff}}, %% no \adddot here?
+sineanno = {{ohne Jahr}{o\adddot\addabbrvspace J\adddot}},
+sineloco = {{ohne Ort}{o\adddot\addabbrvspace O\adddot}},
+sinelocoetanno = {{ohne Ort und Jahr}{o\adddot\addabbrvspace O\adddot\addabbrvspace u\adddot\addabbrvspace J\adddot}},
+shorthands = {{Abk\"urzungen}{Abk\"urzungen}},
+habth = {{Habilitationsschrift}{Habil\adddot}},
+urlseen = {{letztmals abgerufen am}{letztm\adddot\addabbrvspace abg.\adddot\addabbrvspace am}},
+volume = {{Band}{Bd\adddot}},
+% RECHTSPRECHUNG
+ataf = {{Entscheid des Bundesverwaltungsgerichts}{BVGE}},
+atc = {{Kantonsgerichtsentscheid}{KGE}},
+atf = {{Entscheid des Bundesgerichts}{BGE}}, %% Im Original wurde Plural verwendet.
+atfb = {{Entscheid des Bundespatentgerichts}{BPGE}}, %% there's not really a (widely) used abbreviation yet
+atfnp = {{Urteil des Bundesgerichts}{BGer, Urteil}},
+atfpp = {{Urteil des Bundesgerichts (zur Publikation vorgesehen))}{BGer, Urteil (Publ\adddot\addabbrvspace vorg\adddot)}},
+atpf = {{Entscheid des Bundesstrafgerichts}{TPF}},
+bge = {{Entscheid des Bundesgerichts}{BGE}},
+bgeup = {{Urteil des Bundesgerichts}{BGer, Urteil}},
+cjue = {{Gerichtshof der Europ\"aischen Gemeinschaften}{EuGH}},
+comm = {{kommentiert in}{komm\adddot}},
+lastruling = {{Oben erw\"ahnter Entscheid}{O\adddot\addabbrvspace erw\adddot\addabbrvspace Ent\adddot}}, %% What does this stand for?
+recital = {{Erw\"agung}{E\adddot}}, %% = Erwägung?
+publ = {{publiziert in\addcolon}{=}},
+publcomm = {{publiziert und kommentiert in\addcolon}{publ\adddot\addspace und komm\adddot}},
+res = {{zusammengefasst in\addcolon}{zusammeng.\adddot}},
+rescomm = {{zusammengefasst und kommentiert in\addcolon}{zusammeng\adddot\addspace und komm\adddot}},
+transl = {{\"ubersetzt in\addcolon}{\"ubers\adddot}},
+translcomm = {{\"ubersetzt und kommentiert in\addcolon}{\"ubers\adddot\addspace und komm\adddot}},
+translres = {{\"ubersetzt und zusammengefasst in\addcolon}{\"ubers\adddot\addspace und zusammeng\adddot}},
+translrescomm = {{\"ubersetzt, zusammengefasst und kommentiert in\addcolon}{\"ubers\adddot\addcomma\addspace zusammeng\adddot\addspace und komm\adddot}},
+% Kantone
+ag = {{Aargau}{AG}},
+ai = {{Appenzell Innerrhoden}{AI}},
+ar = {{Appenzell Ausserrhoden}{AR}},
+be = {{Bern}{BE}},
+bl = {{Basel-Landschaft}{BL}},
+bs = {{Basel-Stadt}{BS}},
+fr = {{Freiburg}{FR}},
+ge = {{Genf}{GE}},
+gl = {{Glarus}{GL}},
+gr = {{Graub\"unden}{GR}},
+ju = {{Jura}{JU}},
+lu = {{Luzern}{LU}},
+ne = {{Neuenburg}{NE}},
+nw = {{Nidwalden}{NW}},
+ow = {{Obwalden}{OW}},
+sg = {{St.\,Gallen}{SG}},
+sh = {{Schaffhausen}{SH}},
+so = {{Solothurn}{SO}},
+sz = {{Schwyz}{SZ}},
+tg = {{Thurgau}{TG}},
+ti = {{Tessin}{TI}},
+ur = {{Uri}{UR}},
+vd = {{Waadt}{VD}},
+vs = {{Wallis}{VS}},
+zg = {{Zug}{ZG}},
+zh = {{Z\"urich}{ZH}},
+% Kommentare
+bk = {{Berner Kommentar}{BK}},
+bsk = {{Basler Kommentar}{BsK}},
+cr = {{Commentaire Romand}{CR}},
+hk = {{Handkommentar zum Schweizer Privatrecht}{HK}},
+kuko = {{Kurzkommentar}{KuKo}},
+beckkuko = {{Beck'sche Kurz-Kommentare}{B'KuKo}},
+mnk = {{M\"{u}nchener Kommentar zum B\"{u}rgerlichen Gesetzbuch}{M\"{u}nK}},
+nmk = {{Nomos Kommentar}{NomosK}},
+ofk = {{Orell F\"{u}ssli Kommentar}{OFK}},
+palandt = {{Beck'sche Kurz-Kommentare (Palandt)}{Palandt}},
+shk = {{St\"{a}mpflis Handkommentar}{SHK}},
+stk = {{Staudingers Kommentar zum B\"{u}rgerlichen Gesetzbuch}{Staudinger}},
+zk = {{Z\"urcher Kommentar}{ZK}},
+% Sammlungen
+ableu = {{Amtsblatt der Europ\"airschen Union}{ABl. EU}},
+abnr = {{Amtliches Bulletin des Nationalrats}{AmtlBull NR}},
+absr = {{Amtliches Bulletin des St\"anderats}{AmtlBull SR}},
+as = {{Amtliche Sammlung des Bundesrechts}{AS}},
+bbl = {{Bundesblatt}{BBl}},
+boce = {{Amtliches Bulletin des St\"anderats}{AmtlBull SR}},
+bocn = {{Amtliches Bulletin des Nationalrats}{AmtlBull NR}},
+ff = {{Bundesblatt}{BBl}},
+fjs = {{Schweizerische Juristische Kartothek}{SJK}},
+joue = {{Amtsblatt der Europ\"airschen Union}{ABl. EU}},
+ro = {{Amtliche Sammlung des Bundesrechts}{AS}},
+rs = {{Systematische Rechtssammlung}{SR}},
+sjk = {{Schweizerische Juristische Kartothek}{SJK}},
+spr = {{Schweizerisches Privatrecht}{SPR}},
+sr = {{Systematische Rechtssammlung}{SR}},
+tdp = {{Schweizerisches Privatrecht}{SPR}},
+siwr = {{Schweizerisches Immaterialg\"uter- und Wettbewerbsrecht}{SIWR}},
+% = {{}{}},
+% = {{}{}},
+% Schweizerische Zeitschriften
+abow = {{Amtsbericht \"uber die Rechtspflege des Kantons Obwalden}{AbR}},
+absh = {{Amtsbericht des Obergerichtes an den Kantonsrat Schaffhausen}{Amtsbericht}},
+agve = {{Aargauische Gerichts- und Verwaltungsentscheide}{AGVE}},
+ajp = {{Aktuelle Juristische Praxis\addslash Pratique Juridique Actuelle}{AJP\addslash PJA}},
+arbr = {{Mitteilung des Instituts f\"ur Schweizerisches Arbeitsrecht}{ArbR}},
+argvp = {{Ausserrhodische Gerichts- und Verwaltungspraxis}{AR GVP}},
+asa = {{Archiv f\"ur schweizerisches Abgaberecht}{ASA}},
+assistalex = {{Assistalex}{Assistalex}},
+asyl = {{Schweizerische Zeitschrift f\"ur Asylrecht und -praxis}{Asyl}},
+bez = {{BEZ Baurechtsentscheide Kanton Z\"urich}{BEZ}},
+blschk = {{Bl\"atter f\"ur Schuldbetreibung und Konkurs}{BlSchK}},
+blvge = {{Basellandschaftliche Verwaltungsgerichtsentscheide}{BLVGE}},
+bjm = {{Basler juristische Mitteilungen}{BJM}},
+bvr = {{Bernische Verwaltungsrechtsprechung}{BVR}},
+can = {{CAN~-- Zeitschrift f\"ur kantonale Rechtsprechung}{CAN}},
+caplaw = {{CapLaw~-- Swiss Capital Markets Law}{CapLaw}},
+cas = {{Causa Sport}{CaS}},
+db = {{Droit du Bail}{DB}},
+dc = {{Baurecht}{BR}},
+dep = {{Umweltrecht in der Praxis}{URP}},
+digma = {{Zeitschrift f\"ur Datenrecht und Informationssicherheit}{Digma}},
+dpc = {{Recht und Politik des Wettbewerbs}{RPW}},
+dta = {{Arbeitsrecht und Arbeitslosenversicherung}{ARV}},
+dtao = {{ARV online -- Arbeitsrecht und Arbeitslosenversicherung}{ARVO}},
+egvsz = {{Entscheide der Gerichts- und Verwaltungsbeh\"orden des Kantons Schwyz}{EGV-SZ}},
+euz = {{Zeitschrift f\"ur Europarecht}{EuZ}},
+fampra = {{Die Praxis des Familienrechts}{FamPra.ch}},
+forpen = {{Forumpoenale}{Forumpoenale}},
+geskr = {{Gesellschafts- und Kapitalmarktrecht}{GesKR}},
+gvpsg = {{St.\,Gallische Gerichts- und Verwaltungspraxis}{GVP~SG}},
+gvpzg = {{Gerichts- und Verwaltungspraxis des Kantons Zug}{GVP~ZG}},
+have = {{HAVE~-- Haftung und Versicherung}{HAVE}},
+hill = {{Health Insurance Liability Law}{HILL}},
+ingres = {{INGRESnews}{INGRESnews}},
+ipd = {{Ipdata}{Ipdata}},
+iusfocus = {{ius.focus}{ius.focus}},
+jaac = {{Verwaltungspraxis der Bundesbeh\"orden}{VPB}},
+jar = {{Jahrbuch des schweizerischen Arbeitsrechts}{JAR}},
+jl = {{Jusletter}{Jusl.}},
+jt = {{Journal des Tribunaux}{JdT}},
+leges = {{LeGes -- L\'egislation \& \'evaluation}{LeGes}},
+lgve = {{Luzerner Gerichts- und Verwaltungsentscheide}{LGVE}},
+mbvn = {{Monatsschrift f\"ur Bernisches Verwaltungsrecht und Notariatswesen}{MBVN}},
+medialex = {{Zeitschrift f\"ur Medienrecht}{Medialex}},
+mp = {{Mietrechtpraxis}{mp}},
+mra = {{MietRecht Aktuell}{MRA}},
+notalex = {{Not@lex -- Revue de droit priv\'e et fiscal du patrimoine}{Not@lex}},
+pbg = {{PBG aktuell -- Z\"urcher Zeitschrift f\"ur \"offentliches Baurecht}{PBG}},
+pja = {{Aktuelle Juristische Praxis\addslash Pratique Juridique Actuelle}{AJP\addslash PJA}},
+pkg = {{Die Praxis des Kantonsgerichtes von Graub\"unden}{PKG}},
+pld = {{Pl\"adoyer}{Pl\"ad\adddot}},
+pra = {{Die Praxis des Bundesgerichts}{Pra}},
+pvg = {{Praxis des Verwaltungsgerichtes des Kantons Graub\"unden}{PVG}},
+ranb = {{Monatsschrift f\"ur Bernisches Verwaltungsrecht und Notariatswesen}{MBVN}},
+rdaf = {{Revue de droit administratif et de droit fiscal}{RDAF}},
+rds = {{Zeitschrift f\"ur Schweizerisches Recht}{ZSR}},
+rdt = {{Zeitschrift f\"ur Vormundschaftswesen}{ZVW}},
+reas = {{HAVE~-- Haftung und Versicherung}{HAVE}},
+reprax = {{Zeitschrift zur Rechtsetzung und Praxis im Gesellschafts- und Handelsregisterrecht}{Reprax}},
+recht = {{recht: Zeitschrift f\"ur juristische Ausbildung und Praxis}{recht}},
+rf = {{Steuerrevue}{StR}},
+rfj = {{Freiburger Zeitschrift f\"ur Rechtsprechung}{FZR}},
+rjb = {{Zeitschrift des Bernischen Juristenvereins}{ZBJV}},
+rjj = {{Revue jurassienne de jurisprudence}{RJJ}},
+rjn = {{Recueil de jurisprudence neuchâteloise}{RJN}},
+rma = {{Zeitschrift f\"ur Kindes- und Erwachsenenschutz}{ZKE}},
+rnrf = {{Schweizerische Zeitschrift f\"ur Beurkundungs- und Grundbuchrecht}{ZBGR}},
+rps = {{Schweizerische Zeitschrift f\"ur Strafrecht}{ZStrR}},
+rsas = {{Schweizerische Zeitschrift f\"ur Sozialversicherung und berufliche Vorsorge}{SZS}},
+rsc = {{Schweizerische Zeitschrift f\"ur Kriminologie}{SZK}},
+rsda = {{Schweizerische Zeitschrift f\"ur Wirtschafts- und Finanzmarktrecht}{SZW}},
+rsdie = {{Schweizerische Zeitschrift f\"ur internationales und europ\"aisches Recht}{SZIER}},
+rsj = {{Schweizerische Juristen-Zeitung}{SJZ}},
+rspc = {{Schweizerische Zeitschrift f\"ur Zivilprozessrecht}{SZZP}},
+rvj = {{Zeitschrift f\"ur Walliser Rechtsprechung}{ZWR}},
+sd = {{Sicherheit & Recht}{Sicherheit & Recht}},
+sic = {{sic! Zeitschrift f\"r Immaterialgüter,- Informations- und Wettbewerbsrecht}{sic!}},
+sj = {{Semaine Judiciaire}{SJ}},
+smi = {{Schriften zum Medien- und Immaterialg\"uterrecht}{SMI}},
+st = {{Der Schweizer Treuh\"ander}{ST}},
+succ = {{Successio -- Zeitschrift f\"ur Erbrecht}{Successio}},
+szier = {{Schweizerische Zeitschrift f\"ur internationales und europ\"aisches Recht}{SZIER}},
+trex = {{TREX -- Der Treuhandexperte}{TREX}},
+zbl = {{Schweizerisches Zentralblatt f\"ur Staats- und Verwaltungsrecht}{ZBl}},
+zeso = {{Zeitschrift f\"ur Sozialhilfe}{ZESO}},
+zgrg = {{Zeitschrift f\"ur Gesetzgebung und Rechtsprechung in Graub\"unden (ZGRG)}{ZGRG}},
+zr = {{Bl\"atter f\"ur Z\"urcherische Rechtsprechung}{ZR}},
+zsis = {{Zeitschrift f\"ur Schweizerisches und Internationales Steuerrecht}{ZSIS}},
+zzz = {{Schweizerische Zeitschrift f\"ur Zivilprozess- und Zwangsvollstreckungsrecht}{ZZZ}},
+% Ausl\"andische Zeitschriften
+acp = {{Archiv f\"ur die civilistische Praxis \mkbibparens{T\"ubingen}}{AcP}},
+baur = {{Zeitschrift f\"ur das gesamte \"offentliche und zivile Baurecht}{BauR}},
+bghz = {{Entscheidungen des (deutschen) Bundesgerichtshofes in Zivilsachen}{BGHZ}},
+cur = {{Computer und Recht \mkbibparens{K\"oln}}{CuR}},
+elj = {{European Law Journal}{ELJ}},
+ercl = {{European Review of Contract Law}{ERCL}},
+erpl = {{European Review of Private Law}{ERPL}},
+eur = {{Europarecht}{EuR}},
+euvr = {{Zeitschrift f\"ur Europ\"aisches Unternehmens- und Verbraucherrecht}{euvr}},
+euzw = {{Europ\"aische Zeitschrift f\"ur Wirtschaftsrecht}{EuZW}},
+grur = {{Gewerblicher Rechtsschutz und Urheberrecht}{GRUR}},
+grurrr = {{Gewerblicher Rechtsschutz und Urheberrecht, Rechtsprechungs- Report}{GRUR-RR}},
+grurint = {{Gewerblicher Rechtsschutz und Urheberrecht, Internationaler Teil}{GRUR International}},
+grurprax = {{Gewerblicher Rechtsschutz und Urheberrecht, Praxis im Immaterialg\"uter- und Wettbewerbsrecht}{GRUR-Prax}},
+jbl = {{Juristische Bl\"atter}{JBl}},
+jde = {{Journal de droit europ\'een}{J\adddot D\adddot E\adddot}},
+jite = {{Journal of Institutional and Theoretical Economics}{JITE}},
+juru = {{Juristische Rundschau}{JR}},
+jurzeit = {{Juristen Zeitung \mkbibparens{Heidelberg}}{JZ}},
+jusch = {{Juristische Schulung \mkbibparens{M\"unchen}}{JuS}},
+njw = {{Neue Juristische Wochenschrift}{NJW}},
+njw-rr = {{NJW-Rechtsprechungs-Report Zivilrecht}{NJW-RR}},
+rabels = {{Rabels Zeitschrift f\"ur ausl\"andisches und internationales Privatrecht}{RabelsZ}},
+redc = {{Revue europ\'eenne de droit de la consommation}{REDC}},
+rida = {{Revue Internationale des Droits de l'Antiquit\'e}{RIDA}},
+zip = {{Zeitschrift f\"ur Wirtschaftsrecht}{ZIP}},
+% = {{}{}},
+% = {{}{}},
+% = {{}{}},
+}
+
+% Format de la date courte: séparation par des points et non des slash
+\DeclareBibliographyExtras{%
+ \protected\def\mkbibdateshort#1#2#3{%
+ \iffieldundef{#3}
+ {}
+ {\mkdatezeros{\thefield{#3}}%
+ \iffieldundef{#2}{}{.}}%
+ \iffieldundef{#2}
+ {}
+ {\mkdatezeros{\thefield{#2}}%
+ \iffieldundef{#1}{}{.}}%
+ \mkdatezeros{\thefield{#1}}}%
+ \protecting{\providecommand{\parN}{N\addnbthinspace}
+\providecommand{\parNN}{NN\addnbthinspace}}
+ }
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-fr.lbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-fr.lbx
index e794632faac..439ba91e15d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-fr.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-fr.lbx
@@ -2,7 +2,7 @@
%%% BIBLATEX-SWISS-LEGAL : FRENCH STRINGS %%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,17 +18,13 @@
% Encoding of this file: UTF8. Code is ASCII compatible.
-
-
-
-\ProvidesFile{biblatex-swiss-legal-fr.lbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-fr.lbx}[2014/01/21 v1.1.2 alpha]
\InheritBibliographyStrings{french}
\InheritBibliographyExtras{french}
%%%%%%%%%%% NOUVEAUX STRINGS %%%%%%%%%%%%%%
-
% ABR\'eVIATIONS USUELLES
\NewBibliographyString{%
@@ -63,6 +59,7 @@ atfnp,%
atfpp,
atpf,
bge,%
+bgeup,
cjue,%
comm,%
lastruling,%
@@ -117,19 +114,30 @@ kuko,
beckkuko,
mnk,
nmk,
+ofk,
palandt,
+shk,
stk,
zk,
}
% COLLECTIONS
\NewBibliographyString{%
+ableu,
+abnr,
+absr,
+as,
+bbl,
boce,
bocn,
ff,
fjs,
joue,
ro,
+rs,
+sjk,
+spr,
+sr,
tdp,
siwr,
}
@@ -171,12 +179,14 @@ have,
hill,
ingres,
ipd,
+iusfocus,
jaac,
jar,
jl,
jt,
leges,
lgve,
+mbvn,
medialex,
mp,
mra,
@@ -187,6 +197,7 @@ pkg,
pld,
pra,
pvg,
+ranb,
rdaf,
rds,
rdt,
@@ -211,18 +222,23 @@ rvj,
sd,
sic,
sj,
+smi,
st,
succ,
+szier,
trex,
zbl,
zeso,
+zgrg,
zr,
zsis,
+zzz,
}
% REVUES ETRANGERES
\NewBibliographyString{%
acp,
+baur,
bghz,
cur,
elj,
@@ -231,6 +247,10 @@ erpl,
eur,
euvr,
euzw,
+grur,
+grurrr,
+grurint,
+grurprax,
jbl,
jde,
jite,
@@ -276,11 +296,10 @@ page = {{p\adddot}{p\adddot}},
pages = {{pp\adddot}{pp\adddot}},
paragraph = {{\parN}{\parN}},
paragraphs = {{\parNN}{\parNN}},
-%paragraph = {{n$^{\textrm{\tiny{o}}}$}{n$^{\textrm{\tiny{o}}}$}},
-%paragraphs = {{n$^{\textrm{\tiny{os}}}$}{n$^{\textrm{\tiny{os}}}$}},
phdthesis = {{th\`ese}{th\adddot}},
prelrem = {{Remarques pr\'eliminaires}{Rem\adddot\addabbrvspace pr\'el\adddot}},
sametitle = {{de l'ouvrage paru sous le m\^eme titre \`a}{de l'ouvrage paru sous le m\^eme titre \`a}},
+seenote = {{voir note}{v\adddot\addabbrvspace note}},
sequens = {{s\adddot}{s\adddot}},
sequentes = {{ss}{ss}},
sineanno = {{sans date}{s\adddot\addabbrvspace d\adddot}},
@@ -299,9 +318,10 @@ atfnp = {{Arr\^et du Tribunal F\'ed\'eral non publi\'e}{Arr\^et TF non publ\addd
atfpp = {{Arr\^et du Tribunal F\'ed\'eral (publication aux ATF pr\'evue)}{Arr\^et TF (publ\adddot\addabbrvspace pr\'ev\adddot)}},
atpf = {{Arr\^et du Tribunal p\'enal f\'ed\'eral}{ATPF}},
bge = {{Arr\^ets du Tribunal F\'ed\'eral}{ATF}},
+bgeup = {{Arr\^et du Tribunal F\'ed\'eral non publi\'e}{Arr\^et TF non publ\adddot}},
cjue = {{Cour de justice de l'Union europ\'eenne}{CJUE}},
comm = {{comment\'e in}{comm\adddot}},
-lastruling = {{arrêt pr\'ecit\'e}{arrêt pr\'ecit\'e}},
+lastruling = {{arr\^et pr\'ecit\'e}{arr\^et pr\'ecit\'e}},
recital = {{consid\'erant}{consid\adddot}},%
publ = {{publi\'e in\addcolon}{=}},
publcomm = {{publi\'e et comment\'e in\addcolon}{publ\adddot\addspace et comm\adddot}},
@@ -344,19 +364,30 @@ bsk = {{Basler Kommentar}{BsK}},
cr = {{Commentaire Romand}{CR}},
hk = {{Handkommentar zum Schweizer Privatrecht}{HK}},
kuko = {{Kurzkommentar}{KuKo}},
-beckkuko = {{Beck'sche Kurz-Kommentare}{KuKo}},
+beckkuko = {{Beck'sche Kurz-Kommentare}{B'KuKo}},
mnk = {{M\"{u}nchener Kommentar zum B\"{u}rgerlichen Gesetzbuch}{M\"{u}nK}},
nmk = {{Nomos Kommentar}{NomosK}},
-palandt = {{Beck'sche Kurz-Kommentare}{Palandt}},
+ofk = {{Orell F\"{u}ssli Kommentar}{OFK}},
+palandt = {{Beck'sche Kurz-Kommentare (Palandt)}{Palandt}},
+shk = {{St\"{a}mpflis Handkommentar}{SHK}},
stk = {{Staudingers Kommentar zum B\"{u}rgerlichen Gesetzbuch}{Staudinger}},
zk = {{Z\"urcher Kommentar}{ZK}},
% COLLECTIONS
+ableu = {{Journal officiel de l'Union europ\'eenne}{JO UE}},
+abnr = {{Bulletin officiel du Conseil national}{BOCN}},
+absr = {{Bulletin officiel du Conseil des \'etats}{BOCE}},
+as = {{Recueil officiel du droit f\'ed\'eral}{RO}},
+bbl = {{Feuille f\'ed\'erale}{FF}},
boce = {{Bulletin officiel du Conseil des \'etats}{BOCE}},
bocn = {{Bulletin officiel du Conseil national}{BOCN}},
ff = {{Feuille f\'ed\'erale}{FF}},
fjs = {{Fiches juridiques suisses}{FJS}},
joue = {{Journal officiel de l'Union europ\'eenne}{JO UE}},
ro = {{Recueil officiel du droit f\'ed\'eral}{RO}},
+rs = {{Recueil syst\'ematique du droit f\'ed\'eral}{RS}},
+sjk = {{Fiches juridiques suisses}{FJS}},
+spr = {{Trait\'e de droit priv\'e suisse}{SP}},
+sr = {{Recueil syst\'ematique du droit f\'ed\'eral}{RS}},
tdp = {{Trait\'e de droit priv\'e suisse}{TDP}},
siwr = {{Schweizerisches Immaterialg\"uter- und Wettbewerbsrecht}{SIWR}},
% = {{}{}},
@@ -397,13 +428,15 @@ have = {{HAVE/\-REAS~-- Responsabilit\'e et assurance}{REAS}},
hill = {{Health Insurance Liability Law}{HILL}},
ingres = {{INGRESnews}{INGRESnews}},
ipd = {{Ipdata}{Ipdata}},
+iusfocus = {{ius.focus}{ius.focus}},
jaac = {{Jurisprudence des autorit\'es administratives de la Conf\'ed\'eration}{JAAC}},
jar = {{Jahrbuch des schweizerischen Arbeitsrechts}{JAR}},
jl = {{Jusletter}{Jusl.}},
jt = {{Journal des Tribunaux}{JdT}},
-leges = {{LeGes - L\'egislation & \'evaluation}{LeGes}},
+leges = {{LeGes - L\'egislation \& \'evaluation}{LeGes}},
lgve = {{Luzerner Gerichts- und Verwaltungsentscheide}{LGVE}},
-medialex = {{Revue de droit de la communication}{Medialex}},
+mbvn = {{Monatsschrift f\"ur Bernisches Verwaltungsrecht und Notariatswesen}{MBVN}},
+medialex = {{Revue de droit de la communication (Medialex)}{Medialex}},
mp = {{Mietrechtpraxis}{mp}},
mra = {{MietRecht Aktuell}{MRA}},
notalex = {{Not@lex - Revue de droit priv\'e et fiscal du patrimoine}{Not@lex}},
@@ -413,6 +446,7 @@ pkg = {{Die Praxis des Kantonsgerichtes von Graub\"unden}{PKG}},
pld = {{Plaidoyer}{Plaid\adddot}},
pra = {{Die Praxis des Bundesgerichts}{Pra}},
pvg = {{Praxis des Verwaltungsgerichtes des Kantons Graub\"unden}{PVG}},
+ranb = {{Monatsschrift f\"ur Bernisches Verwaltungsrecht und Notariatswesen}{MBVN}},
rdaf = {{Revue de droit administratif et de droit fiscal}{RDAF}},
rds = {{Revue de Droit suisse}{RDS}},
rdt = {{Revue du droit de tutelle}{RDT}},
@@ -425,7 +459,7 @@ rjb = {{Revue de la Soci\'et\'e des juristes bernois}{RJB}},
rjj = {{Revue jurassienne de jurisprudence}{RJJ}},
rjn = {{Recueil de jurisprudence neuchâteloise}{RJN}},
rma = {{Revue de la protection des mineurs et des adultes}{RMA}},
-rnrf = {{Revue suisse du notariat et du registre foncier \mkbibparens{= ZBGR}}{RNRF \mkbibparens{= ZBGR}}},
+rnrf = {{Revue suisse du notariat et du registre foncier}{RNRF}},
rps = {{Revue p\'enale suisse}{RPS}},
rsas = {{Revue suisse des assurances sociales et de la pr\'evoyance professionnelle}{RSAS}},
rsc = {{Revue suisse de criminologie}{RSC}},
@@ -437,15 +471,20 @@ rvj = {{Revue valaisanne de jurisprudence}{RVJ}},
sd = {{S\'ecurit\'e & droit}{S\'ecurit\'e & droit}},
sic = {{sic! Revue du droit de la propri\'et\'e intellectuelle, de l'information et de la concurrence}{sic!}},
sj = {{Semaine Judiciaire}{SJ}},
+smi = {{Schriften zum Medien- und Immaterialg\"uterrecht}{SMI}},
st = {{L'expert-comptable suisse}{ST}},
succ = {{Successio - Revue de droit des successions}{Successio}},
+szier = {{RSDIE - Revue suisse de droit international et de droit europ\'een}{RSDIE}},
trex = {{TREX - L'expert fiduciaire}{TREX}},
zbl = {{Schweizerisches Zentralblatt f\"ur Staats- und Verwaltungsrecht}{ZBl}},
zeso = {{Zeitschrift f\"ur Sozialhilfe}{ZESO}},
+zgrg = {{Zeitschrift f\"ur Gesetzgebung und Rechtsprechung in Graub\"unden (ZGRG)}{ZGRG}},
zr = {{Bl\"atter f\"ur Z\"urcherische Rechtsprechung}{ZR}},
zsis = {{Zeitschrift f\"ur Schweizerisches und Internationales Steuerrecht}{ZSIS}},
+zzz = {{Revue suisse de droit de proc\'edure civile et d'ex\'ecution forcée (ZZZ)}{ZZZ}},
% REVUES ETRANGERES
acp = {{Archiv f\"ur die civilistische Praxis \mkbibparens{Tubingue}}{AcP}},
+baur = {{Zeitschrift f\"ur das gesamte \"offentliche und zivile Baurecht}{BauR}},
bghz = {{Entscheidungen des Bundesgerichtshofes in Zivilsachen}{BGHZ}},
cur = {{Computer und Recht \mkbibparens{Cologne}}{CuR}},
elj = {{European Law Journal}{ELJ}},
@@ -454,6 +493,10 @@ erpl = {{European Review of Private Law}{ERPL}},
eur = {{Europarecht}{EuR}},
euvr = {{Zeitschrift f\"ur Europ\"aisches Unternehmens- und Verbraucherrecht}{euvr}},
euzw = {{Europ\"aische Zeitschrift f\"ur Wirtschaftsrecht}{EuZW}},
+grur = {{Gewerblicher Rechtsschutz und Urheberrecht (GRUR)}{GRUR}},
+grurrr = {{Gewerblicher Rechtsschutz und Urheberrecht, Rechtsprechungs- Report (GRUR-RR)}{GRUR-RR}},
+grurint = {{Gewerblicher Rechtsschutz und Urheberrecht, Internationaler Teil (GRUR International)}{GRUR International}},
+grurprax = {{Gewerblicher Rechtsschutz und Urheberrecht, Praxis im Immaterialg\"uter- und Wettbewerbsrecht (GRUR-Prax)}{GRUR-Prax}},
jbl = {{Juristische Bl\"atter}{JBl}},
jde = {{Journal de droit europ\'een}{J\adddot D\adddot E\adddot}},
jite = {{Journal of Institutional and Theoretical Economics}{JITE}},
@@ -483,6 +526,8 @@ zip = {{Zeitschrift f\"ur Wirtschaftsrecht}{ZIP}},
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#1}{}{.}}%
\mkdatezeros{\thefield{#1}}}%
+ \protecting{\providecommand{\parN}{n\textsuperscript{\tiny{o}}\addnbthinspace}%
+\providecommand{\parNN}{n\textsuperscript{\tiny{os}}\addnbthinspace}}
}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.bbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.bbx
index 75982131f0b..52ef245f8cd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.bbx
@@ -4,7 +4,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-GENERAL : BIBLIOGRAPHY %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -22,7 +22,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{biblatex-swiss-legal-general.bbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-general.bbx}[2014/01/21 v1.1.2 alpha]
\RequireBibliographyStyle{biblatex-swiss-legal-base}
@@ -30,11 +30,11 @@
% Sélection des drivers de bibliographie ou exclusion de la bibliographie
-\DeclareBibliographyDriver{book}{\usebibmacro{book:full}}
-\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}}
-\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}}
-\DeclareBibliographyDriver{article}{\usebibmacro{article:full}}
-\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}}
+\DeclareBibliographyDriver{book}{\usebibmacro{book:full}\finentry}
+\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}\finentry}
+\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}\finentry}
+\DeclareBibliographyDriver{article}{\usebibmacro{article:full}\finentry}
+\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}\finentry}
\ExecuteBibliographyOptions[customa]{skipbib=true}%
\ExecuteBibliographyOptions[jurisdiction]{skipbib=true}%
\ExecuteBibliographyOptions[customb]{skipbib=true}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.cbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.cbx
index 490fb9c7403..0a29aa12924 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-general.cbx
@@ -4,7 +4,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-GENERAL : CITATIONS %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
%%%%%%%%%% PREAMBULE / REGLES GENERALES %%%%%%%%%%
-\ProvidesFile{biblatex-swiss-legal-general.cbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-general.cbx}[2014/01/21 v1.1.2 alpha]
\RequireCitationStyle{biblatex-swiss-legal-base}
\RequireBibliographyStyle{biblatex-swiss-legal-general}
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.bbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.bbx
index 13bf0d5b614..080c93baf92 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.bbx
@@ -4,7 +4,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-LONGARTICLE : BIBLIOGRAPHY %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
-\ProvidesFile{biblatex-swiss-legal-longarticle.bbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-longarticle.bbx}[2014/01/21 v1.1.2 alpha]
\RequireBibliographyStyle{biblatex-swiss-legal-base}
@@ -47,11 +47,11 @@ subtitles=false,
% Sélection des drivers de bibliographie ou exclusion de la bibliographie
-\DeclareBibliographyDriver{book}{\usebibmacro{book:full}}
-\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}}
-\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}}
-\DeclareBibliographyDriver{article}{\usebibmacro{article:full}}
-\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}}
+\DeclareBibliographyDriver{book}{\usebibmacro{book:full}\finentry}
+\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}\finentry}
+\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}\finentry}
+\DeclareBibliographyDriver{article}{\usebibmacro{article:full}\finentry}
+\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}\finentry}
\ExecuteBibliographyOptions[customa]{skipbib=true}%
\ExecuteBibliographyOptions[jurisdiction]{skipbib=true}%
\ExecuteBibliographyOptions[customb]{skipbib=true}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.cbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.cbx
index 7f22f89838a..aaf0ffb58e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-longarticle.cbx
@@ -4,7 +4,7 @@
%%%%%% BIBLATEX-SWISS-LEGAL-LONGARTICLE : CITATIONS %%%%%%%
-% Copyright 2013 Adrien Vion
+% Copyright 2014 Adrien Vion
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
-\ProvidesFile{biblatex-swiss-legal-longarticle.cbx}[2013/07/23 v1.1.1 alpha]
+\ProvidesFile{biblatex-swiss-legal-longarticle.cbx}[2014/01/21 v1.1.2 alpha]
\RequireCitationStyle{biblatex-swiss-legal-base}
\RequireBibliographyStyle{biblatex-swiss-legal-longarticle}
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.bbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.bbx
new file mode 100644
index 00000000000..db7b198e4fe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.bbx
@@ -0,0 +1,58 @@
+
+
+
+ %%%%%% BIBLATEX-SWISS-LEGAL-SHORTARTICLE : BIBLIOGRAPHY %%%%%%%
+
+
+% Copyright 2014 Adrien Vion
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status 'maintained'.
+ %
+ % The Current Maintainer of this work is Adrien Vion.
+
+% Encoding of this file: UTF-8. Code is ASCII compatible.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+\ProvidesFile{biblatex-swiss-legal-shortarticle.bbx}[2014/01/21 v1.1.2 alpha]
+
+\RequireBibliographyStyle{biblatex-swiss-legal-base}
+
+
+% Sélection des options de style
+
+\ExecuteBibliographyOptions{%
+citetracker=context,
+date=short,
+urldate=short,
+firstnames=false,
+shortform=false,
+subtitles=false,
+}
+
+\nobibtype
+
+% Sélection des drivers de bibliographie ou exclusion de la bibliographie
+
+%\DeclareBibliographyDriver{book}{\usebibmacro{book:full}}
+%\DeclareBibliographyDriver{thesis}{\usebibmacro{thesis:full}}
+%\DeclareBibliographyDriver{inbook}{\usebibmacro{inbook:full}}
+%\DeclareBibliographyDriver{article}{\usebibmacro{article:full}}
+%\DeclareBibliographyDriver{commentary}{\usebibmacro{commentary:full}}
+%\ExecuteBibliographyOptions[customa]{skipbib=true}%
+%\ExecuteBibliographyOptions[jurisdiction]{skipbib=true}%
+%\ExecuteBibliographyOptions[customb]{skipbib=true}%
+%\DeclareBibliographyDriver{online}{\usebibmacro{online:full}}
+%\ExecuteBibliographyOptions[legislation]{skipbib=true}%
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.cbx b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.cbx
new file mode 100644
index 00000000000..fd8da1ef692
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.cbx
@@ -0,0 +1,98 @@
+
+
+
+ %%%%%% BIBLATEX-SWISS-LEGAL-SHORTARTICLE : CITATIONS %%%%%%%
+
+
+% Copyright 2014 Adrien Vion
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status 'maintained'.
+ %
+ % The Current Maintainer of this work is Adrien Vion.
+
+% Encoding of this file: UTF-8. Code is ASCII compatible.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%TO DO:
+% 1) étendre le code à tous les types avec op. cit.
+% 2) corriger le \finentry dans les styles de bibliographie OK
+% 3) rajouter un string footnote dans LBX et l'utiliser dans la commande \nbp (à rebaptiser) + à inclure dans la documentation
+% 4) Réfléchir à la jurisprudence
+
+\ProvidesFile{biblatex-swiss-legal-shortarticle.cbx}[2014/01/21 v1.1.2 alpha]
+
+\RequireCitationStyle{biblatex-swiss-legal-base}
+\RequireBibliographyStyle{biblatex-swiss-legal-shortarticle}
+
+
+% MACROS PAR TYPE D'ENTRÉE
+
+\newbibmacro{book:cite}{%
+\ifciteseen{%
+ \printnames{labelname}%
+ \newblock%
+ \mkbibemph{\bibstring{opcit}}%
+ \addspace%
+ \mkbibparens{\bibstring{seenote} \ref{\thefield{entrykey}}}%
+ }{%
+ \usebibmacro{book:full}%
+ \label{\thefield{entrykey}}%
+ }%
+}
+
+\newbibmacro{thesis:cite}{%
+\ifciteseen{%
+ \printnames{labelname}%
+ \newblock%
+ \mkbibemph{\bibstring{opcit}}%
+ \addspace%
+ \mkbibparens{\bibstring{seenote} \ref{\thefield{entrykey}}}%
+ }{%
+ \usebibmacro{thesis:full}%
+ \label{\thefield{entrykey}}%
+ }%
+}
+
+\newbibmacro{inbook:cite}{%
+\ifciteseen{%
+ \printnames{labelname}%
+ \newblock%
+ \mkbibemph{\bibstring{opcit}}%
+ \addspace%
+ \mkbibparens{\bibstring{seenote} \ref{\thefield{entrykey}}}%
+ }{%
+ \usebibmacro{inbook:full}%
+ \label{\thefield{entrykey}}%
+ }%
+}
+
+\newbibmacro{article:cite}{%
+\ifciteseen{%
+ \printnames{labelname}%
+ \newblock%
+ \mkbibemph{\bibstring{opcit}}%
+ \addspace%
+ \mkbibparens{\bibstring{seenote} \ref{\thefield{entrykey}}}%
+ }{%
+ \usebibmacro{article:full}%
+ \label{\thefield{entrykey}}%
+ }%
+}
+
+\newbibmacro{commentary:cite}{\usebibmacro{generic:short}}
+\newbibmacro{customa:cite}{\usebibmacro{customa:full}}
+\newbibmacro{jurisdiction:cite}{\usebibmacro{jurisdiction:full}}
+\newbibmacro{customb:cite}{\usebibmacro{jurisdiction:full}}
+\newbibmacro{online:cite}{\usebibmacro{online:full}}
+\newbibmacro{legislation:cite}{\usebibmacro{legislation:full}}
+
+\endinput