biblatex-dw 1.5 (28jun12)

git-svn-id: svn://tug.org/texlive/trunk@27035 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 276 insertions, 179 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx
index e5400e4e648..c2bac9f4831 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx
@@ -1,16 +1,6 @@
-% authortitle-dw.bbx, Dominik Waßenhoven 2011
-
-\ProvidesFile{authortitle-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style]
-
-\@ifpackagelater{biblatex}{2011/07/29}
-  {}
-  {\PackageError{biblatex}
-    {Outdated 'biblatex' package}
-    {The version of the 'authortitle-dw' style you are using\MessageBreak
-     requires biblatex v1.6 or later.\MessageBreak
-     You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
-     This is a fatal error. I'm aborting now.}%
-    \endinput}
+% authortitle-dw.bbx, Dominik Waßenhoven 2012
+
+\ProvidesFile{authortitle-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style]
   
 \RequireBibliographyStyle{standard-dw}
 
@@ -178,7 +168,7 @@
 \def\bbx@opt@edstringfont@namefont{%
   \renewcommand{\bbx@edstringfont}{\bbx@namefont}}
   
-\ExecuteBibliographyOptions{%
+\ExecuteBibliographyOptions{
   edbyidem=true,
   editorstring=parens,
   idembib=true,
@@ -243,7 +233,7 @@
 
 %% Formate in der Bibliographie
 \DeclareFieldFormat{annotation}{%
-  \annotationfont #1\addperiod}
+  \annotationfont #1\addperiod\par}
 \DeclareFieldFormat{booktitle}{#1}
 \DeclareFieldFormat{edition}{%
   \ifinteger{#1}
@@ -263,7 +253,7 @@
 \DeclareFieldFormat{journaltitle}{#1}
 \DeclareFieldFormat{issuetitle}{#1}
 \DeclareFieldFormat{library}{%
-  \libraryfont #1\addperiod}
+  \libraryfont #1\addperiod\par}
 \DeclareFieldFormat{maintitle}{#1}
 \DeclareFieldFormat{review}{%
   \bibstring{review}%
@@ -301,19 +291,6 @@
     {#1\isdot}} 
 
 %% Umdefinierung von finentry für 'annotation' und 'library'
-\newbibmacro*{finentry:annotation}{%
-  \iffieldundef{annotation}
-    {\finentry}%
-    {\setunit{\addperiod\par}
-     \printfield{annotation}}%
-}
-\newbibmacro*{finentry:library}{%
-  \iffieldundef{library}
-    {\finentry}
-    {\setunit{\addperiod\par}
-     \printfield{library}%
-     \finentry}
-}
 \renewbibmacro*{finentry}{%
   \ifboolexpr{
     test {\iffieldundef{annotation}}
@@ -322,7 +299,9 @@
   }
     {\finentry}
     {\iffieldundef{library}
-      {}
+      {\iffieldundef{annotation}
+        {\finentry}
+        {}}%
       {\ifbool{bbx:library}
         {\setunit{\addperiod\par}
          \printfield{library}}
@@ -330,7 +309,9 @@
      \iffieldundef{annotation}
       {}
       {\ifbool{bbx:annotation}
-        {\setunit{\addperiod\par}
+        {\iffieldundef{library}% wenn library ebenfalls ausgegeben wird, keinen Punkt und Absatz machen (ist dann von library schon gesetzt)
+           {\setunit{\addperiod\par}}
+           {}
          \printfield{annotation}}
         {}}%
      \finentry}}
@@ -351,7 +332,7 @@
 % Formatierung der Nachnamen entsprechend der Option 'namefont'
 \renewcommand*{\mkbibnamelast}[1]{%
  \ifboolexpr{
-   bool {bbx:oldauthor}
+ ( bool {bbx:oldauthor}
    and
    ( ( bool {oldauthor}
        and
@@ -363,7 +344,15 @@
      or
      ( bool {oldbookauthor}
        and
-       test {\ifcurrentname{bookauthor}} ) )
+       test {\ifcurrentname{bookauthor}} ) ) )
+   or
+ ( bool{cbx:citeauthor}
+   and
+   ( bool{cbx:citeauthornormalfont}
+     or
+     ( bool{cbx:citeauthorfoot}
+       and
+       not test {\iffootnote} ) ) )
  }
   {#1}
   {\bbx@namefont{#1}}}
@@ -371,7 +360,7 @@
 % Formatierung der Vornamen entsprechend der Option 'firstnamefont'
 \renewcommand*{\mkbibnamefirst}[1]{%
  \ifboolexpr{
-   bool {bbx:oldauthor}
+ ( bool {bbx:oldauthor}
    and
    ( ( bool {oldauthor}
        and
@@ -383,7 +372,15 @@
      or
      ( bool {oldbookauthor}
        and
-       test {\ifcurrentname{bookauthor}} ) )
+       test {\ifcurrentname{bookauthor}} ) ) )
+   or
+ ( bool{cbx:citeauthor}
+   and
+   ( bool{cbx:citeauthornormalfont}
+     or
+     ( bool{cbx:citeauthorfoot}
+       and
+       not test {\iffootnote} ) ) )
  }
   {#1}
   {\bbx@firstnamefont{#1}}}
@@ -392,7 +389,7 @@
 % oder 'firstnamefont' (useprefix=false)
 \renewcommand*{\mkbibnameprefix}[1]{%
  \ifboolexpr{
-   bool {bbx:oldauthor}
+ ( bool {bbx:oldauthor}
    and
    ( ( bool {oldauthor}
        and
@@ -404,7 +401,15 @@
      or
      ( bool {oldbookauthor}
        and
-       test {\ifcurrentname{bookauthor}} ) )
+       test {\ifcurrentname{bookauthor}} ) ) )
+   or
+ ( bool{cbx:citeauthor}
+   and
+   ( bool{cbx:citeauthornormalfont}
+     or
+     ( bool{cbx:citeauthorfoot}
+       and
+       not test {\iffootnote} ) ) )
  }
   {#1}
   {\ifuseprefix
@@ -414,7 +419,7 @@
 % suffix richtet sich nach 'firstnamefont' 
 \renewcommand*{\mkbibnameaffix}[1]{%
  \ifboolexpr{
-   bool {bbx:oldauthor}
+ ( bool {bbx:oldauthor}
    and
    ( ( bool {oldauthor}
        and
@@ -426,7 +431,15 @@
      or
      ( bool {oldbookauthor}
        and
-       test {\ifcurrentname{bookauthor}} ) )
+       test {\ifcurrentname{bookauthor}} ) ) )
+   or
+ ( bool{cbx:citeauthor}
+   and
+   ( bool{cbx:citeauthornormalfont}
+     or
+     ( bool{cbx:citeauthorfoot}
+       and
+       not test {\iffootnote} ) ) )
  }
   {#1}
   {\bbx@firstnamefont{#1}}}
@@ -784,9 +797,9 @@
   \ifnamesequal{author}{bookauthor}
     {\ifbool{bbx:edbyidem}
       {\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}\addcolon}
-      {\printnames{bookauthor}%
+      {\printnames[byauthor]{bookauthor}%
        \newunit\newblock}}
-    {\printnames{bookauthor}%
+    {\printnames[byauthor]{bookauthor}%
      \newunit\newblock}}
 
 %% Wenn Autor und Hrsg. gleich --> hg. v. dems./ders./dens.:
@@ -796,7 +809,19 @@
     {\usebibmacro{byeditor+othersstrg}%
      \setunit{\addspace}%
      \ifboolexpr{
-       ( test {\ifnamesequal{editor}{author}}
+       ( ( ( not test {\ifentrytype{inbook}}% alle außer inbook: author und editor gleich? 
+             and
+             test {\ifnamesequal{editor}{author}} )
+           or
+           ( test {\ifentrytype{inbook}} 
+             and
+             ( test {\ifnameundef{bookauthor}}% inbook ohne bookauthor: author und editor gleich?
+               and
+               test {\ifnamesequal{editor}{author}} )
+             or
+               ( not test {\ifnameundef{bookauthor}}% inbook mit bookauthor: author und bookauthor gleich?
+                 and
+                 test {\ifnamesequal{editor}{bookauthor}} ) ) )
          or
          ( bool {xrefidem}
            and not 
@@ -838,6 +863,8 @@
     ( test \ifusetranslator
       and
       not test {\ifnameundef{translator}} )
+    or
+    bool {xref:inbook}
   }
     {}
     {\usebibmacro{byeditor+others}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx
index 16f962ff196..f05a070a024 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx
@@ -1,16 +1,6 @@
-% footnote-dw.bbx, Dominik Waßenhoven 2011
+% footnote-dw.bbx, Dominik Waßenhoven 2012
 
-\ProvidesFile{footnote-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style]
-
-\@ifpackagelater{biblatex}{2011/07/29}
-  {}
-  {\PackageError{biblatex}
-    {Outdated 'biblatex' package}
-    {The version of the 'footnote-dw' style you are using\MessageBreak
-     requires biblatex v1.6 or later.\MessageBreak
-     You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
-     This is a fatal error. I'm aborting now.}%
-    \endinput}
+\ProvidesFile{footnote-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style]
 
 \RequireBibliographyStyle{authortitle-dw}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx
index 462231a704f..36d8e3966b4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx
@@ -1,6 +1,15 @@
-% standard-dw.bbx, Dominik Waßenhoven 2011
+% standard-dw.bbx, Dominik Waßenhoven 2012
 
-\ProvidesFile{standard-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style]
+\ProvidesFile{standard-dw.bbx}[2012/06/28 v1.5 biblatex bibliography style]
+
+\@ifpackagelater{biblatex}{2011/11/13}
+  {}
+  {\PackageError{biblatex-dw}
+    {Outdated 'biblatex' package\MessageBreak
+     Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak
+     I found: '\csuse{ver@biblatex.sty}'.\MessageBreak
+     This is a fatal error. I'm aborting now}%
+     \endinput}
 
 \RequireBibliographyStyle{standard}
 
@@ -152,17 +161,51 @@
          {\printnames{author}}%
        \setunit{\labelnamepunct}}%
     \iffieldundef{booktitle}
-      {\usebibmacro{maintitle+title}}
-      {\usebibmacro{title}%
+      {\usebibmacro{maintitle+title-terselos}}
+      {\printfield{title}%
        \newunit\newblock
        \usebibmacro{in:}%
-       \usebibmacro{maintitle+booktitle}}%
+       \usebibmacro{maintitle+booktitle-terselos}}%
     \finentry}
     {\usedriver
       {\DeclareNameAlias{sortname}{default}}
       {\thefield{entrytype}}%
     \finentry}}
   
+\newbibmacro*{maintitle+title-terselos}{%
+  \iffieldsequal{maintitle}{title}
+    {\clearfield{maintitle}%
+     \clearfield{mainsubtitle}%
+     \clearfield{maintitleaddon}}
+    {\iffieldundef{maintitle}
+       {}
+       {\printfield{maintitle}%
+      	\newunit\newblock
+        \iffieldundef{volume}
+      	  {}
+          {\iffieldundef{volumes}
+            {}
+            {\printfield{volumes}%
+             \setunit{\addcomma\space}}%
+           \printfield{volume}%
+           \printfield{part}%
+           \setunit{\addcolon\space}}}}%
+        \printfield{title}%
+        \newunit}
+
+\newbibmacro*{maintitle+booktitle-terselos}{%
+  \iffieldundef{maintitle}
+    {}
+    {\printfield{maintitle}%
+     \newunit\newblock
+     \iffieldundef{volume}
+       {}
+       {\printfield{volume}%
+        \printfield{part}%
+        \setunit{\addcolon\space}}}%
+  \printfield{booktitle}%
+  \newunit}
+  
 \DeclareBibliographyDriver{shorthands}{%
   \toggletrue{listofshorthands}%
   \usebibmacro{terselos}}
@@ -208,17 +251,17 @@
 \newcommand*{\shorthandinbibpunct}{\addspace}
 \renewbibmacro*{begentry}{%
   \ifboolexpr{
-    test {\ifcitation}
-    or
-    togl {listofshorthands}
+    bool {bbx:shorthandinbib}
+    and not
+    ( test {\ifcitation}
+      or
+      togl {listofshorthands} )
   }
-    {}% im Zitat und der langen List of Shorthands sollen shorthands nicht ausgegeben werden
-    {\ifbool{bbx:shorthandinbib}
-      {\iffieldundef{shorthand}
-	      {}
-        {\printfield[shorthandinbib]{shorthand}%
-         \shorthandinbibpunct}}% ohne \setunit, damit das auf jeden Fall ausgegeben wird
-      {}}}
+    {\iffieldundef{shorthand}
+      {}
+      {\printfield[shorthandinbib]{shorthand}%
+       \nopunct\shorthandinbibpunct}}
+    {}}
  
 %% bei useeditor=true oder usetranslator=true
 \newbibmacro*{useeditor+others}{%
@@ -252,7 +295,7 @@
    \setunit{\labelnamepunct}\newblock}
 
 \newbibmacro*{usetranslator}{%
-  {\ifnamesequal{author}{translator}
+  \ifnamesequal{author}{translator}
     {\ifbool{bbx:edbyidem}
       {\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}%
        \addspace}%
@@ -265,7 +308,6 @@
    \usebibmacro{translatorstrg}%
    \clearname{translator}%
    \setunit{\labelnamepunct}\newblock}
-  {}}
 
 %% Wenn 'volumes' und 'volume' angegeben sind,
 %% 'volumes' immer vor 'volume' ausgeben
@@ -363,13 +405,15 @@
   \xifinlistcs{\strfield{xref}}{novolume@xrefparent}
     {\iffieldundef{volume}
       {}
-      {\xifinlistcs{\strfield{xref}}{citedas@xrefparent}
-        {\ifbool{cbx:xrefparent:firstcite}
+      {\ifbibliography
+        {\setunit{\addspace}}
+        {\xifinlistcs{\strfield{xref}}{citedas@xrefparent}
+          {\ifbool{cbx:xrefparent:firstcite}
+            {\newunit
+             \printtext{\bibstring{volume}\addspace}}
+            {\setunit{\addspace}}}
           {\newunit
-           \printtext{\bibstring{volume}\addspace}}
-          {\setunit{\addspace}}}
-        {\newunit
-         \printtext{\bibstring{volume}\addspace}}%
+           \printtext{\bibstring{volume}\addspace}}}%
        \printfield{volume}%
        \iffieldxref{year}% wenn 'year' bei child und parent gleich
          {}
@@ -862,9 +906,7 @@
   \ifbool{cbx:idemfull}
     {}
     {\usebibmacro{editor+others/translator+others}%
-     \ifnameundef{labelname}
-       {}
-       {\setunit{\labelnamepunct}}}%
+     \setunit*{\labelnamepunct}}%  
   \usebibmacro{maintitle+title}%
   \newunit
   \printlist{language}%
@@ -903,7 +945,9 @@
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
+\newbool{xref:inbook}%
 \DeclareBibliographyDriver{inbook}{%
+  \booltrue{xref:inbook}% the child is an inbook
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \ifbool{cbx:idemfull}
@@ -919,20 +963,11 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{in:}%
-  \ifboolexpr{
-    test \ifuseeditor
-    or
-    test \ifusetranslator
-  }
-    {\ifnamexref{labelname}%
-	    {\booltrue{xrefidem}}%
-	    {\boolfalse{xrefidem}}}
-    {\usebibmacro{authedxrefcheck}%
-     \usebibmacro{authauthxrefcheck}%
-     \ifbool{cbx:authedxref}
-      {\booltrue{xrefidem}}
-      {\boolfalse{xrefidem}}}%
-	\ifbool{bbx:xref}
+  \usebibmacro{authauthxrefcheck}%
+  \ifbool{cbx:authauthxref}
+    {\booltrue{xrefidem}}
+    {\boolfalse{xrefidem}}%
+  \ifbool{bbx:xref}
   	{\iffieldundef{xref}%
       {% Code, wenn kein xref vorhanden
   		 \usebibmacro{noxref:inbook}}%
@@ -962,7 +997,7 @@
   \ifbool{cbx:authedxref}
     {\booltrue{xrefidem}}
     {\boolfalse{xrefidem}}%
-	\ifbool{bbx:xref}
+  \ifbool{bbx:xref}
     {\iffieldundef{xref}
   	  {% Code, wenn kein xref vorhanden
        \usebibmacro{noxref:incollection}}
@@ -1462,7 +1497,9 @@
   \newunit\newblock
   \usebibmacro{byauthor}%
   \newunit\newblock
-  \usebibmacro{ifuse:byeditor+others}%
+  \ifbool{xref:inbook}% child is an @inbook entry
+    {\usebibmacro{byeditor+others}}
+    {\usebibmacro{ifuse:byeditor+others}}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
@@ -1610,7 +1647,9 @@
   \newunit\newblock
   \usebibmacro{byauthor}%
   \newunit\newblock
-  \usebibmacro{ifuse:byeditor+others}%
+  \ifbool{xref:inbook}% child is an @inbook entry
+    {\usebibmacro{byeditor+others}}
+    {\usebibmacro{ifuse:byeditor+others}}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx
index 2147945d171..e93d792ed3b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx
@@ -1,6 +1,6 @@
-% authortitle-dw.cbx, Dominik Waßenhoven 2011
+% authortitle-dw.cbx, Dominik Waßenhoven 2012
   
-\ProvidesFile{authortitle-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
+\ProvidesFile{authortitle-dw.cbx}[2012/06/28 v1.5 biblatex citation style]
 
 \RequireCitationStyle{standard-dw}
 
@@ -83,6 +83,27 @@
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
+  \ifbool{cbx:firstfull}
+    {\ifciteseen
+      {\usebibmacro{textcite:normal}}
+      {\usebibmacro{textcite:firstfull}}}
+    {\usebibmacro{textcite:normal}}}
+
+\newbibmacro*{textcite:firstfull}{%
+  \ifnameundef{labelname}
+    {}
+    {\ifnamesequal{labelname}{author}
+      {\clearname{author}}
+      {}%
+     \ifnamesequal{labelname}{editor}
+      {\clearname{editor}}
+      {}%
+     \ifnamesequal{labelname}{translator}
+      {\clearname{translator}}
+      {}}%
+  \printtext[bibhyperref]{\usebibmacro{cite:full}}}
+
+\newbibmacro*{textcite:normal}{%
   \iffieldundef{shorthand}
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
@@ -268,18 +289,12 @@
      {}%
    \multicitedelim}
   {\usebibmacro{textcite:postnote}}
-
+  
 %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
 %%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%%
 %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
 
 \newbool{cbx:parens}
-\newbool{cbx:loccit}
-
-\DeclareBibliographyOption{ibidpage}[true]{%
-  \ifstrequal{#1}{true}
-    {\ExecuteBibliographyOptions{loccittracker=constrict}}
-    {\ExecuteBibliographyOptions{loccittracker=false}}}
 
 \newbibmacro*{cite:ibid}{%
   \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx
index cd6cd7c6b8d..eab1c03dd5f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx
@@ -1,6 +1,6 @@
-% footnote-dw.cbx, Dominik Waßenhoven 2011
+% footnote-dw.cbx, Dominik Waßenhoven 2012
 
-\ProvidesFile{footnote-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
+\ProvidesFile{footnote-dw.cbx}[2012/06/28 v1.5 biblatex citation style]
 
 \RequireCitationStyle{standard-dw}
 
@@ -9,7 +9,6 @@
 \newbool{cbx:textcitefull}
 
 \ExecuteBibliographyOptions{
-  loccittracker=true,% für die Option 'ibidpage'
   uniquename=false,  % damit bei idem=false Vor- und Nachname gesetzt werden!
 }
 
@@ -60,13 +59,9 @@
               {\usebibmacro{cite:idem}%
                \usebibmacro{cite:title}}
               {\ifnameundef{labelname}
-                 {\usebibmacro{cite:title}}
-                 {\usebibmacro{cite:name}%
-                  \ifopcit
-                    {\ifloccit
-                      {\usebibmacro{cite:loccit}}
-                      {\usebibmacro{cite:opcit}}}
-                    {\usebibmacro{cite:title}}}}%
+                 {}
+                 {\usebibmacro{cite:name}}%
+               \usebibmacro{cite:title}}%
              \usebibmacro{cite:save}}}
          {\ifbool{cbx:shorthandibid}%
            {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
@@ -123,14 +118,15 @@
       {}
       {\ifnameundef{editor}
         {}
-        {\ifbool{xrefidem}%
-	        {\ifbool{bbx:edbyidem}
-		        {\newunit
-             \bibstring{byeditor}%
-             \setunit{\addspace}%
-             \bibstring[\mkidem]{idemdat\thefield{gender}}}
-            {\newunit
-             \usebibmacro{cite:byeditor}}}%
+        {\ifboolexpr{
+          bool {xrefidem}
+          and
+          bool {bbx:edbyidem}
+        }
+          {\newunit
+           \bibstring{byeditor}%
+           \setunit{\addspace}%
+           \bibstring[\mkidem]{idemdat\thefield{gender}}}
           {\newunit
            \usebibmacro{cite:byeditor}}}}}%
   \usebibmacro{cite:seenote}}
@@ -172,20 +168,24 @@
     {\iffieldundef{shorthand}
       {\ifnameundef{labelname}
         {}
-        {\ifbool{xrefidem}
+        {\ifboolexpr{
+          bool {xrefidem}
+          and
+          bool {bbx:edbyidem}
+        }
           {\usebibmacro{cite:xref:idem}}
-          {\usebibmacro{cite:editor}%
+          {\ifbool{xref:inbook}
+            {\usebibmacro{author}}
+            {\usebibmacro{cite:editor}}%
            \nametitledelim}}%
        \usebibmacro{cite:title}}       
       {\usebibmacro{cite:shorthand}}}
     {\ifboolexpr{
       bool {xrefidem}
-      or
-      bool {cbx:authauthxref}
+      and
+      bool {bbx:edbyidem}
     }
-       {\ifbool{bbx:edbyidem}
-         {\usebibmacro{cite:fullxrefidem}}%
-         {\usebibmacro{cite:fullxref}}}%
+       {\usebibmacro{cite:fullxrefidem}}
        {\usebibmacro{cite:fullxref}}}}
 
 \newbibmacro*{cite:fullxref}{%
@@ -254,8 +254,7 @@
   {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\footcite}[\mkfootnotecite]
-  {\bibsentence
-   \usebibmacro{prenote}}
+  {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
@@ -272,8 +271,7 @@
   {\usebibmacro{cite:postnote}}
 
 \DeclareCiteCommand{\footfullcite}[\mkfootnotecite]
-  {\bibsentence
-   \usebibmacro{prenote}%
+  {\usebibmacro{prenote}%
    \usebibmacro{cite:full:citepages}%
    \booltrue{cbx:fullcite}}
   {\usedriver
@@ -282,6 +280,13 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkparencite\mkfootnotecite]
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
 \DeclareCiteCommand{\textcite}[\footnotecheck\cbx@textcite\footcite]
   {\gdef\cbx@savedkeys{}}
   {\printnames{labelname}%
@@ -294,7 +299,12 @@
      [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
 
 \newrobustcmd{\cbx@textcite}[2]{%
-  \def\cbx@savedcites{#1}\ifbool{cbx:parencitefoot}{#2\addspace{\mkbibparens{\cbx@savedcites}}}{#2\cbx@savedcites}}
+  \def\cbx@savedcites{#1}%
+  \ifbool{cbx:parencitefoot}
+    {#2%
+     \addspace\mkbibparens{\cbx@savedcites}}
+    {#2%
+     \cbx@savedcites}}
 
 \DeclareMultiCiteCommand{\cites}[\mkfootnotecite]{\cite}{\multicitedelim}
 \DeclareMultiCiteCommand{\parencites}[\mkparencite]{\parencite}{\multicitedelim}
@@ -302,40 +312,13 @@
 \DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\textcitesdelim}
 
 %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%%
-%%%%% Unverändert aus verbose-trad1 übernommen  %%%%%
+%%%%% Unverändert aus verbose-inote übernommen  %%%%%
 %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% 
 
-\newbool{cbx:loccit}
-
-\DeclareBibliographyOption{ibidpage}[true]{%
-  \ifstrequal{#1}{true}
-    {\renewbibmacro*{cite:ibid:page}{\global\booltrue{cbx:loccit}}}
-    {\renewbibmacro*{cite:ibid:page}{}}}
-
-\newbibmacro*{cite:opcit}{%
-  \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}}
-
-\newbibmacro*{cite:loccit}{%
-  \printtext{%
-    \bibhyperlink{cite\@nameuse{cbx:lastcite@\thefield{entrykey}}}{%
-      \bibstring[\mkibid]{loccit}}}%
-  \global\booltrue{cbx:loccit}}
-
 \newbibmacro*{cite:ibid}{%
-  \printtext{%
-    \bibhyperlink{cite\@nameuse{cbx:lastcite@\thefield{entrykey}}}{%
-      \bibstring[\mkibid]{ibidem}}}%
+  \printtext[bibhyperlink]{\bibstring[\mkibid]{ibidem}}%
   \ifloccit
-    {\usebibmacro{cite:ibid:page}}
+    {\global\booltrue{cbx:loccit}}
     {}}
 
-\newbibmacro*{cite:ibid:page}{}
-       
-\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
-  {\usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx
index b0375079178..2e9269cec62 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx
@@ -1,9 +1,21 @@
-% standard-dw.cbx, Dominik Waßenhoven 2011
+% standard-dw.cbx, Dominik Waßenhoven 2012
 
-\ProvidesFile{standard-dw.cbx}[2011/11/20 v1.4 biblatex citation style]
+\ProvidesFile{standard-dw.cbx}[2012/06/28 v1.5 biblatex citation style]
+
+\@ifpackagelater{biblatex}{2011/11/13}
+  {}
+  {\PackageError{biblatex-dw}
+    {Outdated 'biblatex' package\MessageBreak
+     Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak
+     I found: '\csuse{ver@biblatex.sty}'.\MessageBreak
+     This is a fatal error. I'm aborting now}%
+     \endinput}
 
 \newbool{cbx:authauthxref}
 \newbool{cbx:authedxref}
+\newbool{cbx:citeauthor}
+\newbool{cbx:citeauthorfoot}
+\newbool{cbx:citeauthornormalfont}
 \newbool{cbx:citedas}
 \newbool{cbx:edstringincitations}
 \newbool{cbx:firstfullname}
@@ -14,6 +26,7 @@
 \newbool{cbx:rpcited}% wurde der parent des @review schon zitiert?
 \newbool{cbx:xrefparent:firstcite}
 \newbool{cbx:shorthandibid}
+\newbool{cbx:loccit}
 
 \newbibmacro*{cite:citepages}{}
 \newbibmacro*{cite:full:citepages}{}
@@ -35,15 +48,36 @@
 \DeclareEntryOption{shorthandibid}[true]{%
   \csuse{bool#1}{cbx:shorthandibid}}
 
+\DeclareBibliographyOption{citeauthor}[namefont]{%
+  \ifcsdef{cbx@opt@citeauthor@#1}
+    {\csuse{cbx@opt@citeauthor@#1}}
+    {\blxdw@error{%
+       Invalid option 'citeauthor=#1'\MessageBreak
+       Valid values are 'namefont', 'namefontfoot', 'normalfont'}}}
+\def\cbx@opt@citeauthor@namefont{%
+  \boolfalse{cbx:citeauthornormalfont}%
+  \boolfalse{cbx:citeauthorfoot}}
+\def\cbx@opt@citeauthor@namefontfoot{%
+  \boolfalse{cbx:citeauthornormalfont}%
+  \booltrue{cbx:citeauthorfoot}}
+\def\cbx@opt@citeauthor@normalfont{%
+  \booltrue{cbx:citeauthornormalfont}%
+  \boolfalse{cbx:citeauthorfoot}}
+
+\DeclareBibliographyOption{ibidpage}[true]{%
+  \ifstrequal{#1}{true}
+    {\ExecuteBibliographyOptions{loccittracker=context}}% Standard: constrict
+    {\ExecuteBibliographyOptions{loccittracker=false}}}
+
 \DeclareBibliographyOption{pageref}[true]{%
   \setbool{cbx:pageref}{#1}}
 
 \DeclareBibliographyOption{citepages}[permit]{%
   \ifcsdef{cbx@opt@citepages@#1}
     {\csuse{cbx@opt@citepages@#1}}
-    {\PackageError{biblatex}
-       {Invalid option 'citepages=#1'}
-       {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}}
+    {\blxdw@error
+       {Invalid option 'citepages=#1'\MessageBreak
+        Valid values are 'permit', 'suppress', 'omit', 'separate'}}}
 
 \def\cbx@opt@citepages@permit{%
   \renewbibmacro*{cite:citepages}{}%
@@ -111,7 +145,6 @@
   edstringincitations=true,
   ibidtracker=constrict,
   idemtracker=constrict,
-  loccittracker=false,
   opcittracker=false,
   pagetracker=true,
   shorthandibid=true
@@ -240,14 +273,23 @@
           \cbx@nameseen{#1#3#5#7}}%
        \usebibmacro{name:andothers}}
      \DeclareCiteCommand{\citeauthor}
-       {\boolfalse{citetracker}%
+       {\booltrue{cbx:citeauthor}%
+        \boolfalse{citetracker}%
         \boolfalse{pagetracker}%
         \usebibmacro{prenote}}
        {\indexnames{labelname}%
         \printnames[citeauthor]{labelname}}
        {\multicitedelim}
        {\usebibmacro{postnote}}}
-    {}}
+    {\DeclareCiteCommand{\citeauthor}
+       {\booltrue{cbx:citeauthor}%
+        \boolfalse{citetracker}%
+        \boolfalse{pagetracker}%
+        \usebibmacro{prenote}}
+       {\indexnames{labelname}%
+        \printnames{labelname}}
+       {\multicitedelim}
+       {\usebibmacro{postnote}}}}
 
 %% Formatierung von 'ibidem' entsprechend der Option 'ibidemfont'
 \providecommand*{\mkibid}[1]{%
@@ -340,6 +382,7 @@
 %% Test, ob author des @inbook und author des @book bei xref 
 %% identisch sind (für xref=true, edbyidem=true); nötig, 
 %% damit der Herausgeber nicht durch idem ersetzt wird
+%\newbool{cbx:autheddiff}% auther of @inbook and editor of @book differ
 \newbibmacro*{authauthxrefcheck}{%
   \iffieldundef{xref}
     {}
@@ -351,7 +394,7 @@
      }
        {\booltrue{cbx:authauthxref}}
        {\boolfalse{cbx:authauthxref}}}}
-             
+
 %% für @review
 \DeclareCiteCommand{\bbx@review}
 	{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx
index 4e26c9c1578..d147e65c164 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx
@@ -1,6 +1,6 @@
-% english-dw.lbx, Dominik Waßenhoven 2011
+% english-dw.lbx, Dominik Waßenhoven 2012
 
-\ProvidesFile{english-dw.lbx}[2011/11/20 v1.4 biblatex localization file]
+\ProvidesFile{english-dw.lbx}[2012/06/28 v1.5 biblatex localization file]
 
 \NewBibliographyString{%
   idemdat,%
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx
index 106eea7ac72..34ff8d83625 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx
@@ -1,6 +1,6 @@
-% german-dw.lbx, Dominik Waßenhoven 2011
+% german-dw.lbx, Dominik Waßenhoven 2012
 
-\ProvidesFile{german-dw.lbx}[2011/11/20 v1.4 biblatex localization file]
+\ProvidesFile{german-dw.lbx}[2012/06/28 v1.5 biblatex localization file]
 
 \InheritBibliographyExtras{german}