From ff31968af2082f51e521acb83ade071ba1d2b128 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Oct 2007 16:35:54 +0000 Subject: confproc 0.4e (14oct07) git-svn-id: svn://tug.org/texlive/trunk@5197 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/confproc/confproc.cls | 248 ++++++++++++++-------- Master/texmf-dist/tex/latex/confproc/newapave.sty | 2 +- 2 files changed, 157 insertions(+), 93 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/confproc/confproc.cls b/Master/texmf-dist/tex/latex/confproc/confproc.cls index 4f1eebb814a..223a0a288e3 100644 --- a/Master/texmf-dist/tex/latex/confproc/confproc.cls +++ b/Master/texmf-dist/tex/latex/confproc/confproc.cls @@ -1,5 +1,6 @@ +\NeedsTeXFormat{LaTeX2e}[1994/12/01]% \ProvidesClass{confproc} - [2007/09/24 v0.2i: Conference Proceedings class (VV)] + [2007/10/12 v0.4c: Conference Proceedings class (VV)] \LoadClass{book} \DeclareOption{a4paper} {\setlength\paperheight {297mm}% @@ -22,6 +23,10 @@ \def\conf@WithClearsinglepage{}} \DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue% \def\conf@WithCleardoublepage{}} +\DeclareOption{onesidepapers}{% + \def\conf@WithClearsinglepagePapers{}} +\DeclareOption{twosidepapers}{% + \def\conf@WithCleardoublepagePapers{}} \DeclareOption{compil=bibmerge} {\typeout{confproc: LaTeX run-> bib. items only (merging process)}% \def\conf@BibMerge{}} @@ -105,9 +110,10 @@ {Unknown option `\CurrentOption'; passed to 'hyperref'}% \PassOptionsToClass{\CurrentOption}{hyperref}} \ExecuteOptions{letterpaper,10pt,twoside,% - compil=bibbackref,tocnumleft,onecoltoc,threecolindex,twocolbib,% + twosidepapers,electronic,headers=no,compil=bibbackref,% + tocnumleft,onecoltoc,threecolindex,twocolbib,% colorlinks=true,linkcolor=red,citecolor=blue,pagecolor=red,urlcolor=blue,% - bookmarksopen=true,bookmarksopenlevel=1,headers=no} + bookmarksopen=true,bookmarksopenlevel=1} \ProcessOptions \RequirePackage{graphicx} \RequirePackage{pdfpages} @@ -124,7 +130,7 @@ \if@twocolumn \@restonecolfalse \else \@restonecoltrue \fi \vspace*{-0.8cm} - \section*{{\procindexname}} + \section*{{\indexname}} \let\item\@idxitem \columnseprule \z@ \columnsep 35\p@ @@ -144,7 +150,7 @@ \if@twocolumn \@restonecolfalse \else \@restonecoltrue \fi \vspace*{-0.8cm} - \section*{{\procindexname}} + \section*{{\indexname}} \let\item\@idxitem \columnseprule \z@ \columnsep 35\p@ @@ -175,26 +181,26 @@ \newcommand{\procpdfauthor}{Proceedings author/editor} \newcommand{\procpdftitle}{Proceedings title} \newcommand{\procpdfsubject}{Proceedings description} -\hypersetup{ - pdfauthor = \procpdfauthor, - pdftitle = \procpdftitle, - pdfsubject = \procpdfsubject, - pdfkeywords = {}, - pdfcreator = {LaTeX with `confproc' package}, - pdfproducer = {pdfLaTeX}} +\AtBeginDocument{ + \hypersetup{ + pdfauthor = \procpdfauthor, + pdftitle = \procpdftitle, + pdfsubject = \procpdfsubject, + pdfkeywords = {}, + pdfcreator = {LaTeX with `confproc' package}, + pdfproducer = {pdfLaTeX}}} \topmargin 0truept \headheight 12truept -\footskip 0truept +\footskip 14mm \textheight 229truemm \textwidth 175truemm \voffset -28truept \headsep 20truept -\renewcommand{\contentsname}{\vspace*{-0.8cm}\Large % - \bfseries Conference Program} -\newcommand{\procindexname}{\large \bfseries Index of Authors} -\newcommand{\procbibname}{\large \bfseries Full Bibliography} -\newcommand{\proclhead}{\em{\small{Proceedings of the blah blah blah}}} -\newcommand{\proccfoot}{{\vskip 11mm}{\small Proc-\thepage}} +\renewcommand{\contentsname}{Conference Program} +\renewcommand{\bibname}{Full Bibliography} +\renewcommand{\indexname}{Index of Authors} +\newcommand{\proclhead}{\em \small Proceedings of the blah blah blah} +\newcommand{\proccfoot}{\small Proc-\thepage} \pagestyle{fancyplain} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{-5mm} @@ -228,16 +234,17 @@ {}% filler and page \fi \newcommand{\tocmattertocstyle}{ -\titlecontents{part}[-1em]{\addvspace{1pc}}% - {\contentspage\hspace*{3.2em}\contentsmargin{0pt}% - \makebox[0pt][r]{\huge\thecontentslabel\enspace}\large}% - {\contentspage\hspace*{3.2em}\contentsmargin{0pt}\large}% - {}[\addvspace{.5pc}]} -\titlecontents{chapter}[-1em]{\addvspace{1pc}}% - {\contentspage\hspace*{3.2em}\contentsmargin{0pt}% - \makebox[0pt][r]{\huge\thecontentslabel\enspace}\large}% - {\contentspage\hspace*{3.2em}\contentsmargin{0pt}\large}% - {}[\addvspace{.5pc}] + \titlecontents{part}[-1em]{\addvspace{1pc}}% + {\contentspage\hspace*{3.2em}\contentsmargin{0pt}% + \makebox[0pt][r]{\huge\thecontentslabel\enspace}\large}% + {\contentspage\hspace*{3.2em}\contentsmargin{0pt}\large}% + {}[\addvspace{.5pc}] + \titlecontents{chapter}[-1em]{\addvspace{1pc}}% + {\contentspage\hspace*{3.2em}\contentsmargin{0pt}% + \makebox[0pt][r]{\huge\thecontentslabel\enspace}\large}% + {\contentspage\hspace*{3.2em}\contentsmargin{0pt}\large}% + {}[\addvspace{.5pc}] +} \ifdefined\conf@TocNumberingRight \newcommand{\mainmattertocstyle}{ \titlecontents{chapter}[0pt]% @@ -252,13 +259,18 @@ {\contentsmargin{0pt}\large}{}[\addvspace{.5pc}]% \else \ifdefined\conf@TocNumberingLeft% default - \newcommand{\mainmattertocstyle}{% + \newcommand{\mainmattertocstyle}{ + \titlecontents{section}[2.5em]% + {\vspace*{0.3em}}% + {\hspace*{-2.5em}\contentspage\hspace*{2.5em}}% + {\hspace*{-2.5em}\contentspage\hspace*{2.5em}}% + {}% \titlecontents{chapter}[0pt]% - {\addvspace{1pc}\bfseries \itshape}% + {\addvspace{1pc}\bfseries\itshape}% {\contentsmargin{0pt}\bfseries % \makebox[0pt][r]{\huge\thecontentslabel\enspace}\large}% {\contentsmargin{0pt}\large}{}[\addvspace{.5pc}]% - \titlecontents{part}[0pt]% + \titlecontents{part}[0pt]% {\addvspace{1pc}\bfseries}% {\contentsmargin{0pt}\bfseries % \makebox[0pt][r]{\huge\thecontentslabel\enspace}\large}% @@ -268,6 +280,11 @@ \newcommand\mainmattertocstyle{} \fi \fi +\renewcommand\mainmatter{% + \cleardoublepage + \@mainmattertrue + \pagenumbering{arabic} + \mainmattertocstyle} \ifdefined\conf@TocNumberingRight \newcommand{\backmattertocstyle}{ \titlecontents{section}[]{}{}{}{}[]% @@ -286,8 +303,8 @@ {\contentspage\hspace*{2.5em}\contentsmargin{0pt}% \bfseries% \makebox[0pt][r]{\huge\thecontentslabel\enspace}% - \large}% - {\contentspage\hspace*{2.5em}\contentsmargin{0pt} \large}% + \large\bfseries}% + {\contentspage\hspace*{2.5em}\contentsmargin{0pt} \large\bfseries}% {}% [\addvspace{.5pc}]% }% @@ -295,6 +312,14 @@ \newcommand\backmattertocstyle{}% \fi% \fi +\renewcommand\backmatter{% + \if@openright + \cleardoublepage + \else + \clearpage + \fi + \@mainmatterfalse + \backmattertocstyle} \ifdefined\conf@FancyHeadersExceptPapers \newcommand{\otherpagestyle}{\pagestyle{fancy}} \newcommand{\thisotherpagestyle}{\thispagestyle{fancy}} @@ -346,51 +371,68 @@ \newcommand{\paperpagenum}{} \newcommand{\papercite}{} \newcommand{\papertitlestyle}{} -\newcommand{\paperauthorstyle}{\texorpdfstring{\newline\it}{\break}} +\newcommand{\paperauthorstyle}{\texorpdfstring{\newline\itshape}{\break}} \newcounter{paperpagenum} \newcommand{\proctoctitleauthor}[2]{% \texorpdfstring{{\papertitlestyle#1}{\paperauthorstyle#2}}% {{\papertitlestyle#1}}} +%% \begin{macrocode} \newcommand{\procinsertpaper}[9]{ \setcounter{paperpagenum}{#2} #6% - \includepdf[noautoscale,offset= #1,pages=1,% - linktodoc,linkname=\PAPERPATH #8.pdf,% - addtotoc={1, section, 1, \proctoctitleauthor{#4}{#5}, #3},% - pagecommand = {#9\PDFpagestyle}% - ]{\PAPERPATH #8.pdf}% - \ifdefined\conf@BibMerge% - \includepdf[noautoscale,offset= #1,pages=\thepaperpagenum,% - linktodoc,linkname=\PAPERPATH #8.pdf,% - ]{\PAPERPATH #8.pdf}% - \PDFpagestyle{}% - \confcite{#7}% - \ifdefined\conf@procWithDebug - \typeout{confproc: bibliography insertion only} + \ifnum\thepaperpagenum=1 + \ifdefined\conf@procWithDebug\typeout{confproc: 1-page long paper}\fi + \ifdefined\UseBackRef + \includepdf[noautoscale,offset= #1,pages=1,% + linktodoc,linkname=\PAPERPATH #8.pdf,% + addtotoc={1, section, 1, \proctoctitleauthor{#4}{#5}, #3},% + pagecommand = {#9\PDFpagestyle}% + ]{\PAPERPATH #8.pdf}% + \else + \includepdf[noautoscale,offset= #1,pages=1,% + linktodoc,linkname=\PAPERPATH #8.pdf,% + addtotoc={1, section, 1, \proctoctitleauthor{#4}{#5}, #3},% + pagecommand = {#9\PDFpagestyle\vspace*{-1cm}\confcite{#7}}% + ]{\PAPERPATH #8.pdf}% \fi \else - \ifdefined\CreateBackRef + \includepdf[noautoscale,offset= #1,pages=1,% + linktodoc,linkname=\PAPERPATH #8.pdf,% + addtotoc={1, section, 1, \proctoctitleauthor{#4}{#5}, #3},% + pagecommand = {#9\PDFpagestyle}% + ]{\PAPERPATH #8.pdf}% + \ifdefined\conf@BibMerge% + \includepdf[noautoscale,offset= #1,pages=\thepaperpagenum,% + linktodoc,linkname=\PAPERPATH #8.pdf,% + pagecommand = {\PDFpagestyle\vspace*{-2cm}\confcite{#7}}% + ]{\PAPERPATH #8.pdf}% + \PDFpagestyle{}% + \ifdefined\conf@procWithDebug + \typeout{confproc: bibliography insertion only}\fi + \else \addtocounter{paperpagenum}{-1} \includepdf[noautoscale,offset= #1,pages=2-\thepaperpagenum,% linktodoc,linkname=\PAPERPATH #8.pdf,% pagecommand = {\PDFpagestyle}% ]{\PAPERPATH #8.pdf}% \PDFpagestyle{}% - \confcite{#7}% - \ifdefined\conf@procWithDebug - \typeout{confproc: partial paper insertion (last page=bib items)} - \fi - \else - \ifdefined\UseBackRef - \includepdf[noautoscale,offset= #1,pages=2-,% + \addtocounter{paperpagenum}{1} + \ifdefined\CreateBackRef + \includepdf[noautoscale,offset= #1,pages=\thepaperpagenum,% linktodoc,linkname=\PAPERPATH #8.pdf,% - pagecommand = {\PDFpagestyle}% + pagecommand = {\PDFpagestyle\vspace*{-2cm}\confcite{#7}}% ]{\PAPERPATH #8.pdf}% - \fi - \ifdefined\conf@procWithDebug - \typeout{confproc: full paper insertion (last LaTeX run)} + \else + \ifdefined\UseBackRef + \includepdf[noautoscale,offset= #1,pages=\thepaperpagenum,% + linktodoc,linkname=\PAPERPATH #8.pdf,% + pagecommand = {\PDFpagestyle}% + ]{\PAPERPATH #8.pdf}% + \fi \fi \fi + \ifdefined\conf@procWithDebug + \typeout{confproc: partial paper insertion (last page=bib items)}\fi \fi \ifdefined\conf@procWithDebug \typeout{---> file: #8.pdf (#2 pages)} @@ -399,27 +441,28 @@ \typeout{---> index: #6} \fi \newpage - \clearsingleordoublepage + \ifdefined\conf@WithClearsinglepagePapers + \clearpage + \else + \ifdefined\conf@WithCleardoublepagePapers + \cleardoublepage + \fi + \fi } -\setlength{\itemindent}{-2em} -\setlength{\leftmargin}{1em} -\setlength{\bibhang}{0.5em} -\def\thebibliography#1{% - \section*{\bibname} - \addcontentsline{toc}{part}{\bibname} - \list - {\relax}{\setlength{\labelsep}{0em} - \setlength{\itemindent}{-\bibhang} - \setlength{\leftmargin}{\bibhang}} - \def\newblock{\hskip 0em plus 0.0em minus .07em} % DAFx-06 - \sloppy\clubpenalty4000\widowpenalty4000 - \sfcode`\.=1000\relax} -\newcommand{\proctableofcontents}{% +\renewcommand\tableofcontents{% \tocmattertocstyle \clearsingleordoublepage - \addtocontents{toc}{\protect\vspace*{-1.3cm}} - \pdfbookmark[0]{Program}{contents} - \tableofcontents + \pdfbookmark[0]{\contentsname}{contents} + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \section*{\contentsname + \@mkboth{% + \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}% + \@starttoc{toc}% + \if@restonecol\twocolumn\fi \clearsingleordoublepage } \newcommand{\procday}[1]{% @@ -429,18 +472,40 @@ \phantomsection% \addcontentsline{toc}{chapter}{#1}} \newcommand{\paperswitch}{} -\newcommand{\setbibitems}{% - \ifdefined\conf@TwoColumnBib% - \twocolumn - \fi - \ifdefined\conf@BibMerge% - \nocite{*}% - \else% - \clearsingleordoublepage% - \fi% - \renewcommand{\bibname}{\procbibname} -%% \addcontentsline{toc}{part}{\procbibname} -} +\setlength{\bibhang}{0.5em} % +\renewenvironment{thebibliography}[1] + {\ifdefined\conf@TwoColumnBib% + \twocolumn + \fi + \ifdefined\conf@BibMerge% + \nocite{*}% + \else% + \clearsingleordoublepage% + \fi% + \section*{\bibname}% + \addcontentsline{toc}{part}{\bibname} + \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}% + \procbibintro + \list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{#1}}% + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy + \clubpenalty4000 + \@clubpenalty \clubpenalty + \widowpenalty4000% + \sfcode`\.\@m} + {\def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist + \setlength{\labelsep}{0em} + \setlength{\itemindent}{-\bibhang} + \setlength{\leftmargin}{\bibhang}} +\renewcommand\newblock{\hskip 0em plus 0.0em minus .07em} \newcommand{\procbibintro}{{\it ~~~This bibliography is a compilation of all bibliographic references from each paper. Page numbers that appear at the end of each entry link to the bibliography sections that @@ -450,10 +515,9 @@ \clearsingleordoublepage \onecolumn \section*{~~}% - \addcontentsline{toc}{part}{\procindexname}% + \addcontentsline{toc}{part}{\indexname}% \renewcommand{\proclhead}{}% \renewcommand{\proccfoot}{}% - \renewcommand{\indexname}{\procindexname}% \printindex} \InputIfFileExists{confproc.cfg} {\typeout{************^^J% diff --git a/Master/texmf-dist/tex/latex/confproc/newapave.sty b/Master/texmf-dist/tex/latex/confproc/newapave.sty index 890b42786c4..c5ac3d4897e 100644 --- a/Master/texmf-dist/tex/latex/confproc/newapave.sty +++ b/Master/texmf-dist/tex/latex/confproc/newapave.sty @@ -188,7 +188,7 @@ % \def\thebibliography#1{% \section*{\bibname} - \addcontentsline{toc}{part}{\bibname} + \addcontentsline{toc}{part}{\large \bfseries \bibname} \list {\relax}{\setlength{\labelsep}{0em} \setlength{\itemindent}{-\bibhang} -- cgit v1.2.3