From b12b9a56773e4f5c35c6bb17d3e710240f8090ae Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Sun, 17 Jul 2005 00:51:31 +0000 Subject: [PATCH] fix left margins of labelstrings git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10264 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 4 ++ lib/layouts/IEEEtran.layout | 3 +- lib/layouts/dinbrief.layout | 18 +++---- lib/layouts/g-brief-de.layout | 2 +- lib/layouts/g-brief-en.layout | 2 +- lib/layouts/g-brief2.layout | 92 +++++++++++++++++------------------ lib/layouts/slides.layout | 15 +++--- lib/layouts/stdletter.inc | 13 ++--- 8 files changed, 78 insertions(+), 71 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 565e9c34d5..89893d5edf 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-07-17 Michael Schmitt + + * layouts/*.layout: fix left margins in various text classes + 2005-07-16 Lars Gullik Bjønnes * syntax.default: file moved here from reLyX dir diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 2a987f3e39..ba2337137d 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -329,7 +329,6 @@ Style Abstract LeftMargin "" RightMargin "" # ParIndent MM - LabelSep M LabelType Static LabelString "Abstract---" # LabelBottomSep 0.0 @@ -356,7 +355,7 @@ Style Keywords Align Left AlignPossible Block, Left, Right, Center LabelType Static - LabelString "Keywords---" + LabelString "Index Terms---" TextFont Shape Up Size Small diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index 50375978db..75a4eb3eb9 100644 --- a/lib/layouts/dinbrief.layout +++ b/lib/layouts/dinbrief.layout @@ -11,7 +11,7 @@ Input letter.layout Style My_Address Margin Static - LeftMargin Unterschr + LeftMargin Unterschrift: LabelType Static LabelString "Briefkopf:" LabelSep x @@ -28,7 +28,7 @@ End Style Send_To_Address Margin Static BottomSep 0.1 - LeftMargin Unterschr + LeftMargin Unterschrift: LabelType Static LabelString "Adresse:" LabelSep x @@ -43,7 +43,7 @@ End Style Opening - LeftMargin Unterschr + LeftMargin Unterschrift: LabelString "Anrede:" LabelSep x LabelFont @@ -56,7 +56,7 @@ End Style Signature - LeftMargin Unterschr + LeftMargin Unterschrift: LabelString "Unterschrift:" LabelSep x LabelFont @@ -69,7 +69,7 @@ End Style Closing - LeftMargin Unterschr + LeftMargin Unterschrift: LabelString "Gruss:" LabelSep x LabelFont @@ -83,7 +83,7 @@ End Style encl LabelString "Anlagen:" - LeftMargin Unterschr + LeftMargin Unterschrift: LabelSep x LabelFont Series Medium @@ -98,7 +98,7 @@ Style ps Margin Static LatexType Command LatexName ps - LeftMargin Unterschr + LeftMargin Unterschrift: LabelSep x TopSep 0.4 BottomSep 0.4 @@ -118,7 +118,7 @@ End Style cc LabelString "Verteiler:" - LeftMargin Unterschr + LeftMargin Unterschrift: LabelSep x LabelFont Series Medium @@ -133,7 +133,7 @@ Style Betreff Margin Static LatexType Command LatexName subject - LeftMargin Unterschr + LeftMargin Unterschrift: LabelSep x KeepEmpty 1 TopSep 0.4 diff --git a/lib/layouts/g-brief-de.layout b/lib/layouts/g-brief-de.layout index 16fc9d2489..d5aeec1748 100644 --- a/lib/layouts/g-brief-de.layout +++ b/lib/layouts/g-brief-de.layout @@ -34,7 +34,7 @@ Style Name Margin Static LatexType Command LatexName Name - LeftMargin xxxxxxxxxx::xx + LeftMargin RetourAdresse:xx LabelSep xx KeepEmpty 1 Align Block diff --git a/lib/layouts/g-brief-en.layout b/lib/layouts/g-brief-en.layout index da8c204c37..3e247e9b5e 100644 --- a/lib/layouts/g-brief-en.layout +++ b/lib/layouts/g-brief-en.layout @@ -34,7 +34,7 @@ Style Name Margin Static LatexType Command LatexName Name - LeftMargin xxxxxxxxxx::xx + LeftMargin PostalComment:xx LabelSep xx KeepEmpty 1 Align Block diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout index 08a60da6de..5e8262434b 100644 --- a/lib/layouts/g-brief2.layout +++ b/lib/layouts/g-brief2.layout @@ -1,4 +1,4 @@ -#% Do not delete he line below; configure depends on this +#% Do not delete the line below; configure depends on this # \DeclareLaTeXClass[g-brief2]{letter (g-brief2)} # Letter textclass definition file. @@ -56,7 +56,7 @@ Style Name Margin Static LatexType Command LatexName Name - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -76,7 +76,7 @@ Style NameRowA Margin Static LatexType Command LatexName NameZeileA - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx TopSep 1.5 KeepEmpty 1 @@ -96,7 +96,7 @@ Style NameRowB Margin Static LatexType Command LatexName NameZeileB - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -115,7 +115,7 @@ Style NameRowC Margin Static LatexType Command LatexName NameZeileC - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -134,7 +134,7 @@ Style NameRowD Margin Static LatexType Command LatexName NameZeileD - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -153,7 +153,7 @@ Style NameRowE Margin Static LatexType Command LatexName NameZeileE - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -172,7 +172,7 @@ Style NameRowF Margin Static LatexType Command LatexName NameZeileF - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -191,7 +191,7 @@ Style NameRowG Margin Static LatexType Command LatexName NameZeileG - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -212,7 +212,7 @@ Style Signature Margin Static LatexType Command LatexName Unterschrift - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -231,7 +231,7 @@ Style AddressRowA Margin Static LatexType Command LatexName AdressZeileA - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx TopSep 1.5 LabelSep xx KeepEmpty 1 @@ -251,7 +251,7 @@ Style AddressRowB Margin Static LatexType Command LatexName AdressZeileB - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -270,7 +270,7 @@ Style AddressRowC Margin Static LatexType Command LatexName AdressZeileC - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -289,7 +289,7 @@ Style AddressRowD Margin Static LatexType Command LatexName AdressZeileD - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -308,7 +308,7 @@ Style AddressRowE Margin Static LatexType Command LatexName AdressZeileE - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -327,7 +327,7 @@ Style AddressRowF Margin Static LatexType Command LatexName AdressZeileF - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -346,7 +346,7 @@ Style TelephoneRowA Margin Static LatexType Command LatexName TelefonZeileA - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx TopSep 1.5 LabelSep xx KeepEmpty 1 @@ -366,7 +366,7 @@ Style TelephoneRowB Margin Static LatexType Command LatexName TelefonZeileB - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -385,7 +385,7 @@ Style TelephoneRowC Margin Static LatexType Command LatexName TelefonZeileC - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -404,7 +404,7 @@ Style TelephoneRowD Margin Static LatexType Command LatexName TelefonZeileD - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -423,7 +423,7 @@ Style TelephoneRowE Margin Static LatexType Command LatexName TelefonZeileE - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -442,7 +442,7 @@ Style TelephoneRowF Margin Static LatexType Command LatexName TelefonZeileF - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -461,7 +461,7 @@ Style InternetRowA Margin Static LatexType Command LatexName InternetZeileA - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx TopSep 1.5 LabelSep xx KeepEmpty 1 @@ -481,7 +481,7 @@ Style InternetRowB Margin Static LatexType Command LatexName InternetZeileB - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -500,7 +500,7 @@ Style InternetRowC Margin Static LatexType Command LatexName InternetZeileC - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -519,7 +519,7 @@ Style InternetRowD Margin Static LatexType Command LatexName InternetZeileD - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -538,7 +538,7 @@ Style InternetRowE Margin Static LatexType Command LatexName InternetZeileE - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -557,7 +557,7 @@ Style InternetRowF Margin Static LatexType Command LatexName InternetZeileF - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -576,7 +576,7 @@ Style BankRowA Margin Static LatexType Command LatexName BankZeileA - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx TopSep 1.5 LabelSep xx KeepEmpty 1 @@ -596,7 +596,7 @@ Style BankRowB Margin Static LatexType Command LatexName BankZeileB - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -615,7 +615,7 @@ Style BankRowC Margin Static LatexType Command LatexName BankZeileC - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -634,7 +634,7 @@ Style BankRowD Margin Static LatexType Command LatexName BankZeileD - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -653,7 +653,7 @@ Style BankRowE Margin Static LatexType Command LatexName BankZeileE - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -672,7 +672,7 @@ Style BankRowF Margin Static LatexType Command LatexName BankZeileF - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -694,7 +694,7 @@ Style ReturnAddress Margin Static LatexType Command LatexName RetourAdresse - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -715,7 +715,7 @@ Style MyRef Margin Static LatexType Command LatexName MeinZeichen - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -735,7 +735,7 @@ Style YourRef Margin Static LatexType Command LatexName IhrZeichen - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 KeepEmpty 1 @@ -757,7 +757,7 @@ Style YourMail Margin Static LatexType Command LatexName IhrSchreiben - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -778,7 +778,7 @@ Style PostalComment Margin Static LatexType Command LatexName Postvermerk - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Block @@ -799,7 +799,7 @@ Style Address Margin Static LatexType Command LatexName Adresse - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx TopSep 1.5 KeepEmpty 1 @@ -821,7 +821,7 @@ Style Date Margin Static LatexType Command LatexName Datum - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx KeepEmpty 1 Align Left @@ -841,7 +841,7 @@ Style Reference Margin Static LatexType Command LatexName Betreff - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx TopSep 1.5 ParSep 0.4 @@ -865,7 +865,7 @@ Style Opening LatexType Command LatexName Anrede KeepEmpty 1 - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx TopSep 1.5 ParSep 0.4 @@ -890,7 +890,7 @@ Style Encl. LatexType Command LatexName Anlagen KeepEmpty 1 - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx ParSep 0.4 Align Block @@ -913,7 +913,7 @@ Style cc LatexType Command LatexName Verteiler KeepEmpty 1 - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx ParSep 0.4 Align Block @@ -934,7 +934,7 @@ Style Closing Margin Static LatexType Command LatexName LyxGruss - LeftMargin xxxxxxxxxx::xx + LeftMargin TelephoneRowA:xx LabelSep xx BottomSep 1.5 ParSep 0.4 diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout index 3a5e7b9e26..121d43a0d3 100644 --- a/lib/layouts/slides.layout +++ b/lib/layouts/slides.layout @@ -98,8 +98,9 @@ Style Slide AlignPossible Left LabelType Static LabelBottomSep 0.5 - LeftMargin MMMMxMMMMxxxNewSlide - LabelString "_____________________________NewSlide: " + LabelSep xx + LeftMargin "New Slide:xx" + LabelString "New Slide:" Font Family Typewriter Series Bold @@ -135,8 +136,9 @@ Style Overlay AlignPossible Left LabelType Static LabelBottomSep 0.5 - LeftMargin MMMMxNewOverlay - LabelString "- - - - - - - - - - NewOverlay: " + LabelSep xx + LeftMargin "New Overlay:xx" + LabelString "New Overlay:" Font Family Typewriter Series Bold @@ -175,8 +177,9 @@ Style Note AlignPossible Left LabelType Static LabelBottomSep 0.5 - LeftMargin MMMMxMMxxNewNote - LabelString "........................NewNote: " + LabelSep xx + LeftMargin "New Note:xx" + LabelString "New Note:" Font Family Typewriter Series Bold diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc index 7511f4f169..7646d35095 100644 --- a/lib/layouts/stdletter.inc +++ b/lib/layouts/stdletter.inc @@ -51,7 +51,7 @@ Style Opening LatexType Command LatexName opening KeepEmpty 1 - LeftMargin Signature::xx + LeftMargin Signature:xx LabelSep xx TopSep 0.4 BottomSep 0.4 @@ -72,7 +72,7 @@ Style Signature Margin Static LatexType Command LatexName signature - LeftMargin Signature::xx + LeftMargin Signature:xx LabelSep xx TopSep 0.4 BottomSep 0.4 @@ -92,7 +92,7 @@ End Style Closing CopyStyle Signature LatexName closing - LeftMargin Signature::xx + LeftMargin Signature:xx LabelString "Closing:" End @@ -109,6 +109,7 @@ Style cc Align Block AlignPossible Block, Left LabelType Static + LeftMargin Signature:xx LabelString "cc:" End @@ -116,7 +117,7 @@ End Style encl CopyStyle cc LatexName encl - LeftMargin encl:xx + LeftMargin Signature:xx LabelString "encl:" Spacing Other 1.5 End @@ -125,7 +126,7 @@ End Style Location CopyStyle encl LatexName location - LeftMargin Location:xx + LeftMargin Signature:xx LabelString "Location:" End @@ -133,7 +134,7 @@ End Style Telephone CopyStyle encl LatexName telephone - LeftMargin Telephone:xx + LeftMargin Signature:xx LabelString "Telephone:" End -- 2.39.2