mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
* Fix bug #2144: Merge the two identical classes g-brief-de and g-brief-en into one class g-brief.
The German layouts are replaced by the English ones. German localization is now done as it is supposed to be: via gettext. A file format change was needed to do this. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32406 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller
parent
e0959b74e8
commit
123a589bf8
@ -1,6 +1,12 @@
|
||||
LyX file-format changes
|
||||
-----------------------
|
||||
|
||||
2009-12-07 Jürgen Spitzmüller <spitz@lyx.org>
|
||||
* Format incremented to 373: merge g-brief-de and g-brief-en
|
||||
classes into one g-brief class.
|
||||
All German layout names are replaced by English ones, the
|
||||
two classes are renamed to g-brief.
|
||||
|
||||
2009-11-29 Jürgen Spitzmüller <spitz@lyx.org>
|
||||
* Format incremented to 372: new buffer param fontencoding.
|
||||
This param holds a buffer-specific fontencoding (argument
|
||||
|
||||
@ -2699,8 +2699,7 @@ lib_layouts_files = Split('''
|
||||
extletter.layout
|
||||
extreport.layout
|
||||
foils.layout
|
||||
g-brief-de.layout
|
||||
g-brief-en.layout
|
||||
g-brief.layout
|
||||
g-brief2.layout
|
||||
heb-article.layout
|
||||
heb-letter.layout
|
||||
|
||||
@ -1056,8 +1056,7 @@ dist_layouts_DATA =\
|
||||
layouts/figs-within-sections.module \
|
||||
layouts/foils.layout \
|
||||
layouts/foottoend.module \
|
||||
layouts/g-brief-de.layout \
|
||||
layouts/g-brief-en.layout \
|
||||
layouts/g-brief.layout \
|
||||
layouts/g-brief2.layout \
|
||||
layouts/hanging.module \
|
||||
layouts/heb-article.layout \
|
||||
|
||||
@ -1,240 +0,0 @@
|
||||
#% Do not delete he line below; configure depends on this
|
||||
# \DeclareLaTeXClass[g-brief]{letter (g-brief, German)}
|
||||
# Letter textclass definition file.
|
||||
# Author : Thomas Hartkens <thomas@hartkens.de>
|
||||
|
||||
Format 19
|
||||
Input stdinsets.inc
|
||||
Input stdfloats.inc
|
||||
Input stdcounters.inc
|
||||
|
||||
Columns 1
|
||||
Sides 1
|
||||
PageStyle Empty
|
||||
DefaultStyle Brieftext
|
||||
|
||||
|
||||
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 "Letter:"
|
||||
LabelFont
|
||||
Series Bold
|
||||
Shape Italic
|
||||
Color Blue
|
||||
EndFont
|
||||
End
|
||||
|
||||
|
||||
Style Name
|
||||
Margin Static
|
||||
LatexType Command
|
||||
LatexName Name
|
||||
LeftMargin RetourAdresse:xx
|
||||
LabelSep xx
|
||||
KeepEmpty 1
|
||||
Align Block
|
||||
AlignPossible Block, Left
|
||||
LabelType Static
|
||||
LabelString "Name:"
|
||||
LabelFont
|
||||
Series Bold
|
||||
Shape Italic
|
||||
Color Blue
|
||||
EndFont
|
||||
End
|
||||
|
||||
|
||||
Style Unterschrift
|
||||
CopyStyle Name
|
||||
LatexName Unterschrift
|
||||
LabelString "Signature:"
|
||||
End
|
||||
|
||||
|
||||
Style Strasse
|
||||
CopyStyle Name
|
||||
LatexName Strasse
|
||||
LabelString "Street:"
|
||||
End
|
||||
|
||||
|
||||
Style Zusatz
|
||||
CopyStyle Name
|
||||
LatexName Zusatz
|
||||
LabelString "Addition:"
|
||||
End
|
||||
|
||||
|
||||
Style Ort
|
||||
CopyStyle Name
|
||||
LatexName Ort
|
||||
LabelString "Town:"
|
||||
End
|
||||
|
||||
|
||||
Style Land
|
||||
CopyStyle Name
|
||||
LatexName Land
|
||||
LabelString "State:"
|
||||
End
|
||||
|
||||
|
||||
Style RetourAdresse
|
||||
CopyStyle Name
|
||||
LatexName RetourAdresse
|
||||
LabelString "ReturnAddress:"
|
||||
End
|
||||
|
||||
|
||||
Style MeinZeichen
|
||||
CopyStyle Name
|
||||
LatexName MeinZeichen
|
||||
LabelString "MyRef:"
|
||||
End
|
||||
|
||||
|
||||
Style IhrZeichen
|
||||
CopyStyle Name
|
||||
LatexName IhrZeichen
|
||||
LabelString "YourRef:"
|
||||
End
|
||||
|
||||
|
||||
Style IhrSchreiben
|
||||
CopyStyle Name
|
||||
LatexName IhrSchreiben
|
||||
LabelString "YourMail:"
|
||||
End
|
||||
|
||||
|
||||
Style Telefon
|
||||
CopyStyle Name
|
||||
LatexName Telefon
|
||||
LabelString "Phone:"
|
||||
End
|
||||
|
||||
|
||||
Style Telefax
|
||||
CopyStyle Name
|
||||
LatexName Telefax
|
||||
LabelString "Telefax:"
|
||||
End
|
||||
|
||||
|
||||
Style Telex
|
||||
CopyStyle Name
|
||||
LatexName Telex
|
||||
LabelString "Telex:"
|
||||
End
|
||||
|
||||
|
||||
Style EMail
|
||||
CopyStyle Name
|
||||
LatexName EMail
|
||||
LabelString "EMail:"
|
||||
End
|
||||
|
||||
|
||||
Style HTTP
|
||||
CopyStyle Name
|
||||
LatexName HTTP
|
||||
LabelString "HTTP:"
|
||||
End
|
||||
|
||||
|
||||
Style Bank
|
||||
CopyStyle Name
|
||||
LatexName Bank
|
||||
LabelString "Bank:"
|
||||
End
|
||||
|
||||
|
||||
Style BLZ
|
||||
CopyStyle Name
|
||||
LatexName BLZ
|
||||
LabelString "BankCode:"
|
||||
End
|
||||
|
||||
|
||||
Style Konto
|
||||
CopyStyle Name
|
||||
LatexName Konto
|
||||
LabelString "BankAccount:"
|
||||
End
|
||||
|
||||
|
||||
Style Postvermerk
|
||||
CopyStyle Name
|
||||
LatexName Postvermerk
|
||||
LabelString "PostalComment:"
|
||||
End
|
||||
|
||||
|
||||
Style Adresse
|
||||
CopyStyle Name
|
||||
LatexName Adresse
|
||||
TopSep 1.5
|
||||
KeepEmpty 1
|
||||
LabelString "Address:"
|
||||
End
|
||||
|
||||
|
||||
Style Datum
|
||||
CopyStyle Name
|
||||
LatexName Datum
|
||||
LabelString "Date:"
|
||||
End
|
||||
|
||||
|
||||
Style Betreff
|
||||
CopyStyle Name
|
||||
LatexName Betreff
|
||||
TopSep 1.5
|
||||
ParSep 0.4
|
||||
LabelString "Reference:"
|
||||
End
|
||||
|
||||
|
||||
Style Anrede
|
||||
CopyStyle Name
|
||||
LatexName Anrede
|
||||
TopSep 1.5
|
||||
ParSep 0.4
|
||||
LabelString "Opening:"
|
||||
End
|
||||
|
||||
|
||||
Style Anlagen
|
||||
CopyStyle Name
|
||||
LatexName Anlagen
|
||||
ParSep 0.4
|
||||
LabelString "Encl.:"
|
||||
End
|
||||
|
||||
|
||||
Style Verteiler
|
||||
CopyStyle Name
|
||||
LatexName Verteiler
|
||||
KeepEmpty 1
|
||||
ParSep 0.4
|
||||
LabelString "cc:"
|
||||
End
|
||||
|
||||
|
||||
Style Gruss
|
||||
CopyStyle Name
|
||||
LatexName LyxGruss
|
||||
BottomSep 1.5
|
||||
ParSep 0.4
|
||||
LabelString "Closing:"
|
||||
Preamble
|
||||
\newcommand{\LyxGruss}[1]{\Gruss{#1}{0.5cm}}
|
||||
EndPreamble
|
||||
End
|
||||
@ -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-brief]{letter (g-brief)}
|
||||
# Letter textclass definition file.
|
||||
# Author : Thomas Hartkens <thomas@hartkens.de>
|
||||
@ -36,7 +36,7 @@ Style Name
|
||||
Margin Static
|
||||
LatexType Command
|
||||
LatexName Name
|
||||
LeftMargin PostalComment:xx
|
||||
LeftMargin Rucksende-Adresse:xx
|
||||
LabelSep xx
|
||||
KeepEmpty 1
|
||||
Align Block
|
||||
@ -1078,6 +1078,59 @@ def revert_fontenc(document):
|
||||
del document.header[i]
|
||||
|
||||
|
||||
def merge_gbrief(document):
|
||||
" Merge g-brief-en and g-brief-de to one class "
|
||||
|
||||
if document.textclass != "g-brief-de":
|
||||
if document.textclass == "g-brief-en":
|
||||
document.textclass = "g-brief"
|
||||
document.set_textclass()
|
||||
return
|
||||
|
||||
obsoletedby = { "Brieftext": "Letter",
|
||||
"Unterschrift": "Signature",
|
||||
"Strasse": "Street",
|
||||
"Zusatz": "Addition",
|
||||
"Ort": "Town",
|
||||
"Land": "State",
|
||||
"RetourAdresse": "ReturnAddress",
|
||||
"MeinZeichen": "MyRef",
|
||||
"IhrZeichen": "YourRef",
|
||||
"IhrSchreiben": "YourMail",
|
||||
"Telefon": "Phone",
|
||||
"BLZ": "BankCode",
|
||||
"Konto": "BankAccount",
|
||||
"Postvermerk": "PostalComment",
|
||||
"Adresse": "Address",
|
||||
"Datum": "Date",
|
||||
"Betreff": "Reference",
|
||||
"Anrede": "Opening",
|
||||
"Anlagen": "Encl.",
|
||||
"Verteiler": "cc",
|
||||
"Gruss": "Closing"}
|
||||
i = 0
|
||||
while 1:
|
||||
i = find_token(document.body, "\\begin_layout", i)
|
||||
if i == -1:
|
||||
break
|
||||
|
||||
layout = document.body[i][14:]
|
||||
if layout in obsoletedby:
|
||||
document.body[i] = "\\begin_layout " + obsoletedby[layout]
|
||||
|
||||
i += 1
|
||||
|
||||
document.textclass = "g-brief"
|
||||
document.set_textclass()
|
||||
|
||||
|
||||
def revert_gbrief(document):
|
||||
" Revert g-brief to g-brief-en "
|
||||
if document.textclass == "g-brief":
|
||||
document.textclass = "g-brief-en"
|
||||
document.set_textclass()
|
||||
|
||||
|
||||
##
|
||||
# Conversion hub
|
||||
#
|
||||
@ -1109,10 +1162,12 @@ convert = [[346, []],
|
||||
[369, [convert_author_id]],
|
||||
[370, []],
|
||||
[371, []],
|
||||
[372, []]
|
||||
[372, []],
|
||||
[373, [merge_gbrief]]
|
||||
]
|
||||
|
||||
revert = [[371, [revert_fontenc]],
|
||||
revert = [[372, [revert_gbrief]],
|
||||
[371, [revert_fontenc]],
|
||||
[370, [revert_mhchem]],
|
||||
[369, [revert_suppress_date]],
|
||||
[368, [revert_author_id]],
|
||||
|
||||
@ -127,7 +127,7 @@ namespace {
|
||||
|
||||
// Do not remove the comment below, so we get merge conflict in
|
||||
// independent branches. Instead add your own.
|
||||
int const LYX_FORMAT = 372; // jspitzm: buffer param fontenc
|
||||
int const LYX_FORMAT = 373; // jspitzm: merge g-brief class
|
||||
|
||||
typedef map<string, bool> DepClean;
|
||||
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user