biblatex-fiwi 2011/11/18 v1.1a

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

5 files changed, 49 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/README b/Master/texmf-dist/doc/latex/biblatex-fiwi/README
index bbf92751ebc..3d3098e9fe6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/README
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/README
@@ -1,4 +1,4 @@
-biblatex-fiwi 2011/11/15 v1.1
+biblatex-fiwi 2011/11/18 v1.1a
 Copyright (c) 2011 Simon Spiegel <simon(at)simifilm.ch>
   
 ************************************************************
@@ -12,75 +12,61 @@ Contents of README
  6. Files
 
  
- 1. Package description
- ----------------------
+1. Package description
+----------------------
  
- biblatex-fiwi is a collection of styles for the 
- biblatex package. It was designed for citations in German 
- Humanities, especially film studies, and offers some features that are not provided by the standard biblatex styles. biblatex-fiwi dependend 
- on biblatex (version 1.7 at least) and cannot be used 
- without it!
+biblatex-fiwi is a collection of styles for the biblatex package. It was designed for citations in German Humanities, especially film studies, and offers some features that are not provided by the standard biblatex styles. biblatex-fiwi dependend on biblatex (version 1.7 at least) and cannot be used without it!
  
- Since the style in its current incarnation is highly optimized for documents written in German, the main documentation is only available in German. If there is enough interest, I will maybe add English documentation at a later point.
+Since the style in its current incarnation is highly optimized for documents written in German, the main documentation is only available in German. If there is enough interest, I will maybe add English documentation at a later point.
  
- Any suggestions concerning this package are highly 
- appreciated.
+Any suggestions concerning this package are highly appreciated.
  
  
- 2. Installation
- ---------------
+2. Installation
+---------------
  
- If you would like to install biblatex-fiwi manually, do the following: Extract the tds.zip archive to the $LOCALTEXMF directory of your system. 
- Refresh your filename database. For further information, please see the documentation of your LaTeX distribution.
+If you would like to install biblatex-fiwi manually, do the following: Extract the tds.zip archive to the $LOCALTEXMF directory of your system. 
+Refresh your filename database. For further information, please see the documentation of your LaTeX distribution.
  
  
- 3. Usage notes
- --------------
+3. Usage notes
+--------------
  
- The styles are loaded as the biblatex standard styles:
+The styles are loaded as the biblatex standard styles:
  
    \usepackage[bibstyle=fiwi,citestyle=fiwi]{biblatex}
  or
    \usepackage[bibstyle=fiwi2,biblatex-fiwi2]{biblatex}
 
- If you want to learn more about the styles and their 
- additional options, please consult the package 
- documentation.
+If you want to learn more about the styles and their additional options, please consult the package documentation.
 
 
- 4. Documentation
- ----------------
+4. Documentation
+----------------
 
- The English documentation of biblatex-dw can be found in 
- the file 'biblatex-fiwi.pdf'.
+The German documentation of biblatex-fiwi can be found in the file 'biblatex-fiwi.pdf'.
 
 
   
- 5. Licence
- ----------
+5. Licence
+----------
  
- 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 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'.
+This work has the LPPL maintenance status `maintained'.
  
- The Current Maintainer of this work is Simon Spiegel.
+The Current Maintainer of this work is Simon Spiegel.
  
  
- 6. Files
- -------- 
+6. Files
+-------- 
 
- This work consists of the following files:
+This work consists of the following files:
 
- * README                 	% this file, including licence
+ * README		% this file, including licence
  * fiwi.bbx
  * fiwi2.bbx
  * fiwi.cbx
- * biblatex-fiwi.pdf       % German documentation  
- * biblatex-fiwi.tex       % German documentation 
- * examples.bib			   % bib for documentation	
\ No newline at end of file
+ * biblatex-fiwi.pdf	% German documentation  
+ * biblatex-fiwi.tex	% German documentation 
+ * examples.bib		% bib for documentation	
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
index 047c719c577..9e3a2479289 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
index 152caa93c4a..43b5c5a7338 100644
--- a/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-fiwi/biblatex-fiwi.tex
@@ -1,6 +1,6 @@
 %!TEX encoding = IsoLatin9
-% biblatex-fiwi,v 1.1 2011/11/15 
-\documentclass{ltxdockit}[2010/09/26]
+% biblatex-fiwi,v 1.1a 2011/11/18 
+\documentclass{ltxdockit}[2011/11/18]
 \usepackage[latin9]{inputenc}
 \usepackage{hyphsubst}
 \HyphSubstIfExists{ngerman-x-latest}{%
@@ -30,7 +30,7 @@
   url={http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/},
   author={Simon Spiegel},
   email={simon@simifilm.ch},
-  revision={1.1},
+  revision={1.1a},
   date={\rcstoday}}
 
 \hypersetup{%
@@ -712,6 +712,7 @@ Für die Beispiele wird der Stil \sty{fiwi} verwendet; folgende Optionen wurden z
 %\cite{Suvin.D:2007a,Suvin.D:2007b}
 \begin{changelog}
 
+\item[1.1a] Kleine Fehlerkorrekturen (Dank an j mach wust)
 \item[1.1] Erste Veröffentlichung
 
 \end{changelog}
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
index 9a49931e264..09d2e173696 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi.bbx
@@ -1,6 +1,6 @@
-% $Id: fiwi.bbx, v1.1 2011/11/15 07:11:00 Simon Spiegel
+% $Id: fiwi.bbx, v1.1a 2011/11/18 Simon Spiegel
 
-\ProvidesFile{fimi.bbx}[v1.1 2011/11/15 film studies bibliography style]
+\ProvidesFile{fimi.bbx}[v1.1a 2011/11/18 film studies bibliography style]
 
 \@ifpackagelater{biblatex}{2011/11/12}
      {}
@@ -35,11 +35,15 @@
 \DeclareBibliographyOption{publisher}[true]{\settoggle{printpublisher}{#1}}%
 \DeclareBibliographyOption{filmruntime}[true]{\settoggle{filmruntime}{#1}}%
 \DeclareBibliographyOption{citeprefix}[true]{\settoggle{citeprefix}{#1}}
-\DeclareBibliographyOption{dashed}[true]{%
+
+    
+    \DeclareBibliographyOption{dashed}[true]{%
   \ifstrequal{#1}{true}
-{\toggletrue{bibliographydash}\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
+    {\toggletrue{bibliographydash}%
+     \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
     {\renewbibmacro*{bbx:savehash}{}}}
 
+
 \ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=3,maxitems=9,useprefix=true,sorting=nyt,date=long,urldate=long,hyperref=auto,pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true,isbn=false,babel=hyphen}
 \ExecuteBibliographyOptions[misc,movie,video]{uniquename=false,labelyear=false}
 
@@ -570,7 +574,11 @@ or test {\iffieldequalstr{entrytype}{set}}}
 \newbibmacro*{bbx:savehash}{%
   \savefield{fullhash}{\bbx@lasthash}}
 
+
+\newbool{bbx@inset}
+
 \DeclareBibliographyDriver{set}{%
+  \booltrue{bbx@inset}%
   \entryset
     {\toggletrue{intransdecision}\ifnumequal{\thefield{entrysetcount}}{1}
        {}
@@ -790,7 +798,7 @@ or test {\iffieldequalstr{entrytype}{set}}}
     {\setunit{}\addnbspace\printtext{\mkbibparens{=\addspace%
        \printfield{series}%
        \setunit{\addcolon\addnbspace}%
-       \printfield{number}}}}%
+       \printfield{number}}}\adddot\addnbspace}%
 }}%
 {}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
index fc3d1a31f96..ce0464ce640 100644
--- a/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-fiwi/fiwi2.bbx
@@ -1,7 +1,7 @@
-% $Id: fiwi2.bbx, v 1.1 2011/11/15 07:11:00 Simon Spiegel
+% $Id: fiwi2.bbx, v 1.1a 2011/11/18Simon Spiegel
 % Stil mit Jahrestahl nach Autor
 
-\ProvidesFile{fiwi2.bbx}[v 1.1 2011/11/15 film studies bibliography style Author (Year)]
+\ProvidesFile{fiwi2.bbx}[v 1.1a 2011/11/18 film studies bibliography style Author (Year)]
 
 \RequireBibliographyStyle{fiwi}
 
@@ -137,7 +137,7 @@
 \usebibmacro{author/translator}%
 \usebibmacro{labelyear+extrayear}%
 \newblock
-\usebibmacro{review}%
+\usebibmacro{review}{\thefield{usera}}%
 \newunit\newblock
 \usebibmacro{bytranslator}%
 \newunit\newblock