diff --git a/lib/ChangeLog b/lib/ChangeLog index ea9152f6a4..43958d4d36 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2003-12-22 Michael Schmitt + + * layouts/g-brief2-en.layout: fix spelling, + remove obsolete style; rename file to g-brief2.layout + * layouts/g-brief2-de.layout: remove file + 2003-12-22 Martin Vermeer * agu_stdclass.inc: diff --git a/lib/doc/LaTeXConfig.lyx.in b/lib/doc/LaTeXConfig.lyx.in index a22f19a15b..41c1fd5158 100644 --- a/lib/doc/LaTeXConfig.lyx.in +++ b/lib/doc/LaTeXConfig.lyx.in @@ -1,5 +1,5 @@ #LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/ -\lyxformat 225 +\lyxformat 228 \textclass article \language english \inputencoding default @@ -80,7 +80,7 @@ Found item is no) and you need its functionality, you can grab it at your nearest CTAN ftp site \begin_inset Foot -collapsed true +status collapsed \begin_layout Standard @@ -173,7 +173,7 @@ econfigure \family default \begin_inset Foot -collapsed true +status collapsed \begin_layout Standard @@ -237,7 +237,7 @@ The LaTeX version that LyX will use is: \family default \begin_inset Foot -collapsed true +status collapsed \begin_layout Standard @@ -1133,12 +1133,12 @@ g-brief-de \begin_layout Subsection -g-brief2-en +g-brief2 \end_layout \begin_layout Description -Found: @chk_g-brief2-en@ +Found: @chk_g-brief2@ \end_layout \begin_layout Description @@ -1154,33 +1154,9 @@ Notes: The document class \family sans g-brief2 \family default - can be used to type commercial letters with a nice outfit. It's the successor of g-brief, its better configurable, but not backward compatible to g-brief. -\end_layout - -\begin_layout Subsection - -g-brief2-de -\end_layout - -\begin_layout Description - -Found: @chk_g-brief2-de@ -\end_layout - -\begin_layout Description - -CTAN: -\family typewriter -macros/latex/contrib/supported/g-brief/ -\end_layout - -\begin_layout Description - -Notes: The document class -\family sans -g-brief2-de -\family default - is the same as the above g-brief2-en only with german labels. Best for german letters. + can be used to type commercial letters with a nice outfit. + It's the successor of g-brief, its better configurable, but not backward + compatible to g-brief. \end_layout \begin_layout Subsection @@ -2149,7 +2125,7 @@ script \family default \begin_inset Foot -collapsed true +status collapsed \begin_layout Standard diff --git a/lib/layouts/g-brief2-de.layout b/lib/layouts/g-brief2-de.layout deleted file mode 100644 index 358201747c..0000000000 --- a/lib/layouts/g-brief2-de.layout +++ /dev/null @@ -1,975 +0,0 @@ -#% Do not delete he line below; configure depends on this -# \DeclareLaTeXClass[g-brief2]{letter (g-brief2, german)} -# Letter textclass definition file. - -# Author :Felix Kurth based on work from -# Thomas Hartkens - -# Input general definitions -# Input stdletter.inc - - - - -# General textclass parameters -Columns 1 -Sides 1 -PageStyle Empty -DefaultStyle Brieftext - -# This is just to show how to declare the default font. -# The defaults are exactly those shown here. -DefaultFont - Family Roman - Series Medium - Shape Up - Size Normal - Color None -EndFont - - - -# Brieftext style definition -Style Brieftext - Margin Static - LatexType Environment - LatexName g-brief - ParSkip 0.4 - KeepEmpty 1 - Align Block - AlignPossible Block, Left, Right, Center - LabelType Top_Environment - LabelString Text: - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - - - - -# Name und Titel des Absenders -Style Name - Margin Static - LatexType Command - LatexName Name - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Name: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - -# Name und Spruch in der Fusszeile -Style NameZeileA - Margin Static - LatexType Command - LatexName NameZeileA - LeftMargin xxxxxxxxxx::xx - LabelSep xx - TopSep 1.5 - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileA: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style NameZeileB - Margin Static - LatexType Command - LatexName NameZeileB - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileB: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style NameZeileC - Margin Static - LatexType Command - LatexName NameZeileC - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileC: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style NameZeileD - Margin Static - LatexType Command - LatexName NameZeileD - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileD: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style NameZeileE - Margin Static - LatexType Command - LatexName NameZeileE - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileE: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style NameZeileF - Margin Static - LatexType Command - LatexName NameZeileF - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileF: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style NameZeileG - Margin Static - LatexType Command - LatexName NameZeileG - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString NameZeileG: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - - -# Unterschrift des Absenders -Style Unterschrift - Margin Static - LatexType Command - LatexName Unterschrift - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Unterschrift: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - -Style AdressZeileA - Margin Static - LatexType Command - LatexName AdressZeileA - LeftMargin xxxxxxxxxx::xx - TopSep 1.5 - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString AdressZeileA: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style AdressZeileB - Margin Static - LatexType Command - LatexName AdressZeileB - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString AdressZeileB: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style AdressZeileC - Margin Static - LatexType Command - LatexName AdressZeileC - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString AdressZeileC: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style AdressZeileD - Margin Static - LatexType Command - LatexName AdressZeileD - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString AdressZeileD: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style AdressZeileE - Margin Static - LatexType Command - LatexName AdressZeileE - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString AdressZeileE: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style AdressZeileF - Margin Static - LatexType Command - LatexName AdressZeileF - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString AdressZeileF: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style TelefonZeileA - Margin Static - LatexType Command - LatexName TelefonZeileA - LeftMargin xxxxxxxxxx::xx - TopSep 1.5 - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString TelefonZeileA: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style TelefonZeileB - Margin Static - LatexType Command - LatexName TelefonZeileB - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString TelefonZeileB: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style TelefonZeileC - Margin Static - LatexType Command - LatexName TelefonZeileC - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString TelefonZeileC: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style TelefonZeileD - Margin Static - LatexType Command - LatexName TelefonZeileD - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString TelefonZeileD: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style TelefonZeileE - Margin Static - LatexType Command - LatexName TelefonZeileE - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString TelefonZeileE: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style TelefonZeileF - Margin Static - LatexType Command - LatexName TelefonZeileF - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString TelefonZeileF: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style InternetZeileA - Margin Static - LatexType Command - LatexName InternetZeileA - LeftMargin xxxxxxxxxx::xx - TopSep 1.5 - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString InternetZeileA: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style InternetZeileB - Margin Static - LatexType Command - LatexName InternetZeileB - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString InternetZeileB: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End -Style InternetZeileC - Margin Static - LatexType Command - LatexName InternetZeileC - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString InternetZeileC: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End -Style InternetZeileD - Margin Static - LatexType Command - LatexName InternetZeileD - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString InternetZeileD: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End -Style InternetZeileE - Margin Static - LatexType Command - LatexName InternetZeileE - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString InternetZeileE: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End -Style InternetZeileF - Margin Static - LatexType Command - LatexName InternetZeileF - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString InternetZeileF: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style BankZeileA - Margin Static - LatexType Command - LatexName BankZeileA - LeftMargin xxxxxxxxxx::xx - TopSep 1.5 - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString BankZeileA: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style BankZeileB - Margin Static - LatexType Command - LatexName BankZeileB - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString BankZeileB: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style BankZeileC - Margin Static - LatexType Command - LatexName BankZeileC - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString BankZeileC: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style BankZeileD - Margin Static - LatexType Command - LatexName BankZeileD - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString BankZeileD: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style BankZeileE - Margin Static - LatexType Command - LatexName BankZeileE - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString BankZeileE: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - -Style BankZeileF - Margin Static - LatexType Command - LatexName BankZeileF - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString BankZeileF: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Green - EndFont -End - - - -# RetourAdresse -Style RetourAdresse - Margin Static - LatexType Command - LatexName RetourAdresse - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString RetourAdresse: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# MeinZeichen -Style MeinZeichen - Margin Static - LatexType Command - LatexName MeinZeichen - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString MeinZeichen: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - -# IhrZeichen -Style IhrZeichen - Margin Static - LatexType Command - LatexName IhrZeichen - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString IhrZeichen: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# IhrSchreiben -Style IhrSchreiben - Margin Static - LatexType Command - LatexName IhrSchreiben - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString IhrSchreiben: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# Postvermerk -Style Postvermerk - Margin Static - LatexType Command - LatexName Postvermerk - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Postvermerk: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# Adresse -Style Adresse - Margin Static - LatexType Command - LatexName Adresse - LeftMargin xxxxxxxxxx::xx - LabelSep xx - TopSep 1.5 - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Adresse: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# Data style definition -Style Datum - Margin Static - LatexType Command - LatexName Datum - LeftMargin xxxxxxxxxx::xx - LabelSep xx - KeepEmpty 1 - Align Left - AlignPossible Block, Left - LabelType Static - LabelString Datum: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - -# Oggetto style definition -Style Betreff - Margin Static - LatexType Command - LatexName Betreff - LeftMargin xxxxxxxxxx::xx - LabelSep xx - TopSep 1.5 - ParSep 0.4 - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Betreff: - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# Opening style definition -Style Anrede - Margin Static - LatexType Command - LatexName Anrede - KeepEmpty 1 - LeftMargin xxxxxxxxxx::xx - LabelSep xx - TopSep 1.5 - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Anrede: - - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - - -# Anlagen style definition -Style Anlagen - Margin Static - LatexType Command - LatexName Anlagen - KeepEmpty 1 - LeftMargin xxxxxxxxxx::xx - LabelSep xx - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Anlagen: - - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - -# Verteiler style definition -Style Verteiler - Margin Static - LatexType Command - LatexName Verteiler - KeepEmpty 1 - LeftMargin xxxxxxxxxx::xx - LabelSep xx - ParSep 0.4 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Verteiler: - - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont -End - - - - -# Gruss style definition -Style Gruss - Margin Static - LatexType Command - LatexName LyxGruss - LeftMargin xxxxxxxxxx::xx - LabelSep xx - BottomSep 1.5 - ParSep 0.4 - KeepEmpty 1 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString Gruß: - - # label font definition - LabelFont - Series Bold - Shape Italic - Color Blue - EndFont - - #define the environment lyxGruss - Preamble - \newcommand{\LyxGruss}[1] - { \Gruss{#1}{0.5cm} } - EndPreamble - - -End - - - -Input stdfloats.inc -Input stdcounters.inc - - - - - -# Input lyxmacros.inc - -# Remove some unwanted styles. -# NoStyle Right_Address -# NoStyle Address diff --git a/lib/layouts/g-brief2-en.layout b/lib/layouts/g-brief2.layout similarity index 97% rename from lib/layouts/g-brief2-en.layout rename to lib/layouts/g-brief2.layout index c65f7cdbe1..cc6793819c 100644 --- a/lib/layouts/g-brief2-en.layout +++ b/lib/layouts/g-brief2.layout @@ -342,7 +342,7 @@ Style AdressRowF EndFont End -Style TelefonRowA +Style TelephoneRowA Margin Static LatexType Command LatexName TelefonZeileA @@ -353,7 +353,7 @@ Style TelefonRowA Align Block AlignPossible Block, Left LabelType Static - LabelString TelefonRowA: + LabelString TelephoneRowA: # label font definition LabelFont Series Bold @@ -362,7 +362,7 @@ Style TelefonRowA EndFont End -Style TelefonRowB +Style TelephoneRowB Margin Static LatexType Command LatexName TelefonZeileB @@ -372,7 +372,7 @@ Style TelefonRowB Align Block AlignPossible Block, Left LabelType Static - LabelString TelefonRowB: + LabelString TelephoneRowB: # label font definition LabelFont Series Bold @@ -381,7 +381,7 @@ Style TelefonRowB EndFont End -Style TelefonRowC +Style TelephoneRowC Margin Static LatexType Command LatexName TelefonZeileC @@ -391,7 +391,7 @@ Style TelefonRowC Align Block AlignPossible Block, Left LabelType Static - LabelString TelefonRowC: + LabelString TelephoneRowC: # label font definition LabelFont Series Bold @@ -400,7 +400,7 @@ Style TelefonRowC EndFont End -Style TelefonRowD +Style TelephoneRowD Margin Static LatexType Command LatexName TelefonZeileD @@ -410,7 +410,7 @@ Style TelefonRowD Align Block AlignPossible Block, Left LabelType Static - LabelString TelefonRowD: + LabelString TelephoneRowD: # label font definition LabelFont Series Bold @@ -419,7 +419,7 @@ Style TelefonRowD EndFont End -Style TelefonRowE +Style TelephoneRowE Margin Static LatexType Command LatexName TelefonZeileE @@ -429,7 +429,7 @@ Style TelefonRowE Align Block AlignPossible Block, Left LabelType Static - LabelString TelefonRowE: + LabelString TelephoneRowE: # label font definition LabelFont Series Bold @@ -438,7 +438,7 @@ Style TelefonRowE EndFont End -Style TelefonRowF +Style TelephoneRowF Margin Static LatexType Command LatexName TelefonZeileF @@ -448,7 +448,7 @@ Style TelefonRowF Align Block AlignPossible Block, Left LabelType Static - LabelString TelefonRowF: + LabelString TelephoneRowF: # label font definition LabelFont Series Bold @@ -789,11 +789,6 @@ Style PostalComment EndFont End - #the layout above used to be misspelled like that. Keep the old - # name for compatibility -Style PostalCommend - ObsoletedBy PostalComment -End # Adresse Style Address