From: Uwe Stöhr Date: Wed, 8 Oct 2008 23:40:51 +0000 (+0000) Subject: dinbrief: fix typos, correct obsolete environments, add missing environments, patch... X-Git-Tag: 1.6.10~3107 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2cb757c4c890ddf50f3f6dd8fc249d12f90261e7;p=features.git dinbrief: fix typos, correct obsolete environments, add missing environments, patch by Günter Milde (existing documents are fully compatible to the new one) can also go to branch, Jürgen? git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26819 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index 76cee9794b..7d03dbb149 100644 --- a/lib/layouts/dinbrief.layout +++ b/lib/layouts/dinbrief.layout @@ -3,193 +3,343 @@ # German DIN-Brief textclass definition file. # Author : Juergen Vigna # Modified by: Carsten Kaemmerer -# Modifies only some things from letter.layout - +# Modified by: Guenter Milde +# Dummy Style DinBrief for common layout features (removed at eof) +# Generic style names (there are german translations for most names) +# Additional Styles and twiddeled layout +# Many "ObsoletedBy" to ease conversion from g-brief, scrletter, +# or letter (see also the update of the dinbrief.lyx template) Format 10 + Input letter.layout +# dinbrief's \phone has 2 args, area and number. We define an empty +# command that can be set by the Area_Code style +Preamble + \newcommand{\areacode}{} +EndPreamble -Style My_Address - Margin Static - LeftMargin Unterschrift: - LabelType Static - LabelString "Briefkopf:" - LabelSep x +Style DinBrief # auxiliary style copied by other dinbrief styles + LatexType Command + Margin Static + LeftMargin "Unsere Zeichen" + Align Left + AlignPossible Left + LabelType Static + LabelSep x LabelFont - Shape Italic - Size Small - Color blue + Series Medium + Shape Italic + Size Small + Color blue EndFont - BottomSep 0.5 - Spacing Other 0.9 End - +# Open a new letter +# in dinbrief, this is an environment spanning the whole letter +# (see scrlettr2 for an alternative lyx-implementation) Style Send_To_Address - Margin Static - BottomSep 0.1 - LeftMargin Unterschrift: - LabelType Static - LabelString "Adresse:" - LabelSep x - LabelFont - Series Medium - Shape Italic - Size Small - Color blue - EndFont - Spacing Other 0.9 + CopyStyle DinBrief + LabelString "Anschrift:" + KeepEmpty 1 # compulsory style + BottomSep 0.1 + LatexName letter End +# Data Fields, placed according to DIN norm +# --------------------------------------------------------- -Style Opening - LeftMargin Unterschrift: - LabelString "Anrede:" - LabelSep x - LabelFont - Series Medium - Shape Italic - Size Small - Color blue +# need to be placed before the Opening in the LyX document! + +Style My_Address # backaddress in letter head + CopyStyle DinBrief + LabelString "Briefkopf:" + LatexName address + KeepEmpty 1 # compulsory style + BottomSep 0.5 + AlignPossible Block, Left, Right, Center +End + +Style "Return address" # backaddress in address window + CopyStyle DinBrief + LabelString "Absender:" + LatexName backaddress + TextFont + Size Small EndFont End +Style "Postal comment" # vor der Emfängeranschrift (Einschreiben, Luftpost) + CopyStyle DinBrief + LabelString "Postvermerk:" + LatexName postremark +End + +Style Handling # rechts neben der Emf�ngeranschrift (Eilt, Pes�nlich) + CopyStyle DinBrief + LabelString "Zusatz:" + LatexName handling +End + +Style YourRef + CopyStyle DinBrief + LabelString "Ihre Zeichen:" # "Ihre Zeichen/Ihre Nachricht vom" + LatexName yourmail +End + +Style MyRef + CopyStyle DinBrief + LabelString "Unsere Zeichen:" + LatexName sign +End + +Style Writer + CopyStyle DinBrief + LabelString "Sachbearbeiter:" + LatexName writer +End Style Signature - LeftMargin Unterschrift: - LabelString "Unterschrift:" - LabelSep x - LabelFont - Series Medium - Shape Italic - Size Small - Color blue - EndFont + CopyStyle DinBrief + LabelString "Unterschrift:" + LatexName signature End +Style Bottomtext # contact info at the bottom of the first page + CopyStyle DinBrief + LabelString "Fußzeile(n):" + LatexName bottomtext + AlignPossible Block, Left, Right, Center +End -Style Closing - LeftMargin Unterschrift: - LabelString "Gruss:" - LabelSep x - LabelFont - Series Medium - Shape Italic - Size Small - Color blue - EndFont +# dinbrief's \phone has 2 args, area and number, +# define both as distinct styles + +Style "Area code" + CopyStyle DinBrief + LabelString "Vorwahl:" + LatexName "renewcommand{\areacode}" +End + +Style Telephone + CopyStyle DinBrief + LabelString "Telefon:" + LatexName phone + LatexParam {\areacode} +End + +Style Location + CopyStyle DinBrief + LabelString "Ort:" + LatexName place + Margin Right_Address_Box + TopSep 0.1 + BottomSep 0.1 + ParSep 0.1 +End + +Style Date + CopyStyle Location + LabelString "Datum:" + LatexName date +End + +Style Subject # dinbrief does not emphasize the subject line + CopyStyle DinBrief + LabelString "Betreff:" + LatexName subject + TopSep 0.4 + BottomSep 0.4 + ParSep 0.4 + Align Block + AlignPossible Block, Left, Right, Center End +# Opening (Anrede) +# ---------------- + +# sets the above data fields + +Style Opening + CopyStyle DinBrief + LabelType Top_Environment + LeftMargin "" + LabelString "Anrede:" + LatexName opening + KeepEmpty 1 # compulsory style + TopSep 1.5 + BottomSep 1 +End + +# Backmatter (styles to be used at the end of the letter) +# ------------------------------------------------------- + +# placed in order of appearance in the document + +Style Closing + CopyStyle Opening + LabelString "Gruß:" + LatexName closing + OptionalArgs 1 + KeepEmpty 1 # compulsory style +End Style encl - LabelString "Anlagen:" - LeftMargin Unterschrift: - LabelSep x + CopyStyle Opening + LabelString "Anlage(n):" + LatexName encl + TopSep 0.4 + BottomSep 0.4 + KeepEmpty 0 LabelFont - Series Medium - Shape Italic - Size Small - Color blue + Series Medium + Shape Up + Size Normal + Color black EndFont End +Style cc + CopyStyle encl + LabelString "Verteiler:" + LatexName cc +End -Style ps - Margin Static - LatexType Command - LatexName ps - LeftMargin Unterschrift: - LabelSep x - TopSep 0.4 - BottomSep 0.4 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "PS:" - LabelFont - Series Medium - Shape Italic - Size Small - Color blue - EndFont +Style PS + CopyStyle encl + LabelString "PS:" + LatexName ps + Align Block + AlignPossible Block, Left + ParSep 0.4 End +# Obsoleted (or differently named) styles +# --------------------------------------- -Style cc - LabelString "Verteiler:" - LeftMargin Unterschrift: - LabelSep x - LabelFont - Series Medium - Shape Italic - Size Small - Color blue - EndFont +# ease conversion from g-brief, scrletter, or letter + +Style SenderAddress # scrletter + ObsoletedBy My_Address End +Style Backaddress # scrletter + ObsoletedBy "Return address" +End -Style Betreff - Margin Static - LatexType Command - LatexName subject - LeftMargin Unterschrift: - LabelSep x - KeepEmpty 1 - TopSep 0.4 - BottomSep 0.4 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Betreff:" - LabelFont - Shape Italic - Size Small - Color blue - EndFont - TextFont - Shape Italic - EndFont +Style RetourAdresse # g-brief-de + ObsoletedBy "Return address" End +Style Address # dinbrief (gm old), g-brief-en, scrletter, ... + ObsoletedBy Send_To_Address +End -Style Stadt - Margin Right_Address_Box - LatexType Command - LatexName place - LabelSep x - TopSep 0.1 - BottomSep 0.1 - ParSep 0.1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Stadt:" - LabelFont - Shape Italic - Size Small - Color blue - EndFont +Style Adresse # g-brief-de, g-brief2 + ObsoletedBy Send_To_Address End +Style Postvermerk # g-brief-de + ObsoletedBy "Postal comment" +End -Style Datum - Margin Right_Address_Box - LatexType Command - LatexName date - LabelSep x - TopSep 0.1 - BottomSep 0.1 - ParSep 0.1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Datum:" - LabelFont - Shape Italic - Size Small - Color blue - EndFont +Style Zusatz # g-brief-de + ObsoletedBy Handling +End + +Style IhrZeichen # g-brief-de + ObsoletedBy YourRef +End + +# Ihr Schreiben vom ist in Dinbrief identisch mit Ihr Zeichen +Style YourMail + ObsoletedBy YourRef +End + +Style IhrSchreiben # g-brief-de + ObsoletedBy YourRef +End + +Style MeinZeichen # g-brief-de + ObsoletedBy MyRef +End + +Style Unterschrift # g-brief-de + ObsoletedBy Signature +End + +Style Phone # dinbrief (gm old) + ObsoletedBy Telephone +End + +Style Telefon # g-brief-de + ObsoletedBy Telephone +End + +Style Place # dinbrief (gm old) + ObsoletedBy Location +End + +Style Stadt # dinbrief v2 + ObsoletedBy Location +End + +Style Town # g-brief-en + ObsoletedBy Location End + +Style Ort # g-brief-de + ObsoletedBy Location +End + +Style Datum # g-brief-de + ObsoletedBy Date +End + +Style Reference # g-brief-en, g-brief2 + ObsoletedBy Subject +End + +Style Betreff # g-brief-de + ObsoletedBy Subject +End + +Style Anrede # g-brief-de + ObsoletedBy Opening +End + +# in dinbrief, the letter text is in Standard format +Style Letter + ObsoletedBy Standard +End +Style Brieftext # g-brief-de + ObsoletedBy Standard +End + +Style Gruss # g-brief-de + ObsoletedBy Closing +End + +Style ps + ObsoletedBy PS +End + +Style Encl. # g-brief-en + ObsoletedBy encl +End + +Style Anlagen # g-brief-de + ObsoletedBy encl +End + +Style CC # scrletter + ObsoletedBy cc +End +Style Verteiler # g-brief-de + ObsoletedBy cc +End + +# Remove auxiliary style +NoStyle DinBrief + diff --git a/lib/templates/dinbrief.lyx b/lib/templates/dinbrief.lyx index 9c11576bcf..6e83f0ee8a 100644 --- a/lib/templates/dinbrief.lyx +++ b/lib/templates/dinbrief.lyx @@ -3,8 +3,24 @@ \begin_document \begin_header \textclass dinbrief -\language german -\inputencoding latin1 +\begin_preamble +% Erzeugen von Adressaufklebern +%\makelabels + +%% Layout-Schalter (\no* = aus, \* = an) +% Fenster um Adressfeld +% \nowindowrules +% Trennstrich zwischen Absender und Anschrift +% \nobackaddressrule +% Faltmarkierung +% \nowindowtics + +% Hochgestellte vs. Standardanschrift +% \addresshigh +% \addressstd (default) +\end_preamble +\language ngerman +\inputencoding auto \font_roman default \font_sans default \font_typewriter default @@ -18,9 +34,9 @@ \paperfontsize 12 \spacing single \use_hyperref false -\papersize default +\papersize a4paper \use_geometry false -\use_amsmath 0 +\use_amsmath 1 \use_esint 0 \cite_engine basic \use_bibtopic false @@ -29,84 +45,330 @@ \tocdepth 3 \paragraph_separation skip \defskip medskip -\quotes_language german +\quotes_language polish \papercolumns 1 \papersides 1 \paperpagestyle empty \tracking_changes false \output_changes false \author "" +\author "" \end_header \begin_body +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Die Datenfelder (Briefkopf, Absender, Betreffzeile, Empfängeradresse, Datum, + Unterschrift, Fußzeile, ...) müssen vor der Anrede definiert werden! +\begin_inset Newline newline +\end_inset + +Bei mehrfacher Verwendung in einem Dokument ersetzt die letzten Definition + die jeweils vorhergehende. +\end_layout + +\end_inset + + +\end_layout + \begin_layout My Address - +Mein Name +\begin_inset space \hfill{} +\end_inset + +ggf. +\begin_inset space ~ +\end_inset + +Firmenlogo \begin_inset Newline newline \end_inset - +Meine Straße \begin_inset Newline newline \end_inset - +Meine Stadt +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +oder individuell gestalteter Briefkopf (z. +\begin_inset space \thinspace{} +\end_inset + +B. + Tabelle oder eingebundene Grafik) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Return address +Mein Name, Meine Straße, Meine Stadt +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Absenderzeile im Adressfenster +\end_layout + +\end_inset + + \end_layout \begin_layout Send To Address - +Name \begin_inset Newline newline \end_inset - +Straße \begin_inset Newline newline \end_inset - +Stadt \end_layout -\begin_layout Stadt - +\begin_layout Postal comment +Einschreiben/Luftpost +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional \end_layout -\begin_layout Datum -08. - Juni 1997 +\end_inset + + +\end_layout + +\begin_layout Handling +Eilt/Persönlich +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional +\end_layout + +\end_inset + + +\end_layout + +\begin_layout YourRef +20.10.2010 +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional +\end_layout + +\end_inset + + +\end_layout + +\begin_layout MyRef +HGK +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Writer +Müller +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional +\end_layout + +\end_inset + + +\begin_inset Note Note +status open + +\begin_layout Plain Layout +wenn hier etwas engetragen ist, wird auf die DIN 676 von Mai 1991 umgeschaltet +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Area code +0800 +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Telephone +1231231 +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional +\end_layout + +\end_inset + + +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Erscheint nur, wenn auch Ihre Zeichen oder Unsere Zeichen definiert ist + (ggf. + mit geschütztem Leerzeichen erzwingen). +\begin_inset Newline newline +\end_inset + +Kann auch als Teil der Nummer formatiert werden (z. +\begin_inset space \thinspace{} +\end_inset + +.B. + 0351/12312312). +\end_layout + +\end_inset + + \end_layout \begin_layout Signature - +Müller +\end_layout + +\begin_layout Bottomtext +Fußzeile: Besucheradresse, Konto, Telefon/-fax, Mail, Webseite, o. +\begin_inset space \thinspace{} +\end_inset + +Ä. +\begin_inset Note Note +status open + +\begin_layout Plain Layout +optional \end_layout -\begin_layout Betreff - +\end_inset + + +\end_layout + +\begin_layout Location +Beispielstadt +\end_layout + +\begin_layout Date +21.10.2010 +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Wenn das Datum fehlt, wird automatisch das aktuelle Datum gesetzt. +\begin_inset Newline newline +\end_inset + +Ein leeres +\begin_inset Quotes pld +\end_inset + +Datum +\begin_inset Quotes prd +\end_inset + + Feld unterdrückt die Ausgabe. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Subject +Betreff \end_layout \begin_layout Opening - +Sehr geehrte(r) \end_layout \begin_layout Standard - +Brieftext +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Der Brieftext steht zwischen Anrede und Gruß. + Es sind alle Schriftstile möglich. \end_layout -\begin_layout Standard - +\end_inset + + \end_layout \begin_layout Closing Mit freundlichen Grüßen +\begin_inset OptArg +status open + +\begin_layout Plain Layout +optionale, alternative Unterschrift \end_layout -\begin_layout ps - +\end_inset + + \end_layout -\begin_layout cc - +\begin_layout PS +PS Text \end_layout \begin_layout encl - +1 +\begin_inset space \thinspace{} +\end_inset + +Fotokopie der Akte +\end_layout + +\begin_layout cc +AS, V, C \end_layout \end_body