calxxxx-yyyy (30mar15)

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

7 files changed, 52 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/latex/calxxxx-yyyy/README b/Master/texmf-dist/doc/latex/calxxxx-yyyy/README
index 1fb5dfd7126..0c62dc50c6c 100644
--- a/Master/texmf-dist/doc/latex/calxxxx-yyyy/README
+++ b/Master/texmf-dist/doc/latex/calxxxx-yyyy/README
@@ -1,4 +1,4 @@
-README for calxxxx-yyyy, 2015/01/01, v1.0g
+README for calxxxx-yyyy, 2015/03/29, v1.0h
 
 
 TABLE OF CONTENTS
@@ -28,28 +28,32 @@ but other languages can be added. (When you did a translation, please send
 an e-mail with it to Martin DOT Muench AT Uni-Bonn DOT de,
 so that it might be included in calxxxx-yyyy.tex, thanks!)
 
-
 Note: The code of this "package" is based on calxxxx.tex,
 which is © 1999 Slobodan Jankovi\'{c} (Thanks!).
 
-This material is subject to the LaTeX Project Public License
-(LPPL). See http://www.ctan.org/tex-archive/help/Catalogue/
-licenses.lppl.html for the details of that license.
+This material is published under the LPPL 1.3c: This work may be
+distributed and/or modified under the conditions of the LaTeX Project
+Public License, either version 1.3c of this license or (at your option) any
+later version. This version of this license is in
+http://www.latex-project.org/lppl/lppl-1-3c.txt
+and the latest version of this license is in
+http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX version
+2005/12/01 or later.
 
 
 2 DOWNLOAD
 ==========
 
 'calxxxx-yyyy' is available on CTAN:
-http://www.ctan.org/pkg/calxxxx-yyyy
+https://www.ctan.org/pkg/calxxxx-yyyy
 
 Also a ZIP file is provided that contains the files:
 the manual (README.tex, README.pdf), the compiled examples
 (cal2015-2032_DE.pdf, cal2015-2032_DK.pdf, and
 cal2015-2032_EN.pdf), and this README, already
 sorted in a TDS tree:
-http://mirrors.ctan.org/macros/latex/contrib/
-calxxxx-yyyy.zip
+http://mirrors.ctan.org/install/macros/latex/contrib/calxxxx-yyyy.tds.zip
 
 
 3 INSTALLATION
@@ -60,7 +64,7 @@ Installation with ZIP file in TDS format
 The ZIP file `calxxxx-yyyy.tds.zip' contains the files
 sorted in a TDS tree. Thus you can directly unpack the
 ZIP file inside a TDS tree.
-See http://www.ctan.org/TDS-guidelines for an explanation
+See https://www.ctan.org/TDS-guidelines for an explanation
 of TDS.
 Example:
   cd /...somewhere.../texmf
@@ -79,22 +83,22 @@ b) Install the file `calxxxx-yyyy.tex' in your TDS tree:
      cp calxxxx-yyyy.tex TDS:tex/latex/calxxxx-yyyy/
    Replace `TDS:' by the prefix of your TDS tree
    (texmf directory).
-c) Create the documentation (if necessary), e.g.
+c) Create the documentation, if necessary, e.g.
      pdflatex README.tex
-d) Copy the documentation files to
+d) Update the databases if necessary, e.g. for teTeX:
+     mktexlsr .../texmf
+e) Copy the documentation files to
    "TDS:doc/latex/calxxxx-yyyy/":
    README, README.tex, README.pdf
    (and e.g. cal2015-2032_DE.pdf, cal2015-2032_DK.pdf,
     and cal2015-2032_EN.pdf).
-e) Update the databases if necessary, e.g. for teTeX:
-     mktexlsr .../texmf
 
 
 4 ADDITIONAL PACKAGES
 =====================
 
 calxxxx-yyyy itself loads these other packages:
-babel, geometry, arry,
+babel, geometry, and arry,
 which again load other packages
 (see the result of the \listfiles command in the log-file
  of the example).
@@ -137,4 +141,4 @@ Bug reports can be send to the maintainer:
 =================
 
 * If you request too many years (more than about 141) at once,
-(La)TeX will run out of memory (unless you increase that).
\ No newline at end of file
+  (La)TeX will run out of memory (unless you increase that).
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.pdf b/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.pdf
index 60e4d8e8390..d762a31b977 100644
--- a/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.pdf
+++ b/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.pdf
diff --git a/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.tex b/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.tex
index 4b2def08460..399224fe65c 100644
--- a/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.tex
+++ b/Master/texmf-dist/doc/latex/calxxxx-yyyy/README.tex
@@ -16,14 +16,13 @@
 ]{hyperref}[2012/11/06]% v6.83m
 \begin{document}
 \section*{\texttt{ReadMe} for cal$xxxx-yyyy$.tex file}
-
-Version: v1.0g
-
-\noindent Date: 2015/01/01\newline
+Version: v1.0h\newline
+Date: 2015/03/29\newline
+\copyright{} 2010 - 2015 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
 
 This file explains the use of the \textsf{calxxxx-yyyy.tex} file,
 available at\newline
-\url{http://ctan.org/tex-archive/macros/latex/contrib/calxxxx-yyyy/}.\newline
+\url{https://www.ctan.org/pkg/calxxxx-yyyy}.\newline
 \noindent For information about possible modifications and the mathematical background
 for the calculation of the calendar please see the README file of the original
 \textsf{calxxxx.tex} file. \textsf{calxxxx-yyyy.tex} is for \LaTeXe, and uses
@@ -42,7 +41,7 @@ an e-mail with it to {\nolinebreak Martin.Muench@Uni-Bonn.de,}
 so that it might be included in \textsf{calxxxx-yyyy.tex}, thanks!)\newline
 Everything else is as described in the README for \textsf{calxxxx.tex}.\newline
 The \textsf{calxxxx.tex} file is \copyright{} 1999 Slobodan Jankovi\'{c}.\newline
-\textsf{calxxxx-yyyy.tex} is published under the LPPL: This work may be
+\textsf{calxxxx-yyyy.tex} is published under the LPPL~1.3c: This work may be
 distributed and/or modified under the conditions of the \LaTeX{} Project
 Public License, either version 1.3c of this license or (at your option) any
 later version. This version of this license is in
@@ -59,12 +58,14 @@ implied, including without limitation any implied warranties of
 merchantability or fitness for a particular purpose.
 
 Thanks to Michael Lodahl for translation to Danish and to Koloskov Gleb for
-reporting a bug.\newline
+reporting a bug.
 
-\noindent Possible alternatives:\newline
-- \url{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/calxxxx/}\newline
-- \url{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/kalender/}\newline
+\noindent Possible alternatives:
+\begin{description}
+\item[--] \url{https://www.ctan.org/pkg/calxxxx}
+\item[--] \url{https://www.ctan.org/pkg/kalender}
+\end{description}
 
 \noindent A list of my (H.-Martin M\"{u}nch) packages can be found at\newline
-\url{http://www.ctan.org/author/muench-hm}.
+\url{https://www.ctan.org/author/muench-hm}.
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DE.pdf b/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DE.pdf
index 79788198189..a6ca60e9f71 100644
--- a/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DE.pdf
+++ b/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DE.pdf
diff --git a/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DK.pdf b/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DK.pdf
index 13b297141e2..2fca7743819 100644
--- a/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DK.pdf
+++ b/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_DK.pdf
diff --git a/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_EN.pdf b/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_EN.pdf
index 7e1159e4f15..b7b0bce3b2d 100644
--- a/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_EN.pdf
+++ b/Master/texmf-dist/doc/latex/calxxxx-yyyy/cal2015-2032_EN.pdf
diff --git a/Master/texmf-dist/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex b/Master/texmf-dist/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
index e9fa4bd899e..1fcd40c365c 100644
--- a/Master/texmf-dist/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
+++ b/Master/texmf-dist/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
@@ -1,7 +1,6 @@
 % calxxx-yyyy.tex
-% file version: v1.0g
-% file date:          2015/01/01
-% documentation date: 2015/01/01
+% version: v1.0h
+% date: 2015/03/29
 %
 % Copyright (C) 2010 - 2015 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
 % Portions of code copyrighted by Slobodan Jankovi\'{c}.
@@ -18,16 +17,16 @@
 % for different years and to use different languages (and therefore also use weeks
 % running from Monday to Sunday instead of Sunday to Saturday).
 %
-% Hint: Gernerally \newcommand would be better than \def, but because this is no style
-% file and the original code used \def, I did not want to change it.
+% Hint: Gernerally \newcommand would be better than \def, but because this is
+% no style file and the original code used \def, I did not want to change it.
 %
 % This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+% conditions of the LaTeX Project Public License (LPPL), 
+% either version 1.3c of this license or (at your option) any later version.
+% This version of this license is in
+%   http://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%   http://www.latex-project.org/lppl.txt
 % and version 1.3c or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
@@ -35,12 +34,17 @@
 %
 % The Current Maintainer of this work is H.-Martin Muench.
 %
-% This work consists of the main source files calxxxx-yyyy.tex and README.tex
+% This work consists of the main source files
+%   calxxxx-yyyy.tex, README and README.tex,
 % and the derived files
-%    README.pdf, cal2015-2032_DE.pdf, cal2015-2032_DK.pdf,
-%    and cal2015-2032_EN.pdf
-% and the README.txt.
-
+%   README.pdf, cal2015-2032_DE.pdf, cal2015-2032_DK.pdf,
+%   and cal2015-2032_EN.pdf.
+%
+% In memoriam
+%  Claudia Simone Barth + 1996/01/30
+%  Tommy Muench + 2014/01/02
+%  Hans-Klaus Muench + 2014/08/24
+%
 \documentclass[12pt,a4paper,danish,german,english]{report}
 % In the options you need to place the desired language at the last position.
 % Sorry for the inconvenience.
@@ -336,8 +340,8 @@
 \repeat
 \message{^^J}\message{^^J}%
 \newline%
-\tiny{\indent Original calxxxx.\TeX \ \copyright \ 1999/12/19 Slobodan Jankovi\'{c};\ %
-these calendars produced with calxxxx-yyyy 2015/01/01 v1.0g by \texttt{Martin.Muench@Uni-Bonn.de};\ %
+\tiny{\indent Original calxxxx.\TeX{} \copyright{} 1999/12/19 Slobodan Jankovi\'{c}; %
+these calendars produced with calxxxx-yyyy 2015/03/29 v1.0h by \texttt{Martin.Muench@Uni-Bonn.de}; %
 \iflanguage{english}{English by Slobodan Jankovi\'{c}.}{%
  \iflanguage{german}{Deutsch von H.-Martin M\"{u}nch.}{%
   \iflanguage{danish}{Dansk af Michael Lodahl.}{%