summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-16 21:46:33 +0000
committerKarl Berry <karl@freefriends.org>2019-03-16 21:46:33 +0000
commit3286b394ea5b172fa004ffedbdec32df377a09d7 (patch)
tree7b6f0a3bd8d6dbe6b7d9697fc483247833b99ea6
parent104ed05226bd6b9fd037bca78e9444182f5e9b76 (diff)
g-brief (16mar19)
git-svn-id: svn://tug.org/texlive/trunk@50415 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/g-brief/README23
-rw-r--r--Master/texmf-dist/doc/latex/g-brief/beispiel.tex4
-rw-r--r--Master/texmf-dist/doc/latex/g-brief/beispiel2.tex4
-rw-r--r--Master/texmf-dist/doc/latex/g-brief/g-brief.pdfbin97789 -> 206081 bytes
-rw-r--r--Master/texmf-dist/source/latex/g-brief/g-brief.drv4
-rw-r--r--Master/texmf-dist/source/latex/g-brief/g-brief.dtx19
-rw-r--r--Master/texmf-dist/tex/latex/g-brief/g-brief.cls4
-rw-r--r--Master/texmf-dist/tex/latex/g-brief/g-brief.sty4
-rw-r--r--Master/texmf-dist/tex/latex/g-brief/g-brief2.cls7
-rw-r--r--Master/texmf-dist/tex/latex/g-brief/g-brief2.sty4
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
11 files changed, 56 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/g-brief/README b/Master/texmf-dist/doc/latex/g-brief/README
new file mode 100644
index 00000000000..f68e7eef9ce
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/g-brief/README
@@ -0,0 +1,23 @@
+README for g-brief (english)
+============================
+g-brief is a document class for LaTeX 2e and serves for
+formatting formless letters in german or english language.
+
+LIESMICH für g-brief (deutsch)
+==============================
+Der g-brief dient zur Formatierung vordruckloser Briefe im A4-Format unter
+LaTeX2e und dem LaTeX 2.09 Kompabilitätsmodus von LaTeX2e. Unterstützt
+werden dabei sowohl die deutsche als auch die englische Sprache.
+Soweit in dieser Beschreibung nicht anders angegeben, gelten die im LaTeX-
+Manual von Lamport beschriebenen Regeln und Befehle für LaTeX bzw. die
+im "LaTeX2e for authors" vom LaTeX3 3 Project Team oder "Der LaTeX
+Begleiter” von M. Goossens/F. Mittelbach/A. Samarin für LaTeX2e.
+
+Maintainer, License, Copyright
+==============================
+Copyright (C) 1991-2003, 2008 Michael Lenzen.
+
+It may be distributed under the terms of the LaTeX Project Public
+License (LPPL), as described in lppl.txt in the base LaTeX distribution.
+Either version 1.1 or, at your option, any later version.
+
diff --git a/Master/texmf-dist/doc/latex/g-brief/beispiel.tex b/Master/texmf-dist/doc/latex/g-brief/beispiel.tex
index 7e62642595f..d8680f67f60 100644
--- a/Master/texmf-dist/doc/latex/g-brief/beispiel.tex
+++ b/Master/texmf-dist/doc/latex/g-brief/beispiel.tex
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\documentclass[11pt,ngerman,latin9]{g-brief}
diff --git a/Master/texmf-dist/doc/latex/g-brief/beispiel2.tex b/Master/texmf-dist/doc/latex/g-brief/beispiel2.tex
index 582256a405d..c81032548bd 100644
--- a/Master/texmf-dist/doc/latex/g-brief/beispiel2.tex
+++ b/Master/texmf-dist/doc/latex/g-brief/beispiel2.tex
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\documentclass[11pt,ngerman,latin9]{g-brief2}
diff --git a/Master/texmf-dist/doc/latex/g-brief/g-brief.pdf b/Master/texmf-dist/doc/latex/g-brief/g-brief.pdf
index 13c548d938a..d985c4096d6 100644
--- a/Master/texmf-dist/doc/latex/g-brief/g-brief.pdf
+++ b/Master/texmf-dist/doc/latex/g-brief/g-brief.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/g-brief/g-brief.drv b/Master/texmf-dist/source/latex/g-brief/g-brief.drv
index ce601ec492b..2dee1afa397 100644
--- a/Master/texmf-dist/source/latex/g-brief/g-brief.drv
+++ b/Master/texmf-dist/source/latex/g-brief/g-brief.drv
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\documentclass[11pt,a4paper]{article}
diff --git a/Master/texmf-dist/source/latex/g-brief/g-brief.dtx b/Master/texmf-dist/source/latex/g-brief/g-brief.dtx
index 78c55d99714..79dfeeead55 100644
--- a/Master/texmf-dist/source/latex/g-brief/g-brief.dtx
+++ b/Master/texmf-dist/source/latex/g-brief/g-brief.dtx
@@ -1,5 +1,5 @@
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
%
%
%\iffalse
@@ -36,6 +36,10 @@
% version 4.0.2 to CTAN. \Telefon is now redefined after loading
% marvosym, and a brace mismatch. Debian bugs 423919, 407968, patch at
% http://svn.debian.org/wsvn/debian-tex/texlive-new/trunk/texlive-extra/debian/patches/g-brief-fix?op=file&rev=0&sc=0
+%
+% 2019-03-14 norbert@preining.info -- trying to write multiple letters
+% in the same document fails due to multiple \newcounter calls. Fix this.
+% Uploaded as 4.0.3 with permission from Michael.
%
%\fi
%
@@ -461,6 +465,14 @@
% zu einem ClassError.\\
% Bei einer fehlender Definition von \verb/\Unterschrift{}/ kam es in den
% bisherigen Versionen zu einem Fehler.
+%
+%\item[Version 4.0.2:] Kompatibilit\"at mit marvosym dass auch
+% \verb/\Telefon/ definiert. Fix f\"ur unbalancierte geschweifte Klammern.
+% (Karl Berry)
+%
+%\item[Version 4.0.3:] Unterst\"utzung von mehreren Briefen im gleichen
+% Dokument. (Norbert Preining)
+%
%\end{description}
%
%\section{\"Anderungen}
@@ -1237,7 +1249,8 @@
\unitlength1mm
\begin{picture}(0,0)
\put(-9,0){\parbox{180mm}{
- \tiny \newcounter{blockzahl} \def\@blockbreite{170mm}
+ \ifx\c@blockzahl\undefined\newcounter{blockzahl}\else\setcounter{blockzahl}{0}\fi
+ \tiny \def\@blockbreite{170mm}
\iftrennlinien \rule{180mm}{0.5pt} \fi
\ifthenelse{
\equal{\namezeilea}{\empty} \and \equal{\namezeileb}{\empty} \and
diff --git a/Master/texmf-dist/tex/latex/g-brief/g-brief.cls b/Master/texmf-dist/tex/latex/g-brief/g-brief.cls
index a7b7228e7f6..4c08ecf4897 100644
--- a/Master/texmf-dist/tex/latex/g-brief/g-brief.cls
+++ b/Master/texmf-dist/tex/latex/g-brief/g-brief.cls
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\def\filedate{2008/07/15}
\def\fileversion{4.0.2}
\def\filename{g-brief.cls}
diff --git a/Master/texmf-dist/tex/latex/g-brief/g-brief.sty b/Master/texmf-dist/tex/latex/g-brief/g-brief.sty
index b27b2c57d72..eab2d5e7e32 100644
--- a/Master/texmf-dist/tex/latex/g-brief/g-brief.sty
+++ b/Master/texmf-dist/tex/latex/g-brief/g-brief.sty
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\def\filename{g-brief.sty}
\NeedsTeXFormat{LaTeX2e}[2001/06/01]
diff --git a/Master/texmf-dist/tex/latex/g-brief/g-brief2.cls b/Master/texmf-dist/tex/latex/g-brief/g-brief2.cls
index 1fe3d939c49..392c9538c59 100644
--- a/Master/texmf-dist/tex/latex/g-brief/g-brief2.cls
+++ b/Master/texmf-dist/tex/latex/g-brief/g-brief2.cls
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\def\filedate{2008/07/15}
\def\fileversion{4.0.2}
\def\filename{g-brief2.cls}
@@ -333,7 +333,8 @@
\unitlength1mm
\begin{picture}(0,0)
\put(-9,0){\parbox{180mm}{
- \tiny \newcounter{blockzahl} \def\@blockbreite{170mm}
+ \ifx\c@blockzahl\undefined\newcounter{blockzahl}\else\setcounter{blockzahl}{0}\fi
+ \tiny \def\@blockbreite{170mm}
\iftrennlinien \rule{180mm}{0.5pt} \fi
\ifthenelse{
\equal{\namezeilea}{\empty} \and \equal{\namezeileb}{\empty} \and
diff --git a/Master/texmf-dist/tex/latex/g-brief/g-brief2.sty b/Master/texmf-dist/tex/latex/g-brief/g-brief2.sty
index 7704a854d1d..afa7c638b6f 100644
--- a/Master/texmf-dist/tex/latex/g-brief/g-brief2.sty
+++ b/Master/texmf-dist/tex/latex/g-brief/g-brief2.sty
@@ -33,8 +33,8 @@
%% <m.lenzen@t-online.de>
%%
%%
-\def\filedate{2008/07/15}
-\def\fileversion{4.0.2}
+\def\filedate{2019/03/14}
+\def\fileversion{4.0.3}
\def\filename{g-brief2.sty}
\NeedsTeXFormat{LaTeX2e}[2001/06/01]
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9906f8cfadc..479535e0cd0 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1240,6 +1240,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'univers', "die 'skipping, nonfree font'",
'unswthesis', "die 'skipping, noinfo license'",
'upgreek', "die 'skipping, use was'",
+ 'upmendex', "die 'skipping, compiled binary'",
'upmethodology',"&MAKEflatten",
'uppunctlm', "&MAKEflatten",
'urcls', "&MAKEflatten",