summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/dvdcoll
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-02-28 01:31:43 +0000
committerKarl Berry <karl@freefriends.org>2007-02-28 01:31:43 +0000
commit6fc4926b8b360e85e414b3cce37ca44b76d582c3 (patch)
tree410fa70a4a13f7c42cb7d66f830fd27623d862f6 /Master/texmf-dist/tex/latex/dvdcoll
parente296cc104495839488dd298c8fb0a569cf62309f (diff)
dvdcoll update (26feb07)
git-svn-id: svn://tug.org/texlive/trunk@3995 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/dvdcoll')
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/american.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/australian.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/british.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/dcwrtbib.sty40
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls248
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/english.dcl7
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/francais.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/french.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl7
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/german.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl7
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl2
-rw-r--r--Master/texmf-dist/tex/latex/dvdcoll/pdfnotiz.sty7
21 files changed, 298 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl b/Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl
index 8b34df8b66a..c7c552a2890 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl b/Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl
index b963aa2013b..ad431b8b5fe 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl
index 600a4acaeb3..cb68449c537 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/american.dcl b/Master/texmf-dist/tex/latex/dvdcoll/american.dcl
index 903e26fdb70..3c637052582 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/american.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/american.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/australian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/australian.dcl
index f451c053520..9bfdb30a9be 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/australian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/australian.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl
index e6391503a15..27a012dda64 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/british.dcl b/Master/texmf-dist/tex/latex/dvdcoll/british.dcl
index c17f78ac278..62714e682d1 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/british.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/british.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl
index 96f7fd95b84..8c89525fa3a 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl b/Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl
index 5f12ba73357..997e6aa911a 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/dcwrtbib.sty b/Master/texmf-dist/tex/latex/dvdcoll/dcwrtbib.sty
new file mode 100644
index 00000000000..0e590333f07
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcwrtbib.sty
@@ -0,0 +1,40 @@
+%%
+%% Copyright (C) 2007 by:
+%% Josef Kleber
+%% <josef.kleber@gmx.net>
+%%
+%% This file 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
+%% 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "author-maintained".
+%%
+%% This Current Maintainer of this work is Josef Kleber.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%
+\ProvidesPackage{dcwrtbib}[2007/02/10 dcwrtbib.sty v1.0 - Josef Kleber (C) 2007]%
+%
+\RequirePackage{afterpage}%
+%
+\newwrite\dc@bibout%
+%
+\immediate\openout\dc@bibout=dc_\jobname.bib\relax%
+%
+\newcommand{\bibwrite}[1]%
+{%
+ \immediate\write\dc@bibout{#1}%
+}%
+%
+\AtEndDocument%
+{%
+ \afterpage{\closeout\dc@bibout}%
+}%
+% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls b/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls
index 81e46fcb1e7..f3a33c601c6 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dvdcoll.cls
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
@@ -22,12 +22,13 @@
%
\NeedsTeXFormat{LaTeX2e}%
%
-\ProvidesClass{dvdcoll}[2006/10/06 dvdcoll.cls v0.6a - Josef Kleber (C) 2006]%
+\ProvidesClass{dvdcoll}[2007/02/23 dvdcoll.cls v1.0 - Josef Kleber (C) 2006-2007]%
%
\RequirePackage{xkeyval}%
\RequirePackage{ifthen}%
%
%
+% define class option language for setting a language
\define@key{dvdcoll.cls}{language}[babel]%
{%
\ifthenelse{\NOT\equal{#1}{babel}}%
@@ -88,6 +89,7 @@
}%
}%
%
+% define class option dvdlabel for horizontal positioning of the label
\define@choicekey*{dvdcoll.cls}{dvdlabel}[\valuedvdcoll\nr]{wide,narrow}[wide]%
{%
\ifcase\nr\relax%
@@ -97,6 +99,7 @@
\fi%
}%
%
+% define class option dvdskip for vertical space after Dvd
\define@choicekey*{dvdcoll.cls}{dvdskip}[\valuedvdskip\nr]{small,medium,big}[medium]%
{%
\ifcase\nr\relax%
@@ -108,6 +111,7 @@
\fi%
}%
%
+% define class option pagenumbers (yes,no)
\define@choicekey*{dvdcoll.cls}{pagenumbers}[\valuepagenumbers\nr]{yes,no}[yes]%
{%
\ifcase\nr\relax%
@@ -121,6 +125,7 @@
\fi%
}%
%
+% define class option heading for numbered or unnumbered headings
\define@choicekey*{dvdcoll.cls}{heading}[\valueheading\nr]{number,nonumber}[nonumber]%
{%
\ifcase\nr\relax%
@@ -128,7 +133,7 @@
\AtBeginDocument%
{%
\setcounter{secnumdepth}{4}%
- \SetTOCSecIndent{1em}%
+ \SetTOCSecIndent{2.2em}%
\SetLFRSecNumwidth{4.5em}%
}%
}%
@@ -137,21 +142,25 @@
\AtBeginDocument%
{%
\setcounter{secnumdepth}{-2}%
- \SetTOCSecIndent{1em}%
+ \SetTOCSecIndent{0em}%
\SetLFRSecNumwidth{0em}%
}%
\fi%
}%
%
+% define command option (DvdSeries) dvdnumbering for dvd numbering style
\define@choicekey*{DvdSeries}{dvdnumbering}[\valuedvdnumbering\nr]{normal,season}[normal]%
{%
\ifcase\nr\relax%
\renewcommand{\dc@option@dvdnumbering}{normal}%
+ \renewcommand*\toclevel@dcdvd{1}%
\or%
\renewcommand{\dc@option@dvdnumbering}{season}%
+ \renewcommand*\toclevel@dcdvd{2}%
\fi%
}%
%
+% define command option (DvdSeries) titlenumbering for dvd title numbering style
\define@choicekey*{DvdSeries}{titlenumbering}[\valuetitlenumbering\nr]{normal,season}[normal]%
{%
\ifcase\nr\relax%
@@ -161,6 +170,36 @@
\fi%
}%
%
+% define command option (DvdSeries) labelbase for setting a base counter in automatic labeling
+\define@key{DvdSeries}{labelbase}[-1]%
+{%
+ \renewcommand*\dc@option@labelbase{#1}%
+ \setcounter{labelcount}{#1}%
+ \addtocounter{labelcount}{-1}%
+}%
+%
+% define command option (DvdSeries) labelbase for setting a prefix of the base counter in automatic labeling
+\define@key{DvdSeries}{labelbaseprefix}[]%
+{%
+ \renewcommand*\dc@option@labelbaseprefix{#1}%
+}%
+%
+% define command option (DvdSeries) labelbase for setting a suffix of the base counter in automatic labeling
+\define@key{DvdSeries}{labelbasesuffix}[]%
+{%
+ \renewcommand*\dc@option@labelbasesuffix{#1}%
+}%
+%
+% define command option (DvdSeries) labelbase for setting the length of the base counter in automatic labeling
+\define@key{DvdSeries}{labelbaselength}[4]%
+{%
+ \ifnum#1<1%
+ \ClassError{dvdcoll}{labelbaselength < 1}{labelbaselength < 1 makes no sense\MessageBreak%
+ please increase labelbaselength}%
+ \fi%
+ \renewcommand*\dc@option@labelbaselength{#1}%
+}%
+%
%
\ExecuteOptionsX{dvdlabel,dvdskip,pagenumbers,heading,language}%
%
@@ -171,11 +210,14 @@
\RequirePackage{tabularx}%
\RequirePackage{booktabs}%
\RequirePackage{array}%
+\RequirePackage{multicol}%
+\RequirePackage{ragged2e}%
\RequirePackage{pdfnotiz}%
+\RequirePackage{dcwrtbib}%
\RequirePackage[naturalnames=true,hypertexnames=false]{hyperref}%
%--- naturalnames=true,hypertexnames=false --- verhindert das mehrfache Anlegen von hyperref-Ankern
% (bedingt durch das Rücksetzen des Zahlers chapter)
-% und beseitigt die Warnungen (ext4) von hyperref
+% und beseitigt die Warnungen (ext4) von hyperref
%
%
%--- Package adjustments ---
@@ -191,6 +233,13 @@
\newcounter{season}%
\newcounter{seasontitlecount}%
\newcounter{seasondvd}%
+% for generation of labelbase
+\newcounter{labelcount}%
+% to produce a unique hyperref destination for season bookmark
+\newcounter{bookmarkcount}%
+\setcounter{bookmarkcount}{0}%
+%to prevent several bookmarks for the same season
+\newcounter{bookmarkseason}%
%
%
%--- Variables ---
@@ -204,6 +253,8 @@
%
\def\dc@third{min}%
\def\dc@addhspace@title@count{0.7em}%
+% used hspace in the BibTeX file
+\def\DvdBibSpace{\string\hspace{0.7em}}%
%
% \***skip aus source2e; etwas vergrößert
\def\dc@smallskip{\vspace{6pt plus 2pt minus 2pt}}%
@@ -218,10 +269,17 @@
\newcommand*\dc@miss{}%
\newcommand*\dc@lfrname{}%
\newcommand*\dc@pdf@subject{}%
+\newcommand*\dc@dvdlist{}%
+\newcommand*\dc@season{}%
+\newcommand*\dc@pdftitle{}%
%
%
\newcommand*\dc@option@titlenumbering{}%
\newcommand*\dc@option@dvdnumbering{}%
+\newcommand*\dc@option@labelbase{}%
+\newcommand*\dc@option@labelbaseprefix{}%
+\newcommand*\dc@option@labelbasesuffix{}%
+\newcommand*\dc@option@labelbaselength{}%
%
%
\newcommand*\dc@pcwlz[1]% PrintCounterWithLeadingZero
@@ -264,6 +322,64 @@
}%
}%
%
+% all \leadzeros provided by Heiko Oberdiek in d.c.t.t, Msg-Id: <eqrquu$f52$1@news.BelWue.DE>
+\newcommand*{\leadzero}[2]{%
+ \ifnum#2<0 %
+ -%
+ \expandafter\@leadzero\expandafter{%
+ \romannumeral\number#1000\expandafter
+ }\expandafter{%
+ \number-#2%
+ }%
+ \expandafter\@firstofone\expandafter{\number-#2}%
+ \else
+ \expandafter\@leadzero\expandafter{%
+ \romannumeral\number#1000\expandafter
+ }\expandafter{%
+ \number#2%
+ }%
+ \expandafter\@firstofone\expandafter{\number#2}%
+ \fi
+}
+\def\@leadzero#1#2{%
+ \ifx\\#2\\%
+ \@@leadzero#1\@nil
+ \else
+ \ifx\\#1\\%
+ \else
+ \expandafter\@@@leadzero\expandafter{\@gobble#2}{#1}%
+ \fi
+ \fi
+}
+\def\@@leadzero#1\@nil#2\fi\fi{%
+ \fi
+ \ifx\\#1\\%
+ \else
+ 0%
+ \expandafter\@@leadzero\@gobble#1\@nil
+ \iftrue\fi
+ \fi
+}
+\def\@@@leadzero#1#2\fi\fi{%
+ \fi
+ \fi
+ \expandafter\@leadzero\expandafter{\@gobble#2}{#1}%
+}
+%
+\renewcommand*{\thelabelcount}{%
+ \leadzero{\dc@option@labelbaselength}{\value{labelcount}}%
+}%
+%
+% create new toc type with same definition as section
+\let\l@dcdvd\l@section
+%
+% define a bookmark level (section) for dcdvd toc-entry
+\newcommand*\toclevel@dcdvd{1}%
+\newcommand*\toclevel@lfrsec{1}%
+%
+\hypersetup{pdfkeywords={LaTeX,dvdcoll.cls,DVD,Archiv,archives}}%
+\AtEndOfClass{\AtBeginDocument{\hypersetup{pdfcreator={LaTeX with dvdcoll.cls},pdftitle={\dc@pdftitle}}}}%
+%
%
%--- Commands ---
%
@@ -313,7 +429,20 @@
{%
\setcounter{season}{#2}%
\ifthenelse{#1 = 1}%
- {\setcounter{seasondvd}{0}}% just reset if #1 equal 1
+ {%
+ \setcounter{seasondvd}{0}% just reset if #1 = 1
+ }%
+ {}% if dvdnumbering=season
+ \ifthenelse{\equal{\dc@option@dvdnumbering}{season}}%
+ {% and bookmark is to be set for the first time
+ \ifthenelse{\thebookmarkseason = #2}%
+ {}%
+ {% create season bookmark
+ \pdfbookmark[1]{\dc@season{} \theseason}{seasonbookmark*.\thebookmarkcount.\theseason}%
+ % store season in bookmarkseason to prevent several bookmarks of the same season
+ \setcounter{bookmarkseason}{#2}%
+ }%
+ }%
{}%
\setcounter{seasontitlecount}{#1}%
\addtocounter{seasontitlecount}{-1}%
@@ -328,13 +457,32 @@
}%
%
%
-\newcommand*\DvdSeries[2][titlenumbering=normal,dvdnumbering=normal]%
+\newcommand*\DvdSeries[2][titlenumbering=normal,dvdnumbering=normal,labelbase=-1,labelbaseprefix={},labelbasesuffix={},labelbaselength=4]%
{%default - default setting of xkeyval seem not to work??? all or nothing???
\renewcommand*\dc@option@dvdnumbering{normal}%
\renewcommand*\dc@option@titlenumbering{normal}%
+ \renewcommand*\dc@option@labelbase{-1}%
+ \renewcommand*\dc@option@labelbaseprefix{}%
+ \renewcommand*\dc@option@labelbasesuffix{}%
+ \renewcommand*\dc@option@labelbaselength{4}%
%
\setkeys{DvdSeries}{#1}%
- \SetSeason{1}%
+ %reset season bookmark indicator
+ \setcounter{bookmarkseason}{-1}%
+ % create unique hyperref destination for season bookmark
+ \stepcounter{bookmarkcount}%
+ \ifthenelse{\equal{\dc@option@dvdnumbering}{season}}%
+ {%adjust toclevel for season bookmark
+ \renewcommand*\toclevel@dcdvd{2}%
+ }%
+ {%
+ \renewcommand*\toclevel@dcdvd{1}%
+ }%
+ %\SetSeason{1}%
+ %would produce double season bookmark entries, therefore
+ \setcounter{season}{1}%
+ \setcounter{seasondvd}{0}%
+ \setcounter{seasontitlecount}{0}%
\chapter{#2}%
\def\dc@series{#2}%
\setcounter{season}{-1}%
@@ -342,9 +490,8 @@
{%
\setcounter{dvdcount}{0}%
}%
- % durch heading=nonumber (secnumdepth=-2) funktioniert das automatische
- % Zurücksetzen von dvdcount nicht mehr, da chapter offensichtlich nicht
- % mehr zurückgesetzt wird!
+ % setting heading=nonumber (secnumdepth=-2) means no automatic reset
+ % of dvdcount because chapter get not reset
{}%
}%
%
@@ -355,10 +502,11 @@
\ifthenelse{\equal{\dc@option@titlenumbering}{season}}%
{\refstepcounter{seasontitlecount}}%
{\refstepcounter{titlecount}}%
+ %if marker F is set
\ifthenelse{\equal{\dc@miss}{#2}}%
{%
- %Eintrag in lfr unbedingt vor Tabelleneintrag, ansonsten Fehler in der Tabelle - don't no why!
- %Eintrag in lfr bei heading=nonumber OHNE Nummern
+ %lfr entry absolutly before tabular line, otherwise error in the table - don't no why!
+ %lfr entry without numbers if heading=nonumber
\ifthenelse{\equal{\valueheading}{nonumber}}%
{%
\addcontentsline{lfr}{lfrsec}{\protect\numberline{} \dc@series\ - #1}%
@@ -371,14 +519,15 @@
{%normal
\addcontentsline{lfr}{lfrsec}{\protect\numberline{\thepart.\thechapter.\thedvdcount.\thetitlecount} \dc@series\ - #1}%
}%
- }%
+ }%
+ %construct table
\dc@print@counter & #1\strut & \hfill\dc@miss \tabularnewline%
}%
{%
\ifthenelse{\equal{}{#2}}%
- % keine Minutenangabe
+ % no min
{\dc@print@counter & #1\strut & \tabularnewline}%
- % mit Minutenangabe
+ % with min
{\dc@print@counter & #1\strut & \hfill{}#2~\dc@third \tabularnewline}%
}%
}%
@@ -390,10 +539,11 @@
\ifthenelse{\equal{\dc@option@titlenumbering}{season}}%
{\refstepcounter{seasontitlecount}}%
{\refstepcounter{titlecount}}%
+ % if marker F is set
\ifthenelse{\equal{\dc@miss}{#2}}%
{%
- %Eintrag in lfr unbedingt vor Tabelleneintrag, ansonsten Fehler in der Tabelle - don't no why!
- %Eintrag in lfr bei heading=nonumber OHNE Nummern
+ %lfr entry absolutly before tabular line, otherwise error in the table - don't no why!
+ %lfr entry without numbers if heading=nonumber
\ifthenelse{\equal{\valueheading}{nonumber}}%
{%
\addcontentsline{lfr}{lfrsec}{\protect\numberline{} \dc@series\ - #1}%
@@ -411,14 +561,39 @@
}%
{%
\ifthenelse{\equal{}{#2}}%
- % keine Minutenangabe
+ % no min
{\dc@print@counter & \makebox[0pt]{}\pdfnote{#1\strut} & \tabularnewline}%
- % mit Minutenangabe
+ % with min
{\dc@print@counter & \makebox[0pt]{}\pdfnote{#1\strut} & \hfill{}#2~\dc@third \tabularnewline}%
}%
}%
%
%
+\setlength\columnseprule{0.5pt}
+\addtolength\columnsep{5pt}
+%no automatic heading -> clash with multicols
+\renewcommand*\bib@heading{\@mkboth{\refname}{\refname}}
+%labels without brackets
+\renewcommand\@biblabel[1]{#1}
+\newcommand*\dc@bibpreamble{\begin{multicols}{\dc@bib@col}\RaggedRight\small}
+\newcommand*\dc@bibend{\end{multicols}}%
+\newcommand{\listofdvds}[2][]%
+{%
+ \ifthenelse{\equal{}{#2}}{\def\dc@bib@col{2}}{\def\dc@bib@col{#2}}%
+ \bibliographystyle{dcbib}%
+ \nocite{*}%
+ \ifthenelse{\equal{}{#1}}%
+ {\renewcommand\refname{\dc@dvdlist}}%
+ {\renewcommand\refname{#1}}%
+ \clearpage%
+ \chapter*{\refname}%
+ \addcontentsline{toc}{part}{\dc@dvdlist{}}%
+ \phantomsection%
+ \dc@bibpreamble%
+ \bibliography{dc_\jobname}%
+ \dc@bibend%
+}%
+%
\newcommand{\listoffaultyrecordings}%
{%
\setboolean{@restonecol}{false}%
@@ -435,6 +610,7 @@
\ifthenelse{\boolean{@restonecol}}%
{\twocolumn}%
{}%
+ \addcontentsline{toc}{part}{\dc@lfrname{}}%
}%
%
%
@@ -449,7 +625,7 @@
%
\newcommand\SetTOCSecIndent[1]%
{%
- \renewcommand*\l@section{\@dottedtocline{1}{#1}{0pt}}%
+ \renewcommand*\l@dcdvd{\@dottedtocline{1}{#1}{0pt}}%
}%
%
%
@@ -514,14 +690,38 @@
}%
\refstepcounter{dvdcount}% \refstepcounter für hyperref-Link auf die jeweilige DVD
\refstepcounter{seasondvd}%
+ \stepcounter{labelcount}%
\dc@calc@dvdcounter% to have correct counter in "text" form
\ifthenelse{\equal{}{#1}}{\def\dc@title{\dc@series\DvdCounter}}{\def\dc@title{#1}}%
- \addcontentsline{toc}{section}{\dc@title}%
+ {%local redefinition for BibTeX export
+ \renewcommand*\DvdSpace{\DvdBibSpace}%
+ \ifthenelse{\equal{}{#1}}{\xdef\dc@bib@title{\dc@series\DvdCounter}}{\xdef\dc@bib@title{#1}}%
+ }
+ %create label
+ \ifthenelse{\equal{}{#2}}%
+ {%#2 empty
+ \ifthenelse{\equal{\dc@option@labelbase}{-1}}%
+ {%default
+ \def\dc@dvd@label{}%
+ }%
+ {%labelbase set
+ \def\dc@dvd@label{\dc@option@labelbaseprefix\thelabelcount\dc@option@labelbasesuffix}%
+ }%
+ }%
+ {%#2 not empty
+ \def\dc@dvd@label{#2}%
+ }%
+ \addcontentsline{toc}{dcdvd}{\dc@title}%
\phantomsection% korrigiert fehlerhafte (falsch positionierte) Links auf dvd-Tabellen
+ \ifthenelse{\equal{}{\dc@dvd@label}}%
+ {}%
+ {%
+ \bibwrite{@misc{\dc@dvd@label ,author={{\dc@bib@title}},year={\dc@dvd@label}}}%
+ }%
\noindent%
% verhindert overfull \hbox Errors wegen \tabularx{\linewidth}...
- \tabularx{\linewidth}{>{\dc@size@table@cells}l>{\dc@size@table@cells}X>{\dc@size@table@cells}r}%
- \multicolumn{3}{l}{\dc@size@table@title\dc@title\dc@option@dvdlabel\dc@print@dvdlabel{#2}}\\%
+ \tabularx{\linewidth}{>{\dc@size@table@cells}r>{\dc@size@table@cells}X>{\dc@size@table@cells}r}%
+ \multicolumn{3}{l}{\dc@size@table@title\dc@title\dc@option@dvdlabel\dc@print@dvdlabel{\dc@dvd@label}}\\%
\midrule%
}%
{%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/english.dcl b/Master/texmf-dist/tex/latex/dvdcoll/english.dcl
index 7ecb9af8d3c..916215fc0d4 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/english.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/english.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
@@ -19,12 +19,15 @@
%%
%% This work consists of all files listed in manifest.txt.
%%
-\ProvidesFile{english.dcl}[2006/09/18 v2]%
+\ProvidesFile{english.dcl}[2007/02/24 v4]%
%
\makeatletter%
\renewcommand*\dc@miss{F}%
\renewcommand*\dc@lfrname{List of faulty or missing Recordings}%
\renewcommand*\dc@pdf@subject{Description}%
+\renewcommand*\dc@dvdlist{List of DVDs}%
+\renewcommand*\dc@season{Season}%
+\renewcommand*\dc@pdftitle{DVD archives}%
\makeatother%
%
\endinput%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/francais.dcl b/Master/texmf-dist/tex/latex/dvdcoll/francais.dcl
index e27d60e5861..c20459737d5 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/francais.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/francais.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/french.dcl b/Master/texmf-dist/tex/latex/dvdcoll/french.dcl
index 3a512269e5b..434b4babe8a 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/french.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/french.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl b/Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl
index 28a47c238a7..5cf2face67d 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
@@ -19,7 +19,7 @@
%%
%% This work consists of all files listed in manifest.txt.
%%
-\ProvidesFile{frenchb.dcl}[2006/09/18 v2]%
+\ProvidesFile{frenchb.dcl}[2007/02/24 v4]%
%
%contributed by François Pétiard
%
@@ -27,6 +27,9 @@
\renewcommand*\dc@miss{F}%
\renewcommand*\dc@lfrname{Liste des enregistrements d\'{e}fectueux ou absents}%
\renewcommand*\dc@pdf@subject{Description}%
+\renewcommand*\dc@dvdlist{Liste des DVDs}%
+\renewcommand*\dc@season{Saison}%
+\renewcommand*\dc@pdftitle{Archives des DVDs}%
\makeatother%
%
\endinput%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/german.dcl b/Master/texmf-dist/tex/latex/dvdcoll/german.dcl
index 76c99b8e919..2c149040a8b 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/german.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/german.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl b/Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl
index a0af6d055d8..2f108b8f915 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
@@ -19,12 +19,15 @@
%%
%% This work consists of all files listed in manifest.txt.
%%
-\ProvidesFile{germanb.dcl}[2006/09/18 v2]%
+\ProvidesFile{germanb.dcl}[2007/02/24 v4]%
%
\makeatletter%
\renewcommand*\dc@miss{F}%
\renewcommand*\dc@lfrname{Verzeichnis fehlerhafter oder fehlender Aufzeichnungen}%
\renewcommand*\dc@pdf@subject{Beschreibung}%
+\renewcommand*\dc@dvdlist{DVD Liste}%
+\renewcommand*\dc@season{Staffel}%
+\renewcommand*\dc@pdftitle{DVD-Archiv}%
\makeatother%
%
\endinput%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl
index 5cee2982250..03354590660 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl b/Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl
index 84b24e449be..3697667b46f 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl b/Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl
index c46a854201f..1f1b8577d46 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/pdfnotiz.sty b/Master/texmf-dist/tex/latex/dvdcoll/pdfnotiz.sty
index b067e4a4e30..ed3c87c31a1 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/pdfnotiz.sty
+++ b/Master/texmf-dist/tex/latex/dvdcoll/pdfnotiz.sty
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2006 by:
+%% Copyright (C) 2006-2007 by:
%% Josef Kleber
%% <josef.kleber@gmx.net>
%%
@@ -23,7 +23,7 @@
%% adjustmjents for the needs of dvdcoll.cls plus some new commands
%%
\NeedsTeXFormat{LaTeX2e}[2001/06/01]%
-\ProvidesPackage{pdfnotiz}[2006/10/05 v1.0 PDF tooltips (pdfnotiz.sty)]%
+\ProvidesPackage{pdfnotiz}[2007/02/24 v1.1 PDF tooltips (pdfnotiz.sty)]%
\RequirePackage{ifpdf}%
\RequirePackage{marginnote}%
\newcommand*{\ctip@form@fields}{}%
@@ -261,8 +261,9 @@
%
\def\pn@pdfmarginnote@color{0 0 1}%
\def\pn@pdfmarginnote@subject{Info}%
+\def\pn@pdfmarginnote@type{Help}%
%
-\newcommand{\pdfmarginnote}[2][Help]{%
+\newcommand{\pdfmarginnote}[2][\pn@pdfmarginnote@type]{%
\def\pn@notiz{}%
\pdfstringdef\pn@notiz{#2}%
\marginnote{%