mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 22:06:15 +00:00
Forgot to update the layout format when transferring from branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29964 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
6ef03cc4ac
commit
aa2b14afce
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
# Author : Martin vermeer <martin.vermeer@hut.fi>
|
# Author : Martin vermeer <martin.vermeer@hut.fi>
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
|
|
||||||
InsetLayout CharStyle:Noun
|
InsetLayout CharStyle:Noun
|
||||||
LyxType charstyle
|
LyxType charstyle
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
|
# Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
|
||||||
|
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
Columns 1
|
Columns 1
|
||||||
Sides 1
|
Sides 1
|
||||||
SecNumDepth 3
|
SecNumDepth 3
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
# ``standard'' layouts, like article and friends.
|
# ``standard'' layouts, like article and friends.
|
||||||
|
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
Columns 1
|
Columns 1
|
||||||
Sides 1
|
Sides 1
|
||||||
SecNumDepth 2
|
SecNumDepth 2
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
# be comma-separated.
|
# be comma-separated.
|
||||||
#End
|
#End
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
|
|
||||||
Provides stdinsets 1
|
Provides stdinsets 1
|
||||||
|
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
# quotations and such.
|
# quotations and such.
|
||||||
|
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
|
|
||||||
Style Quotation
|
Style Quotation
|
||||||
Category MainText
|
Category MainText
|
||||||
Margin Static
|
Margin Static
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
# This include files contains various standard environments for lists.
|
# This include files contains various standard environments for lists.
|
||||||
|
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
|
|
||||||
Style Itemize
|
Style Itemize
|
||||||
Category List
|
Category List
|
||||||
Margin Static
|
Margin Static
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
# commands that are useful for article-like document classes, but not
|
# commands that are useful for article-like document classes, but not
|
||||||
# for letters.
|
# for letters.
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
|
|
||||||
Style Part
|
Style Part
|
||||||
Category Section
|
Category Section
|
||||||
Margin Dynamic
|
Margin Dynamic
|
||||||
|
@ -8,7 +8,8 @@
|
|||||||
# a document, like title, author and such.
|
# a document, like title, author and such.
|
||||||
|
|
||||||
|
|
||||||
Format 11
|
Format 16
|
||||||
|
|
||||||
Style Title
|
Style Title
|
||||||
Margin Static
|
Margin Static
|
||||||
LatexType Command
|
LatexType Command
|
||||||
|
@ -55,7 +55,7 @@ import os, re, string, sys
|
|||||||
# Do not forget to document format change in Customization
|
# Do not forget to document format change in Customization
|
||||||
# Manual (section "Declaring a new text class").
|
# Manual (section "Declaring a new text class").
|
||||||
|
|
||||||
currentFormat = 15
|
currentFormat = 16
|
||||||
|
|
||||||
|
|
||||||
def usage(prog_name):
|
def usage(prog_name):
|
||||||
@ -232,7 +232,7 @@ def convert(lines):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
# This just involved new features, not any changes to old ones
|
# This just involved new features, not any changes to old ones
|
||||||
if format == 14:
|
if format == 14 or format == 15:
|
||||||
i += 1
|
i += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Keep the changes documented in the Customization manual.
|
// Keep the changes documented in the Customization manual.
|
||||||
int const FORMAT = 15;
|
int const FORMAT = 16;
|
||||||
|
|
||||||
|
|
||||||
bool layout2layout(FileName const & filename, FileName const & tempfile)
|
bool layout2layout(FileName const & filename, FileName const & tempfile)
|
||||||
|
Loading…
Reference in New Issue
Block a user