1 files changed, 50 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/latex/confproc/example/expapersswitch.tex b/Master/texmf-dist/doc/latex/confproc/example/expapersswitch.tex
index 2e1ac9bd5a0..8a6d6687321 100644
--- a/Master/texmf-dist/doc/latex/confproc/example/expapersswitch.tex
+++ b/Master/texmf-dist/doc/latex/confproc/example/expapersswitch.tex
@@ -1,98 +1,60 @@
-%%
-%% This is file `expapersswitch.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% confproc.dtx  (with options: `expapersswitch')
-%% 
-%% This is `expapersswitch.tex', an example file for the confproc package.
-%% Copyright (C) 2007 by Vincent Verfaille <vincent@music.mcgill.ca>
-%% 
-%% This file is part of the confproc package.
-%% -------------------------------------------
-%% 
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version
-%% 1999/12/01 or later.
-%% 
-%% This file may not be distributed without the original source file
-%% `confproc.dtx'.
-%% 
-%% The list of all files belonging to the confproc package is given in
-%% the file `readme.txt'.
-%% 
-%% For more details, LaTeX the source `confproc.dtx'.
-%% 
 \newcommand{\paperid}[2]{
+ 
 \renewcommand{\paperswitch}{#1}
-\ifnum\paperswitch=45 {
-  \renewcommand{\papertitle}{Templates for One Author}
-  \renewcommand{\paperauthors}{Alfred Alabama}
-  \renewcommand{\paperindex}{\index{Alabama, Alfred}}
-  \renewcommand{\paperref}{\paperswitch}
-  \renewcommand{\paperpagenum}{6}
-  \renewcommand{\papercite}{Serra:1996:sms,%
-    Moorer:2000:AES:audio:millenium,Arfib:1998:DAFx,%
-    Mitra:Kaiser:1993:DSP:handbook}
-  \procinsertpaper{\LaTeXxShift{} \LaTeXyShift}{\paperpagenum}%
-    {\paperref}{\papertitle}{\paperauthors}{\paperindex}{\papercite}%
-    {#2}{\pdfbookmark[2]{Alfred Alabama}{#2.author1}}}
+ 
+%======= PAPER ID = 45 =======
+\ifnum\paperswitch=45
+  \procpaper[xshift=\LaTeXxShift{}, yshift=\LaTeXyShift{}, npages=6, switch=\paperswitch,%
+    title={Templates for One Author},% paper title
+    author={Alfred Alabama},% list of authors
+    index={\index{Alabama, Alfred}},% authors index entries
+    cite={Serra:1996:sms,Moorer:2000:AES:audio:millenium,Arfib:1998:DAFx,Mitra:Kaiser:1993:DSP:handbook},% cited bib items
+    bookmark={\pdfbookmark[2]{Alfred Alabama}{#2.Alfred Alabama}}% for PDF bookmark structure
+  ]{#2}
 \fi
+ 
+%======= PAPER ID = 21 =======
 \ifnum\paperswitch=21
-  \procinsertpaper{\LaTeXxShift{} \LaTeXyShift}{5}{\paperswitch}%
-    {Templates for One Author with Two Affiliations}% paper title
-    {Bob Boogie-Woogie}% list of authors
-    {\index{Boogie-Woogie, Bob}}% authors index entries
-    {Serra:1996:sms,Moorer:2000:AES:audio:millenium,%
-      Arfib:1998:DAFx,Haykin:1991:adaptive:filter}%
-    {#2}{\pdfbookmark[2]{Bob Boogie-Woogie}{#2.author1}}
+  \procpaper[xshift=\LaTeXxShift{}, yshift=\LaTeXyShift{}, npages=5, switch=\paperswitch,%
+    title={Templates for One Author with Two Affiliations},% paper title
+    author={Bob Boogie-Woogie},% list of authors
+    index={\index{Boogie-Woogie, Bob}},% authors index entries
+    cite={Serra:1996:sms,Moorer:2000:AES:audio:millenium,Arfib:1998:DAFx,Haykin:1991:adaptive:filter},% cited bib items
+    bookmark={\pdfbookmark[2]{Bob Boogie-Woogie}{#2.Bob Boogie-Woogie}}% for PDF bookmark structure
+  ]{#2}
 \fi
-
-\ifnum\paperswitch=27
-  \procinsertpaper{\LaTeXxShift{} \LaTeXyShift}{7}{\paperswitch}%
-    {Templates f\'or F\`o\"ur Àuthors}%
-    {J\o{}hn J\"oe, K\'e\~{n}t K\^{\i}ng, L\`ou L\'ou, %
-      M\`anfr\'ed J. M\^ost\u{e}k\i}%
-    {\index{J\"oe, J\o{}hn}\index{K\^{\i}ng, K\'e\~{n}t}%
-      \index{L\'ou, L\`ou}\index{M\^ost\u{e}k\i, M\`anfr\'ed J.}}%
-    {Serra:1996:sms,Moorer:2000:AES:audio:millenium,%
-      Dutilleux:1991,Fitz:Haken:2003:Web:morphing:loris}%
-    {#2}{\pdfbookmark[2]{J\o{}hn J\"oe}{#2.author1}%
-      \pdfbookmark[2]{K\'e\~{n}t K\^{\i}ng}{#2.author2}%
-      \pdfbookmark[2]{L\`ou L\'ou}{#2.author3}%
-      \pdfbookmark[2]{M\`anfr\'ed J. M\^ost\u{e}k\i}{#2.author4}}
-\fi
-
+ 
+%======= PAPER ID = 33 =======
 \ifnum\paperswitch=33
-  \procinsertpaper{\LaTeXxShift{} \LaTeXyShift}{4}{\paperswitch}%
-    {Templates for Two Authors}%
-    {Alfred Alabama, Chris Christmas}%
-    {\index{Alabama, Alfred}\index{Christmas, Chris}}%
-    {Serra:1996:sms,Moorer:2000:AES:audio:millenium,%
-      Arfib:1998:DAFx,Askenfelt:1976:automatic:transcription}%
-    {#2}{\pdfbookmark[2]{Alfred Alabama}{#2.author1}%
-      \pdfbookmark[2]{Chris Christmas}{#2.author2}}
+  \procpaper[xshift=\LaTeXxShift{}, yshift=\LaTeXyShift{}, npages=4, switch=\paperswitch,%
+    title={Templates for Two Authors},% paper title
+    author={Alfred Alabama, Chris Christmas},% list of authors
+    index={\index{Alabama, Alfred}\index{Christmas, Chris}},% authors index entries
+    cite={Serra:1996:sms,Moorer:2000:AES:audio:millenium,Arfib:1998:DAFx,Askenfelt:1976:automatic:transcription},% cited bib items
+    bookmark={\pdfbookmark[2]{Alfred Alabama}{#2.Alfred Alabama}\pdfbookmark[2]{Chris Christmas}{#2.Chris Christmas}}% for PDF bookmark structure
+  ]{#2}
 \fi
-
+ 
+%======= PAPER ID = 75 =======
 \ifnum\paperswitch=75
-  \procinsertpaper{\LaTeXxShift{} \LaTeXyShift}{6}{\paperswitch}%
-    {Templates for Three Authors}%
-    {Bob Boogie-Woogie, Chris Christmas, Don Didon}%
-    {\index{Boogie-Woogie, Bob}\index{Christmas, Chris}%
-      \index{Didon, Don}}%
-    {Serra:1996:sms,Moorer:2000:AES:audio:millenium,%
-      Arfib:1998:DAFx,Egozy:1995:MIT:features:gesture}%
-    {#2}{\pdfbookmark[2]{Bob Boogie-Woogie}{#2.author1}%
-      \pdfbookmark[2]{Chris Christmas}{#2.author2}%
-      \pdfbookmark[2]{Don Didon}{#2.author3}}
+  \procpaper[xshift=\LaTeXxShift{}, yshift=\LaTeXyShift{}, npages=6, switch=\paperswitch,%
+    title={Templates for Three Authors},% paper title
+    author={Bob Boogie-Woogie, Chris Christmas, Don Didon},% list of authors
+    index={\index{Boogie-Woogie, Bob}\index{Christmas, Chris}\index{Didon, Don}},% authors index entries
+    cite={Serra:1996:sms,Moorer:2000:AES:audio:millenium,Arfib:1998:DAFx,Egozy:1995:MIT:features:gesture},% cited bib items
+    bookmark={\pdfbookmark[2]{Bob Boogie-Woogie}{#2.Bob Boogie-Woogie}\pdfbookmark[2]{Chris Christmas}{#2.Chris Christmas}\pdfbookmark[2]{Don Didon}{#2.Don Didon}}% for PDF bookmark structure
+  ]{#2}
+\fi
+ 
+%======= PAPER ID = 27 =======
+\ifnum\paperswitch=27
+  \procpaper[xshift=\LaTeXxShift{}, yshift=\LaTeXyShift{}, npages=7, switch=\paperswitch,%
+    title={Templates fór Fòür Àuthors},% paper title
+    author={John Jöe, Kéñt Kîng, Lòu Lóu, Mànfréd J. Môstu{e}ki},% list of authors
+    index={\index{Jöe, John}\index{Kîng, Kéñt}\index{Lóu, Lòu}\index{Môstu{e}ki, Mànfréd J.}},% authors index entries
+    cite={Serra:1996:sms,Moorer:2000:AES:audio:millenium,Dutilleux:1991,Fitz:Haken:2003:Web:morphing:loris},% cited bib items
+    bookmark={\pdfbookmark[2]{John Jöe}{#2.John Jöe}\pdfbookmark[2]{Kéñt Kîng}{#2.Kéñt Kîng}\pdfbookmark[2]{Lòu Lóu}{#2.Lòu Lóu}\pdfbookmark[2]{Mànfréd J. Môstu{e}ki}{#2.Mànfréd J. Môstu{e}ki}}% for PDF bookmark structure
+  ]{#2}
 \fi
+ 
 }
-\endinput
-%%
-%% End of file `expapersswitch.tex'.