jmlr 1.17 (30may12)

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

12 files changed, 200 insertions, 142 deletions

diff --git a/Master/texmf-dist/doc/latex/jmlr/CHANGES b/Master/texmf-dist/doc/latex/jmlr/CHANGES
index 6e32e6bedbf..76c848f46bd 100644
--- a/Master/texmf-dist/doc/latex/jmlr/CHANGES
+++ b/Master/texmf-dist/doc/latex/jmlr/CHANGES
@@ -1,3 +1,24 @@
+v1.17:
+
+  * jmlr.cls
+
+    - added \titletag
+
+    - added warnings if obsolete font commands (such as \bf) used
+
+  * jmlrbook.cls
+
+    - added 'articlet' page style
+
+    - \importarticle sets title page style to articlet
+
+    - \importpaper disables \jmlryear, \jmlrworkshop, \jmlrvolume
+      and \jmlrissue
+
+    - html title page uses jmlrvolume instead of volume
+
+    - added optional argument to \logo
+
 v1.16:
 
   * jmlr.cls
diff --git a/Master/texmf-dist/doc/latex/jmlr/INSTALL b/Master/texmf-dist/doc/latex/jmlr/INSTALL
index dee8b222adb..805c257c5b3 100644
--- a/Master/texmf-dist/doc/latex/jmlr/INSTALL
+++ b/Master/texmf-dist/doc/latex/jmlr/INSTALL
@@ -1,69 +1,69 @@
-INSTALLATION

-

-If you have downloaded the jmlr bundle using the TeX Directory

-Structure (TDS), that is you have downloaded the archive

-jmlr.tds.zip containing doc, tex and source directories, you need to

-follow the "Installing from TDS" instructions below.

-

-If you have downloaded the following files:

-

-jmlr.dtx

-jmlr.ins

-

-You need to follow the "Installing from DTX and INS" instructions

-below.

-

-For further information on installing LaTeX packages see:

-

-http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings

-

-INSTALLING FROM TDS

-===================

-

-Files in tex and doc directories should go in the corresponding

-TEXMF directories (for example, /usr/share/texmf-local/ or

-C:\localtexmf\).

-

-*Remember to refresh TeX's database*

-

-Example (on UNIX like systems):

-

-unzip jmlr.tds.zip -d ~/texmf/

-texhash ~/texmf/

-

-Move the makejmlrbook Perl script from scripts/jmlr/ to somewhere

-on your path. If you are using Windows, you will also need to

-move makejmlrbook.bat to the same location.

-

-INSTALLING FROM DTX AND INS

-===========================

-

-Run LaTeX on jmlr.ins to generate jmlr.cls and jmlrbook.cls:

-

-latex jmlr.ins

-

-To create the documentation (jmlr.pdf):

-

-pdflatex jmlr.dtx

-makeindex -s gind.ist jmlr.idx

-makeindex -s gglo.ist -o jmlr.gls jmlr.glo

-pdflatex jmlr.dtx

-pdflatex jmlr.dtx

-

-If TEXMF denotes the base directory of your local TeX installation (e.g.

-/usr/share/texmf-local/ or C:\localtexmf\) then create the following

-directories (if they don't already exist):

-

-TEXMF/doc/latex/jmlr

-TEXMF/tex/latex/jmlr

-

-Move the documentation to TEXMF/doc/latex/jmlr/

-

-Move jmlr.cls and jmlrbook.cls to TEXMF/tex/latex/jmlr/

-

-*Remember to refresh TeX's database*

-

-Move the makejmlrbook Perl script to somewhere on your path. If

-you are using Windows, you will also need to move makejmlrbook.bat

-to the same location.

-

+INSTALLATION
+
+If you have downloaded the jmlr bundle using the TeX Directory
+Structure (TDS), that is you have downloaded the archive
+jmlr.tds.zip containing doc, tex and source directories, you need to
+follow the "Installing from TDS" instructions below.
+
+If you have downloaded the following files:
+
+jmlr.dtx
+jmlr.ins
+
+You need to follow the "Installing from DTX and INS" instructions
+below.
+
+For further information on installing LaTeX packages see:
+
+http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
+
+INSTALLING FROM TDS
+===================
+
+Files in tex and doc directories should go in the corresponding
+TEXMF directories (for example, /usr/share/texmf-local/ or
+C:\localtexmf\).
+
+*Remember to refresh TeX's database*
+
+Example (on UNIX like systems):
+
+unzip jmlr.tds.zip -d ~/texmf/
+texhash ~/texmf/
+
+Move the makejmlrbook Perl script from scripts/jmlr/ to somewhere
+on your path. If you are using Windows, you will also need to
+move makejmlrbook.bat to the same location.
+
+INSTALLING FROM DTX AND INS
+===========================
+
+Run LaTeX on jmlr.ins to generate jmlr.cls and jmlrbook.cls:
+
+latex jmlr.ins
+
+To create the documentation (jmlr.pdf):
+
+pdflatex jmlr.dtx
+makeindex -s gind.ist jmlr.idx
+makeindex -s gglo.ist -o jmlr.gls jmlr.glo
+pdflatex jmlr.dtx
+pdflatex jmlr.dtx
+
+If TEXMF denotes the base directory of your local TeX installation (e.g.
+/usr/share/texmf-local/ or C:\localtexmf\) then create the following
+directories (if they don't already exist):
+
+TEXMF/doc/latex/jmlr
+TEXMF/tex/latex/jmlr
+
+Move the documentation to TEXMF/doc/latex/jmlr/
+
+Move jmlr.cls and jmlrbook.cls to TEXMF/tex/latex/jmlr/
+
+*Remember to refresh TeX's database*
+
+Move the makejmlrbook Perl script to somewhere on your path. If
+you are using Windows, you will also need to move makejmlrbook.bat
+to the same location.
+
diff --git a/Master/texmf-dist/doc/latex/jmlr/README b/Master/texmf-dist/doc/latex/jmlr/README
index c84e61ba3e6..0b9e64e41a6 100644
--- a/Master/texmf-dist/doc/latex/jmlr/README
+++ b/Master/texmf-dist/doc/latex/jmlr/README
@@ -1,6 +1,6 @@
-LaTeX Class : jmlr bundle v1.16
+LaTeX Class : jmlr bundle v1.17
 
-Last Modified : 2012-05-16
+Last Modified : 2012-05-30
 
 Author        : Nicola L. C. Talbot
 
diff --git a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
index 245532cdd94..66f889ceee5 100644
--- a/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/jmlr.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
index 6d0ece6bb03..1bbbb11b5a9 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex
index 1149293b042..09bf5ec7e73 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/jmlrbook-sample.tex
@@ -7,16 +7,22 @@
   \usepackage{siunitx}
 }
 \documentclass[wcp]{jmlrbook}% on-line color version
-%\documentclass[wcp,gray]{jmlrbook}% print version
+ %\documentclass[wcp,gray]{jmlrbook}% print version
 
 
-% Title is added to the PDF properties. Optional argument
-% is used instead, if present.
-%\title[Short Title]{Big Long Title}
+ % bookmark package shouldn't be used for print version
+ % (load last)
+\ifprint{}{\usepackage{bookmark}}
+
+
+ % Title is added to the PDF properties. Optional argument
+ % is used instead, if present.
+ %\title[Short Title]{Big Long Title}
 \title{A Sample Book}
 
 \author[Anne Editor et al.]{Anne Editor, Anne Other Editor and Nicola Talbot}
 
+ % change the arguments, as appropriate, in the following:
 \volume{1}
 \subtitle{Making a Book from JMLR Articles}
 \logo{\includegraphics{bookLogo}}
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
index 52111d2e2af..8689b95e55f 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex
index 468a29e4c7c..57f7146df53 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-books/proceedings-sample.tex
@@ -1,7 +1,12 @@
-\documentclass[wcp,pdfxa]{jmlrbook}
+ % Most packages need to be loaded before hyperref
+ % so put them in the definition of \jmlrprehyperref
 
- % bookmark package shouldn't be used for print version
-\ifprint{}{\usepackage{bookmark}}
+\def\jmlrprehyperref{%
+ % Packages used by imported articles:
+ \usepackage{lipsum}
+}
+
+\documentclass[wcp]{jmlrbook}
 
  % Title is added to the PDF properties. Optional argument
  % is used instead, if present.
@@ -21,14 +26,15 @@
  % before this.
 \jmlrwritepdfinfo
 
-% inputenc with utf8 option must come after \jmlrwritepdfinfo
+ % inputenc with utf8 option must come after \jmlrwritepdfinfo
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 
- % Packages used by imported articles:
-\usepackage{lipsum}
+\logo[http://www.sampleurl.com/]{\includegraphics{bookLogo}}
 
-\logo{\includegraphics{bookLogo}}
+ % bookmark package shouldn't be used for print version
+ % (load last)
+\ifprint{}{\usepackage{bookmark}}
 
 \begin{document}
 \maketitle
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
index 52132fafa49..01b97d34a63 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
index 65b47604107..91d176915b0 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlr-sample.tex
@@ -1,31 +1,33 @@
-%\documentclass[gray]{jmlr} % test grayscale version
+ %\documentclass[gray]{jmlr} % test grayscale version
 \documentclass[tablecaption=bottom]{jmlr}
 
-% The following packages will be automatically loaded:
-% amsmath, amssymb, natbib, graphicx, url, algorithm2e
+ % The following packages will be automatically loaded:
+ % amsmath, amssymb, natbib, graphicx, url, algorithm2e
 
-%\usepackage{rotating}% for sideways figures and tables
-%\usepackage{longtable}% for long tables
+ %\usepackage{rotating}% for sideways figures and tables
+ %\usepackage{longtable}% for long tables
 
-% The booktabs package is used by this sample document
-% (it provides \toprule, \midrule and \bottomrule).
-% Remove the next line if you don't require it.
+ % The booktabs package is used by this sample document
+ % (it provides \toprule, \midrule and \bottomrule).
+ % Remove the next line if you don't require it.
 \usepackage{booktabs}
-% The siunitx package is used by this sample document
-% to align numbers in a column by their decimal point.
-% Remove the next line if you don't require it.
+ % The siunitx package is used by this sample document
+ % to align numbers in a column by their decimal point.
+ % Remove the next line if you don't require it.
 \usepackage[load-configurations=version-1]{siunitx} % newer version
-%\usepackage{siunitx}
+ %\usepackage{siunitx}
 
-% The following command is just for this sample document:
+ % The following command is just for this sample document:
 \newcommand{\cs}[1]{\texttt{\char`\\#1}}
 
-\jmlrvolume{vol}
+ % change the arguments, as appropriate, in the following:
+\jmlrvolume{1}
 \jmlryear{2010}
 \jmlrsubmitted{submission date}
 \jmlrpublished{publication date}
 
-\title[Short Title]{Full Title of Article}
+\title[Short Title]{Full Title of Article\titlebreak This Title Has
+A Line Break}
 
  % Use \Name{Author Name} to specify the name.
  % If the surname contains spaces, enclose the surname
@@ -39,7 +41,7 @@
  % Smith\thanks{A note}}
 
  % Two authors with the same address
-  \author{\Name{Author Name1}\thanks{A note} \Email{abc@sample.com}\and
+  \author{\Name{Author Name1\nametag{\thanks{A note}}} \Email{abc@sample.com}\and
    \Name{Author Name2} \Email{xyz@sample.com}\\
    \addr Address}
 
@@ -91,8 +93,16 @@ this sample document as it can help to reduce complications when
 combining the articles into a book. Please avoid using obsolete
 commands, such as \verb|\rm|, and obsolete packages, such as
 \textsf{epsfig}.\footnote{See
-\url{http://www.ctan.org/pkg/l2tabu}} Please also ensure
-that your document will compile with PDF\LaTeX.
+\url{http://www.ctan.org/pkg/l2tabu}}
+
+Please also ensure that your document will compile with PDF\LaTeX.
+If you have an error message that's puzzling you, first check for it
+at the UK TUG FAQ
+\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}.  If
+that doesn't help, create a minimal working example (see
+\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post
+to somewhere like the LaTeX Community Forum
+\url{http://www.latex-community.org/forum/}.
 
 \subsection{Sub-sections}
 
@@ -177,7 +187,9 @@ This can be referenced using \verb|\label| and \verb|\equationref|.
 For example, \equationref{eq:trigrule}.
 
 Multi-lined numbered equations should be displayed using the
-\texttt{align} environment. For example:
+\texttt{align} environment.\footnote{For reasons why you 
+shouldn't use the obsolete \texttt{eqnarray} environment, see
+Lars Madsen, \emph{Avoid eqnarray!} TUGboat 33(1):21--25, 2012.} For example:
 \begin{align}
 f(x) &= x^2 + x\label{eq:f}\\
 f'(x) &= 2x + 1\label{eq:df}
@@ -284,9 +296,9 @@ environment use \verb|\floatconts| (defined by \textsf{jmlr})
 to set the caption correctly and center the table contents.
 
 \begin{table}[htbp]
-% The first argument is the label.
-% The caption goes in the second argument, and the table contents
-% go in the third argument.
+ % The first argument is the label.
+ % The caption goes in the second argument, and the table contents
+ % go in the third argument.
 \floatconts
   {tab:example}%
   {\caption{An Example Table}}%
@@ -387,8 +399,8 @@ image, it's better to use a fraction of the line width rather
 than an explicit length. For example, see \figureref{fig:nodes}.
 
 \begin{figure}[htbp]
-% Caption and label go in the first argument and the figure contents
-% go in the second argument
+ % Caption and label go in the first argument and the figure contents
+ % go in the second argument
 \floatconts
   {fig:nodes}
   {\caption{Example Image}}
@@ -598,12 +610,12 @@ For an example, see \algorithmref{alg:net}.
 \begin{algorithm2e}
 \caption{Computing Net Activation}
 \label{alg:net}
-% older versions of algorithm2e have \dontprintsemicolon instead
-% of the following:
-%\DontPrintSemicolon
-% older versions of algorithm2e have \linesnumbered instead of the
-% following:
-%\LinesNumbered
+ % older versions of algorithm2e have \dontprintsemicolon instead
+ % of the following:
+ %\DontPrintSemicolon
+ % older versions of algorithm2e have \linesnumbered instead of the
+ % following:
+ %\LinesNumbered
 \KwIn{$x_1, \ldots, x_n, w_1, \ldots, w_n$}
 \KwOut{$y$, the net activation}
 $y\leftarrow 0$\;
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
index e3ce11c80c5..6e8a13b2652 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
index fd98239d205..9c771393b10 100644
--- a/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
+++ b/Master/texmf-dist/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
@@ -1,30 +1,33 @@
-%\documentclass[wcp,gray]{jmlr} % test grayscale version
+ %\documentclass[wcp,gray]{jmlr} % test grayscale version
 \documentclass[wcp]{jmlr}
 
-% The following packages will be automatically loaded:
-% amsmath, amssymb, natbib, graphicx, url, algorithm2e
+ % The following packages will be automatically loaded:
+ % amsmath, amssymb, natbib, graphicx, url, algorithm2e
 
-%\usepackage{rotating}% for sideways figures and tables
+ %\usepackage{rotating}% for sideways figures and tables
 \usepackage{longtable}% for long tables
 
-% The booktabs package is used by this sample document
-% (it provides \toprule, \midrule and \bottomrule).
-% Remove the next line if you don't require it.
+ % The booktabs package is used by this sample document
+ % (it provides \toprule, \midrule and \bottomrule).
+ % Remove the next line if you don't require it.
 \usepackage{booktabs}
-% The siunitx package is used by this sample document
-% to align numbers in a column by their decimal point.
-% Remove the next line if you don't require it.
+ % The siunitx package is used by this sample document
+ % to align numbers in a column by their decimal point.
+ % Remove the next line if you don't require it.
 \usepackage[load-configurations=version-1]{siunitx} % newer version
-%\usepackage{siunitx}
+ %\usepackage{siunitx}
 
-% The following command is just for this sample document:
+ % The following command is just for this sample document:
 \newcommand{\cs}[1]{\texttt{\char`\\#1}}
 
-\jmlrvolume{vol}
+
+ % change the arguments, as appropriate, in the following:
+\jmlrvolume{1}
 \jmlryear{2010}
 \jmlrworkshop{Workshop Title}
 
-\title[Short Title]{Full Title of Article}
+\title[Short Title]{Full Title of Article\titlebreak This Title Has
+A Line Break\titletag{\thanks{sample footnote}}}
 
  % Use \Name{Author Name} to specify the name.
  % If the surname contains spaces, enclose the surname
@@ -34,7 +37,7 @@
  % enclose the diacritic in braces, e.g. \Name{{\'E}louise Smith}
 
  % Two authors with the same address
-  \author{\Name{Author Name1} \Email{abc@sample.com}\and
+  \author{\Name{Author Name1\nametag{\thanks{with a note}}} \Email{abc@sample.com}\and
    \Name{Author Name2} \Email{xyz@sample.com}\\
    \addr Address}
 
@@ -65,7 +68,7 @@
  %}
 
 \editor{Editor's name}
-% \editors{List of editors' names}
+ % \editors{List of editors' names}
 
 \begin{document}
 
@@ -87,8 +90,16 @@ this sample document as it can help to reduce complications when
 combining the articles into a book. Please avoid using obsolete
 commands, such as \verb|\rm|, and obsolete packages, such as
 \textsf{epsfig}.\footnote{See
-\url{http://www.ctan.org/pkg/l2tabu}} Please also ensure
-that your document will compile with PDF\LaTeX.
+\url{http://www.ctan.org/pkg/l2tabu}}
+
+Please also ensure that your document will compile with PDF\LaTeX.
+If you have an error message that's puzzling you, first check for it
+at the UK TUG FAQ
+\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}.  If
+that doesn't help, create a minimal working example (see
+\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post
+to somewhere like the LaTeX Community Forum
+\url{http://www.latex-community.org/forum/}.
 
 \subsection{Sub-sections}
 
@@ -173,7 +184,9 @@ This can be referenced using \verb|\label| and \verb|\equationref|.
 For example, \equationref{eq:trigrule}.
 
 Multi-lined numbered equations should be displayed using the
-\texttt{align} environment. For example:
+\texttt{align} environment.\footnote{For reasons why you 
+shouldn't use the obsolete \texttt{eqnarray} environment, see
+Lars Madsen, \emph{Avoid eqnarray!} TUGboat 33(1):21--25, 2012.} For example:
 \begin{align}
 f(x) &= x^2 + x\label{eq:f}\\
 f'(x) &= 2x + 1\label{eq:df}
@@ -280,9 +293,9 @@ environment use \verb|\floatconts| (defined by \textsf{jmlr})
 to set the caption correctly and center the table contents.
 
 \begin{table}[htbp]
-% The first argument is the label.
-% The caption goes in the second argument, and the table contents
-% go in the third argument.
+ % The first argument is the label.
+ % The caption goes in the second argument, and the table contents
+ % go in the third argument.
 \floatconts
   {tab:example}%
   {\caption{An Example Table}}%
@@ -383,8 +396,8 @@ image, it's better to use a fraction of the line width rather
 than an explicit length. For example, see \figureref{fig:nodes}.
 
 \begin{figure}[htbp]
-% Caption and label go in the first argument and the figure contents
-% go in the second argument
+ % Caption and label go in the first argument and the figure contents
+ % go in the second argument
 \floatconts
   {fig:nodes}
   {\caption{Example Image}}
@@ -586,12 +599,12 @@ For an example, see \algorithmref{alg:net}.
 \begin{algorithm2e}
 \caption{Computing Net Activation}
 \label{alg:net}
-% older versions of algorithm2e have \dontprintsemicolon instead
-% of the following:
-%\DontPrintSemicolon
-% older versions of algorithm2e have \linesnumbered instead of the
-% following:
-%\LinesNumbered
+ % older versions of algorithm2e have \dontprintsemicolon instead
+ % of the following:
+ %\DontPrintSemicolon
+ % older versions of algorithm2e have \linesnumbered instead of the
+ % following:
+ %\LinesNumbered
 \KwIn{$x_1, \ldots, x_n, w_1, \ldots, w_n$}
 \KwOut{$y$, the net activation}
 $y\leftarrow 0$\;