summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-03-16 20:47:33 +0000
committerKarl Berry <karl@freefriends.org>2015-03-16 20:47:33 +0000
commit88e80bc72bd0448dfa0b3b1b65c7c5d41b7a043b (patch)
tree69343d05011776567cc912bc6c5c09f4f11377bf /Master/texmf-dist/tex
parentca3a60d119fcc83da0a0c6ed3521a75be47221b8 (diff)
biblatex-philosophy (16mar15)
git-svn-id: svn://tug.org/texlive/trunk@36536 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx10
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx9
9 files changed, 22 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
index 5232288350f..dfe1e335ec1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{english-philosophy.lbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\InheritBibliographyExtras{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
index be4dbe02372..303f858c7fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{italian-philosophy.lbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\InheritBibliographyExtras{italian}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
index 02c53fea583..64a08fa0bac 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-classic.bbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireBibliographyStyle{authoryear}
\RequireBibliographyStyle{philosophy-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
index 39f15044c92..168eb0c81d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -13,21 +13,18 @@
%% License information appended
%%
\ProvidesFile{philosophy-classic.cbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireCitationStyle{authoryear-comp}
\newtoggle{cbx:scauthorscite}
-\newtoggle{cbx:shorthandintro}
+
\DeclareBibliographyOption{scauthorscite}[true]{%
\settoggle{cbx:scauthorscite}{#1}}
-\DeclareBibliographyOption{shorthandintro}[true]{%
- \settoggle{cbx:shorthandintro}{#1}}
\ExecuteBibliographyOptions{%
scauthorscite = false,
citetracker = true,
- shorthandintro = true
}
\AtEveryCite{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
index 7bd7ac62e65..2409d98a093 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.bbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireBibliographyStyle{philosophy-classic}
\newtoggle{bbx:yearleft}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
index 298198d2910..ce81fdd9d45 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-modern.cbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireCitationStyle{philosophy-classic}
\DeclareCiteCommand{\fullcite}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
index 0e1a001a44e..7453b9f5373 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-standard.bbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireBiber[2]
\RequireBibliographyStyle{standard}
@@ -28,6 +28,8 @@
\newtoggle{bbx:classical}
\newtoggle{bbx:lowscauthors}
+\newtoggle{cbx:shorthandintro}
+
\DeclareBibliographyOption{annotation}[true]{%
\settoggle{bbx:annotation}{#1}}
\DeclareBibliographyOption{library}[true]{%
@@ -43,6 +45,9 @@
\DeclareBibliographyOption{lowscauthors}[true]{%
\settoggle{bbx:lowscauthors}{#1}}
+\DeclareBibliographyOption{shorthandintro}[true]{%
+ \settoggle{cbx:shorthandintro}{#1}}
+
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
\newcommand{\bbx@relatedformat}{}
@@ -85,7 +90,8 @@
maxcitenames = 2,
mincitenames = 1,
maxbibnames = 999,
- minbibnames = 999}
+ minbibnames = 999,
+ shorthandintro = true}
\setcounter{biburlnumpenalty}{9000}
\setcounter{biburlucpenalty}{9000}
\setcounter{biburllcpenalty}{9000}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
index efa8e47bdb9..d0c309e1c19 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.bbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireBibliographyStyle{authortitle}
\RequireBibliographyStyle{philosophy-standard}
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
index 208ef681943..bd29c2a3787 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -13,7 +13,7 @@
%% License information appended
%%
\ProvidesFile{philosophy-verbose.cbx}
- [2015/01/14 v0.9h valbusa beta]
+ [2015/03/14 v0.9i valbusa beta]
\RequireCitationStyle{verbose-trad2}
@@ -110,7 +110,9 @@
{\setunit{\addspace\midsentence}}}%
\bibstring{cited}}}
- \renewbibmacro*{cite:full}{%OK
+
+\renewbibmacro*{cite:full}{%OK
+ \iftoggle{cbx:shorthandintro}{%
\usebibmacro{cite:full:citepages}%
\global\toggletrue{cbx:fullcite}%
\printtext[bibhypertarget]{%
@@ -119,7 +121,8 @@
\DeclareNameAlias{sortname}{scdefault}}%
{\DeclareNameAlias{sortname}{default}}}%
{\thefield{entrytype}}}%
- \usebibmacro{shorthandintro}}
+ \usebibmacro{shorthandintro}}%
+ {\usebibmacro{cite:shorthand}}}
\renewbibmacro*{cite:idem}{%
\iftoggle{cbx:scauthorscite}{%