diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx index acfbde56775..18286886b38 100644 --- a/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx +++ b/Master/texmf-dist/source/latex/koma-script/doc/english/scrlttr2examples.dtx @@ -2,7 +2,7 @@ % \iffalse % ====================================================================== % scrlttr2examples.dtx -% Copyright (c) Markus Kohm, 2008-2013 +% Copyright (c) Markus Kohm, 2008-2018 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlttr2examples.dtx -% Copyright (c) Markus Kohm, 2008-2013 +% Copyright (c) Markus Kohm, 2008-2018 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -101,13 +101,13 @@ % \begin{macrocode} %<*lco&23> \ProvidesFile{ich.lco}[2008/06/11 lco -%<english> (John Public)] +%<english> (Joe Public)] %<ngerman> (Peter Musterfrau)] \KOMAoptions{foldmarks=true,foldmarks=blmtP, fromphone,fromemail,fromlogo,subject=titled} %<*english> -\setkomavar{fromname}{John Public} -\setkomavar{signature}{John Public\\ +\setkomavar{fromname}{Joe Public} +\setkomavar{signature}{Joe Public\\ (former chairman)} %</english> %<*ngerman> @@ -117,15 +117,16 @@ %</ngerman> \renewcommand*{\raggedsignature}{\raggedright} %<*english> -\setkomavar{fromaddress}{Valley 2\\ - 54321 Public-Village} +\setkomavar{fromaddress}{2 Valley\\ + SAMPLEBY\\ + ZY32 1XW} %</english> %<*ngerman> \setkomavar{fromaddress}{Hinter dem Tal 2\\ 54321 Musterheim} %</ngerman> \setkomavar{fromphone}{0\,12\,34~56\,78} -%<english>\setkomavar{fromemail}{Peter@Public.invalid} +%<english>\setkomavar{fromemail}{joe@public.invalid} %<ngerman>\setkomavar{fromemail}{Peter@Musterfrau.invalid} \setkomavar{fromlogo}{% \includegraphics{musterlogo}} @@ -134,7 +135,7 @@ Club member no.~4711\\ since 11.09.2001\\ chairman 2003--2005} -\setkomavar{place}{Public-Village} +\setkomavar{place}{Sampleby} \setkomavar{frombank}{Bank of Friendly Greetings} %</english> %<*ngerman> @@ -192,15 +193,15 @@ %<nipponB>\LoadLetterOption{NipponEL} %<label>\documentclass[version=last,ich,settleford600label]{scrlttr2} %<ngerman>\usepackage[ngerman]{babel} -%<english>\usepackage[english]{babel} +%<english>\usepackage[british]{babel} %<16|17|18|19|20|21|22|23|label>\usepackage{graphics} \begin{document} %<*!0&!1&!2&!3&!4&!5&!6&!7&!23&!label> -%<english>\setkomavar{fromname}{John Public} +%<english>\setkomavar{fromname}{Joe Public} %<ngerman>\setkomavar{fromname}{Peter Musterfrau} %<*22> %<*english> -\setkomavar{signature}{John Public\\ +\setkomavar{signature}{Joe Public\\ (former chairman)} %</english> %<*ngerman> @@ -210,8 +211,9 @@ \renewcommand*{\raggedsignature}{\raggedright} %</22> %<*english> -\setkomavar{fromaddress}{Valley 2\\ - 54321 Public-Village} +\setkomavar{fromaddress}{2 Valley\\ + SAMPLEBY\\ + ZY32 1XW} %</english> %<*ngerman> \setkomavar{fromaddress}{Hinter dem Tal 2\\ @@ -219,7 +221,7 @@ %</ngerman> %<*!9&!10&!11> \setkomavar{fromphone}{0\,12\,34~56\,78} -%<english>\setkomavar{fromemail}{Peter@Public.invalid} +%<english>\setkomavar{fromemail}{joe@public.invalid} %<ngerman>\setkomavar{fromemail}{Peter@Musterfrau.invalid} %<*!12&!13&!14&!15> \setkomavar{fromlogo}{\includegraphics{musterlogo}} @@ -230,7 +232,7 @@ %<*!23&!label&!nipponA&!nipponB> \setkomavar{location}{\raggedright %<*english> - Club nember no.~4711\\ + Club member no.~4711\\ since 11.09.2001\\ chairman 2003--2005} %</english> @@ -244,7 +246,7 @@ %<english>\setkomavar{date}{29th February 2011} %<ngerman>\setkomavar{date}{29. Februar 2011} %<*!23&!label> -%<english>\setkomavar{place}{Public-Village} +%<english>\setkomavar{place}{Sampleby} %<ngerman>\setkomavar{place}{Musterheim} %</!23&!label> %<*21|22|23|label> @@ -256,9 +258,10 @@ %<!5>\begin{letter}{% %<5>\begin{letter}[fontsize=14pt]{% %<*english> - Joana Public\\ - Hillside 1\\ - 12345 Public-City% + Joanna Public\\ + 1 Hillside\\ + SAMPLESTEAD\\ + WX12 3YZ% %</english> %<*ngerman> Petra Mustermann\\ @@ -267,29 +270,28 @@ %</ngerman> } %<label>\savelabel{3}{2} -%<english>\opening{Dear chairman,} +%<english>\opening{Dear Madam Chair,} %<ngerman>\opening{Liebe Vereinsvorsitzende,} %<*!0> %<*english> -the last general meeting was about one year ago. -I want to remind you, that the constitution of our -club advises you to make a general meeting every -six month. Because of this I expect the executive -board to detain such a meeting immediately. -\closing{Expecting an invitation} +The last general meeting was more than a year ago. +I would like to remind you that the articles of our +club stipulate that one should be held every +six months. For this reason, I call on the executive +board to arrange such a meeting immediately. +\closing{Anticipating an invitation} %</english> %<*ngerman> seit einem Jahr gab es keine Mitgliederversammlung mehr. Ich erinnere daran, dass unsere Satzung eine -solche alle halbe Jahr vorsieht. Ich fordere den +solche jedes halbe Jahr vorsieht. Ich fordere den Vorstand daher auf, umgehend eine solche in Angriff zu nehmen. \closing{In Erwartung einer Einladung} %</ngerman> %<*!1> %<*english> -\ps PS: I hope you accept this as an friendly - demand note. +\ps PS: I hope you do not take this request amiss. %</english> %<*ngerman> \ps PS: Ich hoffe, Du nimmst mir das nicht krumm. @@ -298,8 +300,8 @@ Angriff zu nehmen. %<*!3> %<*english> \setkomavar*{enclseparator}{Enclosure} -\encl{Compendium of the constitution with the - general meeting paragraphs.} +\encl{Excerpt from the articles governing general + meetings} %</english> %<*ngerman> \setkomavar*{enclseparator}{Anlage} |