mucproc (8mar17)

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

4 files changed, 37 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/latex/mucproc/README.md b/Master/texmf-dist/doc/latex/mucproc/README.md
index 5ad5e53d4c9..12c35dab59d 100644
--- a/Master/texmf-dist/doc/latex/mucproc/README.md
+++ b/Master/texmf-dist/doc/latex/mucproc/README.md
@@ -3,7 +3,7 @@ conference proceedings for the **Mensch und Computer** (MuC) conference using La
 
  Copyright (C) Marei Peischl <tex@mareipeischl.de>, 2017
 
- mucproc 2017/02/22 v1.0
+ mucproc 2017/03/09 v1.02
 
 ***************************************************************************
 
@@ -31,9 +31,13 @@ and the derived files
 
 Versions
 --------
+**v1.02** (2017/03/09)
++ fixing bug in anonymous mode
++ fixing authoraddendum to no longer create bad boxes
 
-*v1.0** (2017/02/22)
-
-+ first official version mucproc
+**v1.01** (2017/03/01)
++ small bugfix concerning the support of English as main language
 
 
+*v1.0** (2017/02/22)
++ first official version mucproc
diff --git a/Master/texmf-dist/doc/latex/mucproc/mucproc.pdf b/Master/texmf-dist/doc/latex/mucproc/mucproc.pdf
index 2239f7ba598..4b613743942 100644
--- a/Master/texmf-dist/doc/latex/mucproc/mucproc.pdf
+++ b/Master/texmf-dist/doc/latex/mucproc/mucproc.pdf
diff --git a/Master/texmf-dist/source/latex/mucproc/mucproc.dtx b/Master/texmf-dist/source/latex/mucproc/mucproc.dtx
index 19a2dbbecda..be84a5839a8 100644
--- a/Master/texmf-dist/source/latex/mucproc/mucproc.dtx
+++ b/Master/texmf-dist/source/latex/mucproc/mucproc.dtx
@@ -22,20 +22,18 @@
 % \iffalse
 %
 %<*!font-clo>
-\def\mucprocVersion{1.0}
+\def\mucprocVersion{1.02}
 %<*driver>
-\ProvidesFile{mucproc.dtx}[2017/02/22 v\mucprocVersion\ MuC-conference proceedings]
+\ProvidesFile{mucproc.dtx}[2017/03/09 v\mucprocVersion\ MuC-conference proceedings]
 %</driver>
 
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2014/05/01]
 \ProvidesClass{mucproc}
-    [2017/02/20 v\mucprocVersion\ conference proceedings for the German MuC-conference]
+    [2017/03/09 v\mucprocVersion\ conference proceedings for the German MuC-conference]
 %</class>
 %
 %<*driver>
-\RequirePackage{scrlfile}
-\ReplaceClass{article}{scrartcl}
 \documentclass[english]{ltxdoc}
 \usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
 \usepackage[T1]{fontenc}
@@ -44,6 +42,12 @@
 \CodelineIndex
 \RecordChanges
 \usepackage{xparse}
+\makeatletter
+% Redefine theglossary environment to create single column change history
+\renewenvironment{theglossary}{%
+    \glossary@prologue%
+    \GlossaryParms\let\item\@idxitem\ignorespaces}{}
+\makeatother
 \begin{document}
   \DocInput{mucproc.dtx}
 \end{document}
@@ -69,6 +73,7 @@
 %
 %
 % \changes{v1.0}{2017/02/20}{Initial version}
+% \changes{v1.01}{2017/03/01}{Small bugfix concerning the support of English as main language}
 %
 % \GetFileInfo{mucproc.dtx}
 %
@@ -78,7 +83,7 @@
 % \title{The \textsf{mucproc} class\thanks{This document
 %   corresponds to \textsf{mucproc}~\fileversion, dated \filedate.}}
 % \author{Marei Peischl \\ \texttt{tex@mareipeischl.de}}
-% \date{February 14, 2017}
+% \date{March 9, 2017}
 % \maketitle
 %
 % \section{Introduction}
@@ -303,12 +308,12 @@
 %    \end{macrocode}
 % The APA-style requires a Language mapping. It is set for both supported main languages.
 %    \begin{macrocode}
-\DeclareLanguageMapping{american}{american-apa}
+\DeclareLanguageMapping{english}{english-apa}
 \DeclareLanguageMapping{ngerman}{ngerman-apa}
 %    \end{macrocode}
 % Set up additional Settings to get an equal output, like the Word-version.
 %    \begin{macrocode}
-\renewcaptionname{ngerman}{\refname}{Literaturverzeichnis}
+\defcaptionname{ngerman,german}{\refname}{Literaturverzeichnis}
 
 \renewcommand*{\nameyeardelim}{\addcomma\space}
 %    \end{macrocode}
@@ -548,12 +553,13 @@
 % The anonymization is realized checking the setting using the corresponding if-expression.
 % The |\@author| information to the language dependent meaning of |\MUCanonymousauthor|.
 %    \begin{macrocode}
-\newcaptionname{ngerman}{\MUCanonymousauthor}{Anonymisierte Fassung}
-\newcaptionname{english}{\MUCanonymousauthor}{anonymous version}
 \ifMUC@anonymous
+	\providecaptionname{english}{\MUCanonymousauthor}{anonymous~ version}
+	\providecaptionname{german,ngerman}{\MUCanonymousauthor}{Anonymisierte~ Fassung}
     \def\@author{\MUCanonymousauthor}
-    \def\author#1\relax
+    \def\author#1{\relax}
 %    \end{macrocode}
+% \changes{v1.02}{2017/03/09}{Bugfix of anonymous mode}
 % The |authoraddendum| environment shall create no output, if the anonymous mode is active.
 %    \begin{macrocode}
     \RequirePackage{comment}
@@ -575,18 +581,19 @@
         }{
             \includegraphics[#1]{#2}
         }
-        \end{minipage}\hspace{.5cm}%
+        \end{minipage}\hfill%
         \begin{minipage}[t]{\dimexpr\linewidth-3.5cm\relax}
         \vspace{0pt}
         {\usekomafont{authoraddendum}#3}\par\medskip%
         }
-        \usekomafont{authoraddendum}
+        \usekomafont{authoraddendum}\ignorespaces
         }{
         \IfNoValueF{#2}{\end{minipage}}
         \par
         }
 \fi
 %    \end{macrocode}
+% \changes{v1.02}{2017/03/09}{Fix boxwidth to no longer generate an overfull hbox.}
 % \end{environment}
 %
 %
diff --git a/Master/texmf-dist/tex/latex/mucproc/mucproc.cls b/Master/texmf-dist/tex/latex/mucproc/mucproc.cls
index bd2c6645170..cf757b64966 100644
--- a/Master/texmf-dist/tex/latex/mucproc/mucproc.cls
+++ b/Master/texmf-dist/tex/latex/mucproc/mucproc.cls
@@ -20,11 +20,11 @@
 %% and version 1.3 or later is part of all distributions of LaTeX version
 %% 2005/12/01 or later.
 %% 
-\def\mucprocVersion{1.0}
+\def\mucprocVersion{1.02}
 
 \NeedsTeXFormat{LaTeX2e}[2014/05/01]
 \ProvidesClass{mucproc}
-    [2017/02/20 v\mucprocVersion\ conference proceedings for the German MuC-conference]
+    [2017/03/09 v\mucprocVersion\ conference proceedings for the German MuC-conference]
 \RequirePackage{expl3}
 \ExplSyntaxOn
 \bool_new:N \g_MUC@compatibility_mode
@@ -125,9 +125,9 @@
 \PassOptionsToPackage{citestyle=authoryear-comp}{biblatex}
 \PassOptionsToPackage{bibstyle=apa}{biblatex}
 \RequirePackage{biblatex}
-\DeclareLanguageMapping{american}{american-apa}
+\DeclareLanguageMapping{english}{english-apa}
 \DeclareLanguageMapping{ngerman}{ngerman-apa}
-\renewcaptionname{ngerman}{\refname}{Literaturverzeichnis}
+\defcaptionname{ngerman,german}{\refname}{Literaturverzeichnis}
 
 \renewcommand*{\nameyeardelim}{\addcomma\space}
 \bool_new:N \g_MUC@fontspec_bool
@@ -294,11 +294,11 @@
 \global\let\thanksref\relax
 }
 
-\newcaptionname{ngerman}{\MUCanonymousauthor}{Anonymisierte Fassung}
-\newcaptionname{english}{\MUCanonymousauthor}{anonymous version}
 \ifMUC@anonymous
+\providecaptionname{english}{\MUCanonymousauthor}{anonymous~ version}
+\providecaptionname{german,ngerman}{\MUCanonymousauthor}{Anonymisierte~ Fassung}
     \def\@author{\MUCanonymousauthor}
-    \def\author#1\relax
+    \def\author#1{\relax}
     \RequirePackage{comment}
     \excludecomment{authoraddendum}
 \else
@@ -314,12 +314,12 @@
         }{
             \includegraphics[#1]{#2}
         }
-        \end{minipage}\hspace{.5cm}%
+        \end{minipage}\hfill%
         \begin{minipage}[t]{\dimexpr\linewidth-3.5cm\relax}
         \vspace{0pt}
         {\usekomafont{authoraddendum}#3}\par\medskip%
         }
-        \usekomafont{authoraddendum}
+        \usekomafont{authoraddendum}\ignorespaces
         }{
         \IfNoValueF{#2}{\end{minipage}}
         \par