diff options
12 files changed, 51 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf Binary files differindex 8bcc00b9e65..121f4db785f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip Binary files differindex e6223186e71..acca126e06c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip +++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx index b03c1462bd1..114fde44f9c 100644 --- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx +++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx @@ -97,7 +97,7 @@ %<italian-lbx>\ProvidesFile{italian-philosophy.lbx} %<english-lbx>\ProvidesFile{english-philosophy.lbx} %<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx> - [2015/01/14 v0.9h valbusa beta] + [2015/03/14 v0.9i valbusa beta] %</standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx> %<*driver> \documentclass{ltxdoc} @@ -265,7 +265,7 @@ %</driver> % \fi % -% \CheckSum{3394} +% \CheckSum{3407} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -283,6 +283,7 @@ % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % +% \changes{v0.9i}{2015/03/14}{Corrected a bug with \opt{shorthandintro} option.} % \changes{v0.9h}{2015/01/14}{New option \opt{lowscauthors}. Corrected some bugs. Updated documentation.} % \changes{v0.9g}{2014/12/12}{Added localization module for spanish. Corrected a bug in \bibtype{inbook} and \bibtype{incollection} entries when using \bibfield{crossref} field. Updated documentation.} % \changes{v0.9f}{2014/03/28}{Updated documentation. Corrected a bug in the \opt{volnumformat} option.} @@ -347,7 +348,6 @@ % % \maketitle % -% \thispagestyle{empty} % %\begin{abstract} % This package provides a small collection of bibliography and citation styles for use with Philipp Lehman's \sty{biblatex} package. The styles follow the most popular conventions of the Italian publications but can be used in other languages too. They offer some useful features to compose detailed bibliographic entries including the translation data of foreign texts, annotations etc. Many options allow you to change the style defaults. @@ -679,7 +679,7 @@ % %\boolitem[false]{lowscauthors} % Prints the initials of the names in lowercase small capitals. -% For example you will obtain \textsc{donald e. knuth} instead of \textsc{Donald E. knuth}. If you need the uppercase for some specific entries use the \cmd{MakeUppercase} command. +% For example you will obtain \textsc{donald e. knuth} instead of \textsc{Donald E. Knuth}. If you need the uppercase for some specific entries use the \cmd{MakeUppercase} command. % %\optitem[publocyear]{publocformat}{\opt{publocyear}, \opt{locpubyear}, \opt{loccolonpub}} % This option provides three styles for typesetting the ``publisher/location/date'' block. @@ -1082,6 +1082,8 @@ \newtoggle{bbx:classical} \newtoggle{bbx:lowscauthors} +\newtoggle{cbx:shorthandintro} + \DeclareBibliographyOption{annotation}[true]{% \settoggle{bbx:annotation}{#1}} \DeclareBibliographyOption{library}[true]{% @@ -1097,6 +1099,8 @@ \DeclareBibliographyOption{lowscauthors}[true]{% \settoggle{bbx:lowscauthors}{#1}} +\DeclareBibliographyOption{shorthandintro}[true]{% + \settoggle{cbx:shorthandintro}{#1}} \newcommand{\bbx@publocformat}{} @@ -1141,7 +1145,8 @@ maxcitenames = 2, mincitenames = 1, maxbibnames = 999, - minbibnames = 999} + minbibnames = 999, + shorthandintro = true} % \end{macrocode} % Changing the penalty of the urls will prevent % many overfull boxes. @@ -3390,16 +3395,13 @@ \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{% @@ -3885,7 +3887,19 @@ {\setunit{\addspace\midsentence}}}% \bibstring{cited}}} - \renewbibmacro*{cite:full}{%OK +% \renewbibmacro*{cite:full}{%OK +% \usebibmacro{cite:full:citepages}% +% \global\toggletrue{cbx:fullcite}% +% \printtext[bibhypertarget]{% +% \usedriver +% {\iftoggle{cbx:scauthorscite}{% +% \DeclareNameAlias{sortname}{scdefault}}% +% {\DeclareNameAlias{sortname}{default}}}% +% {\thefield{entrytype}}}% +% \usebibmacro{shorthandintro}} + +\renewbibmacro*{cite:full}{%OK + \iftoggle{cbx:shorthandintro}{% \usebibmacro{cite:full:citepages}% \global\toggletrue{cbx:fullcite}% \printtext[bibhypertarget]{% @@ -3894,8 +3908,11 @@ \DeclareNameAlias{sortname}{scdefault}}% {\DeclareNameAlias{sortname}{default}}}% {\thefield{entrytype}}}% - \usebibmacro{shorthandintro}} - + \usebibmacro{shorthandintro}}% + {\usebibmacro{cite:shorthand}}} + + + \renewbibmacro*{cite:idem}{% \iftoggle{cbx:scauthorscite}{% \bibstring[\mkbibsc]{idem\thefield{gender}}}{% 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}{% |