anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #2607.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36520 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-26 17:21:17 +00:00
parent e57084c140
commit 7f8b868f4a
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/layouts/scrclass.inc
View File

@ -4,7 +4,8 @@
# Update for Koma Script Release >=2.8q # Update for Koma Script Release >=2.8q
# Juergen Spitzmueller <j.spitzmueller@gmx.de>, 2003/2/08. # Juergen Spitzmueller <j.spitzmueller@gmx.de>, 2003/2/08.
# Mapped List to Labeling # Mapped List to Labeling
# Guenter Milde <g.milde web.de> # Guenter Milde <milde users.berlios.de>, 2009-02-02
# Labeling is now used also in non-KOMA classes
Format 30 Format 30
@ -39,17 +40,12 @@ Style Description
End End
Style Labeling Style Labeling
CopyStyle List
LatexName labeling LatexName labeling
# overwrite the preamble code definition # overwrite the preamble code definition
Preamble Preamble
EndPreamble EndPreamble
End End
Style List
Obsoletedby Labeling
End
Input stdsections.inc Input stdsections.inc
Style Part Style Part

7
lib/layouts/stdlists.inc
View File

@ -85,7 +85,7 @@ Style Description
End End
Style List Style Labeling
Category List Category List
Margin Manual Margin Manual
LatexType List_Environment LatexType List_Environment
@ -126,3 +126,8 @@ Style List
} }
EndHTMLStyle EndHTMLStyle
End End
Style List
Obsoletedby Labeling
End

17
lib/lyx2lyx/lyx_2_0.py
View File

@ -2385,6 +2385,17 @@ def revert_use_xetex(document):
document.header[i] = "\\use_xetex " + val document.header[i] = "\\use_xetex " + val
def revert_labeling(document):
koma = ("scrartcl", "scrarticle-beamer", "scrbook", "scrlettr",
"scrlttr2", "scrreprt")
if document.textclass in koma:
return
i = 0
while True:
i = find_token_exact(document.body, "\\begin_layout Labeling", i)
document.body[i] = "\\begin_layout List"
## ##
# Conversion hub # Conversion hub
# #
@ -2453,10 +2464,12 @@ convert = [[346, []],
[406, [convert_passthru]], [406, [convert_passthru]],
[407, []], [407, []],
[408, []], [408, []],
[409, [convert_use_xetex]] [409, [convert_use_xetex]],
[410, []]
] ]
revert = [[408, [revert_use_xetex]], revert = [[409, [revert_labeling]],
[408, [revert_use_xetex]],
[407, [revert_script]], [407, [revert_script]],
[406, [revert_multirowOffset]], [406, [revert_multirowOffset]],
[405, [revert_passthru]], [405, [revert_passthru]],

2
src/Buffer.cpp
View File

@ -128,7 +128,7 @@ namespace {
// Do not remove the comment below, so we get merge conflict in // Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own. // independent branches. Instead add your own.
int const LYX_FORMAT = 409; // spitz use_xetex -> use_non_tex_fonts int const LYX_FORMAT = 410; // rgh: dummy format for list->labeling
typedef map<string, bool> DepClean; typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache; typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;