uadocs (30may13)

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

8 files changed, 94 insertions, 48 deletions

diff --git a/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.pdf b/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.pdf
index aa3095e3972..fe65bf62cbd 100644
--- a/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.pdf
+++ b/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.pdf
diff --git a/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.tex b/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.tex
index 356f82a312a..c7833888e47 100644
--- a/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.tex
+++ b/Master/texmf-dist/doc/latex/uadocs/uacoursetext-example.tex
@@ -25,9 +25,9 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{1.0}
-\def\filedate{2013/05/11}
-\documentclass[a4paper,11pt,oneside,openright,english]{uacoursetext}
+\def\fileversion{1.1}
+\def\filedate{2013/05/29}
+\documentclass[a4paper,11pt,oneside,openright,english,qr]{uacoursetext}
 
 \usepackage[english,dutch]{babel}
 \selectlanguage{english}
diff --git a/Master/texmf-dist/doc/latex/uadocs/uadocs.pdf b/Master/texmf-dist/doc/latex/uadocs/uadocs.pdf
index 40d6d0244ff..2e3cdafcde4 100644
--- a/Master/texmf-dist/doc/latex/uadocs/uadocs.pdf
+++ b/Master/texmf-dist/doc/latex/uadocs/uadocs.pdf
diff --git a/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.pdf b/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.pdf
index 1a35bdf6df2..cda1846ded5 100644
--- a/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.pdf
+++ b/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.pdf
diff --git a/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.tex b/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.tex
index d75f9a0d9d1..1062410439a 100644
--- a/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.tex
+++ b/Master/texmf-dist/doc/latex/uadocs/uamasterthesis-example.tex
@@ -25,8 +25,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{1.0}
-\def\filedate{2013/05/11}
+\def\fileversion{1.1}
+\def\filedate{2013/05/29}
 \documentclass[a4paper,11pt,twoside,openright,english]{uamasterthesis}
 
 \usepackage[english,dutch]{babel}
diff --git a/Master/texmf-dist/source/latex/uadocs/uadocs.dtx b/Master/texmf-dist/source/latex/uadocs/uadocs.dtx
index 7a41c0478d7..b90e7d131e5 100644
--- a/Master/texmf-dist/source/latex/uadocs/uadocs.dtx
+++ b/Master/texmf-dist/source/latex/uadocs/uadocs.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2010-2011 by Paul Levrie  <paul.levrie@ua.ac.be>
-%                        and Walter Daems <walter.daems@ua.ac.be>
+% Copyright (C) 2013 by Paul Levrie  <paul.levrie@ua.ac.be>
+%                    and Walter Daems <walter.daems@ua.ac.be>
 %
 % This work may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License, either version 1.3 of this license
@@ -28,10 +28,10 @@
 %<ct|mt>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<ct>\ProvidesClass{uacoursetext}
 %<mt>\ProvidesClass{uamasterthesis}
-%<ct|mt>    [2013/05/11 v1.0 .dtx skeleton file]
+%<ct|mt>    [2013/05/21 v1.1 .dtx skeleton file]
 %
-\def\fileversion{1.0}
-\def\filedate{2013/05/11}
+\def\fileversion{1.1}
+\def\filedate{2013/05/29}
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{makeidx}
@@ -67,7 +67,8 @@
 %   Right brace   \}     Tilde         \~}
 %
 %
-% \changes{v1.0}{2013/05/08}{Consolidated uacoursetext class}
+% \changes{v1.0}{2013/05/11}{\@ Consolidated uacoursetext class}
+% \changes{v1.1}{2013/05/29}{\@ Small bugfixes and 'filled' option}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
 % \setlength{\parindent}{0em}
@@ -208,6 +209,56 @@
 % \end{verbatim}
 %
 % 
+% \subsection{The class options explained}
+%
+% The class has several options. They are listed below.
+% After every option, it has been indicated to which class the option
+% applies (between square brackets).
+% \changes{v1.1}{2013/05/28}{Added option user documentation}
+%
+% \DescribeMacro{copyright} [uacoursetext]\\
+%   This option forces printing a watermark on every page. For the paper
+%   version of your document, this is inappropriate, but for any e-copy
+%   you make available, this may be appropriate;
+%
+% \DescribeMacro{filled} [uacoursetext / uamasterthesis]\\
+%   This option causes the text to be filled (simultaneous left and right
+%   alignment). Though this setting is not recommended, it is provided
+%   because the default |\raggedright| cannot be undone. The |filled|
+%   option prevents the |\raggddright| from being issued. However, if
+%   you care about the readability of your text, you shouldn't use this
+%   option.
+%
+% \DescribeMacro{titlepagenoartwork} [uacoursetext / uamasterthesis]\\
+%   This option forces the title pages to be typeset without circle graphics and
+%   logo. This allows for printing on a pre-printed color sheet that
+%   already contains circle graphics and logo;
+%
+% \DescribeMacro{titlepagetableonly} [uacoursetext / uamasterthesis]\\
+%   This option forces the title-page data to be printed in table form
+%   as first page. Some publishers require the manuscript to be
+%   delivered in this form. They perform the entire typesetting of the
+%   title page.
+%
+% \DescribeMacro{qr} [uacoursetext]\\
+%   This option allows you to generate a QR code containing the details of
+%   the course on the title page (or the table-only) title page. For
+%   this option to work, the package pstricks is loaded. It will not
+%   work with pdf\LaTeX{} unless you enable shell escape. Read your
+%   pdf\LaTeX{}-package documentation on how to do that.
+%
+% Common sets of options depend on the purpose:
+% \begin{itemize}
+% \item to make a text ready for electronic distribution:
+% |a4paper|, |copyright|.
+% \item to make a camera-ready text (for printing) in case
+% the cover is printed on a pre-printed color artwork cover sheet is:
+% |a4paper|, |qr|, |titlepagenoartwork|.
+% \item to make a camera-ready text (for printing) in case the cover
+% is typeset based on table data:
+% |a4paper|, |qr|, |titlepagetableonly|. 
+% \end{itemize}
+%
 % \subsection{The macros explained}
 %
 % After every macro, it has been indicated to which class the macro
@@ -413,7 +464,7 @@
 % 
 % \begin{verbatim}
 %<*ct-example> 
-\documentclass[a4paper,11pt,oneside,openright,english]{uacoursetext}
+\documentclass[a4paper,11pt,oneside,openright,english,qr]{uacoursetext}
 
 \usepackage[english,dutch]{babel}
 \selectlanguage{english}
@@ -692,31 +743,11 @@ doloribus asperiores repellat.
 % For simplicity, we'll derive everything from the standard |book|
 % class.
 % 
-% \changes{v1.0}{2013/05/10}{Added option titlepagetableonly}
-% \changes{v1.0}{2013/05/10}{Added option titlepagenoartwork}
+% \changes{v1.0}{2013/05/11}{Added option titlepagetableonly}
+% \changes{v1.0}{2013/05/11}{Added option titlepagenoartwork}
 % \changes{v1.0}{2013/05/11}{Added option qr}
-% Before loading the class, we provide an extra 
-% \begin{itemize}
-% \item 'copyright' option (only for uacoursetext class)
-%   that forces printing a watermark on every page. For the paper
-%   version of your document, this is inappropriate, but for any e-copy
-%   you make available, this may be appropriate;
-% \item 'titlepagetableonly' option (only for uacoursetext class)
-%   that forces only the title-page data to be printed in table form
-%   as first page. Many publishers require the manuscript to be
-%   delivered in this form. They perform the entire typesetting of the
-%   title page.
-% \item 'qr' option (only for uacoursetext class)
-%   that allows you to generate a QR code containing the details of
-%   the course on the title page (or the table-only) title page. For
-%   this option to work, the package pstricks is loaded. It will not
-%   work with pdf\LaTeX{} unless you enable shell escape. Read you
-%   pdf\LaTeX{}-package documentation on how to do that.
-% \item 'titlepagenoartwork' option
-%   that forces the title pages to print without circle graphics and
-%   logo. This allows for printing on a pre-printed color sheet that
-%   already contains circle graphics and logo;
-% \end{itemize}
+%
+% Before loading the class, we provide the extra options.
 % 
 %    \begin{macrocode}
 %<*ct>      
@@ -733,6 +764,8 @@ doloribus asperiores repellat.
 \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
 \newif\if@titlepagetableonly
 \DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
+\newif\if@filled
+\DeclareOption{filled}{\@filledtrue}
 %</ct|mt>
 %    \end{macrocode}
 %
@@ -1241,11 +1274,12 @@ W www.cursusdienst.be}
 % \begin{macro}{\diploma}
 %   This macro sets the |\@diploma| tags that later will
 %   be used on the title page. 
+%   \changes{v1.1}{2013/05/21}{Fixed typo on programme's name (e-umlaut)}
 %    \begin{macrocode}
-%<*mt>      
+%<*mt>
 \newcommand{\@diploma}{ERROR}
 \newcommand{\diploma}[1]{
-  \newcommand{\MoSIW}{Master of Science in de industriële wetenschappen}
+  \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
   \renewcommand{\@diploma}{
     \ifthenelse{\equal{#1}{MA-IW-BK}}
                           {\MoSIW: bouwkunde}{
@@ -1359,13 +1393,17 @@ W www.cursusdienst.be}
 %    \end{macrocode}
 %
 % Some common code remains:
+% \changes{v1.1}{2013/05/28}{Made raggedright conditional on option
+% 'filled', because it can't be undone}
 %    \begin{macrocode}
 %<*ct|mt>
 \renewcommand{\headrulewidth}{1pt}
 \renewcommand{\footrulewidth}{1pt}
 \pagestyle{fancy}
+\if@filled\else
+  \raggedright
+\fi
 \raggedbottom
-\raggedright
 \pagenumbering{arabic}
 \onecolumn
 %</ct|mt>
diff --git a/Master/texmf-dist/tex/latex/uadocs/uacoursetext.cls b/Master/texmf-dist/tex/latex/uadocs/uacoursetext.cls
index 280186ac0c7..9d1658325ba 100644
--- a/Master/texmf-dist/tex/latex/uadocs/uacoursetext.cls
+++ b/Master/texmf-dist/tex/latex/uadocs/uacoursetext.cls
@@ -27,9 +27,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uacoursetext}
-    [2013/05/11 v1.0 .dtx skeleton file]
-\def\fileversion{1.0}
-\def\filedate{2013/05/11}
+    [2013/05/21 v1.1 .dtx skeleton file]
+\def\fileversion{1.1}
+\def\filedate{2013/05/29}
 \newif\if@copyright
 \DeclareOption{copyright}{\@copyrighttrue}
 \newif\if@qr
@@ -38,6 +38,8 @@
 \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
 \newif\if@titlepagetableonly
 \DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
+\newif\if@filled
+\DeclareOption{filled}{\@filledtrue}
 \ExecuteOptions{a4paper,11pt,final,oneside,openright}
 \ProcessOptions
 \LoadClassWithOptions{book}
@@ -337,8 +339,10 @@ W www.cursusdienst.be}
 \renewcommand{\headrulewidth}{1pt}
 \renewcommand{\footrulewidth}{1pt}
 \pagestyle{fancy}
+\if@filled\else
+  \raggedright
+\fi
 \raggedbottom
-\raggedright
 \pagenumbering{arabic}
 \onecolumn
 \newcommand{\@crnotice}{
diff --git a/Master/texmf-dist/tex/latex/uadocs/uamasterthesis.cls b/Master/texmf-dist/tex/latex/uadocs/uamasterthesis.cls
index bc5aedd1c47..683d91e1e0a 100644
--- a/Master/texmf-dist/tex/latex/uadocs/uamasterthesis.cls
+++ b/Master/texmf-dist/tex/latex/uadocs/uamasterthesis.cls
@@ -27,13 +27,15 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uamasterthesis}
-    [2013/05/11 v1.0 .dtx skeleton file]
-\def\fileversion{1.0}
-\def\filedate{2013/05/11}
+    [2013/05/21 v1.1 .dtx skeleton file]
+\def\fileversion{1.1}
+\def\filedate{2013/05/29}
 \newif\if@titlepagenoartwork
 \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
 \newif\if@titlepagetableonly
 \DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
+\newif\if@filled
+\DeclareOption{filled}{\@filledtrue}
 \ExecuteOptions{a4paper,11pt,final,oneside,openright}
 \ProcessOptions
 \LoadClassWithOptions{book}
@@ -110,7 +112,7 @@
 \newcommand{\supervisoriv}[1]{\renewcommand{\@supervisoriv}{#1}}
 \newcommand{\@diploma}{ERROR}
 \newcommand{\diploma}[1]{
-  \newcommand{\MoSIW}{Master of Science in de industriële wetenschappen}
+  \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
   \renewcommand{\@diploma}{
     \ifthenelse{\equal{#1}{MA-IW-BK}}
                           {\MoSIW: bouwkunde}{
@@ -157,8 +159,10 @@
 \renewcommand{\headrulewidth}{1pt}
 \renewcommand{\footrulewidth}{1pt}
 \pagestyle{fancy}
+\if@filled\else
+  \raggedright
+\fi
 \raggedbottom
-\raggedright
 \pagenumbering{arabic}
 \onecolumn
 \pgfmathsetmacro{\ua@Wh}{\paperwidth}