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

diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index fa8032c80264d6000c81401dec10661e9ab9c8cc..483609100108f548590d163de3d0f8ab9c6670c5 100644 (file)
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -5,7 +5,7 @@
 
 # Author : Martin vermeer <martin.vermeer@hut.fi>
 
-Format 11
+Format 16
 
 InsetLayout CharStyle:Noun
        LyxType               charstyle

diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index cd3203c10a2d513240dd281d5d56d73e27a98be7..bd0dc03dfbff9f14552542669e9970221d408c99 100644 (file)
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -4,7 +4,7 @@
 # Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
 
 
-Format 11
+Format 16
 Columns                 1
 Sides                   1
 SecNumDepth             3

diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc
index afd863f98aea3ebbca586c2f628aed2fa7412fc9..7debe974d5e3fba153ed03f5d7737586ec339756 100644 (file)
--- a/lib/layouts/stdclass.inc
+++ b/lib/layouts/stdclass.inc
@@ -7,7 +7,7 @@
 # ``standard'' layouts, like article and friends.
 
 
-Format 11
+Format 16
 Columns                 1
 Sides                   1
 SecNumDepth             2

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index d916a326a9cb2d25916b2bc21cb67a1957db4c59..a1d7c7e097f9292df17adf89c563e5c4f1fcace7 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -53,7 +53,7 @@
 #                         be comma-separated.
 #End
 
-Format 11
+Format 16
 
 Provides stdinsets 1
 

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index d4b099c526a909d8820b2447ce9ddd27ceaafd5d..27dcf19fab079565370ebf066b95230ae1c114c6 100644 (file)
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -7,7 +7,8 @@
 # quotations and such.
 
 
-Format 11
+Format 16
+
 Style Quotation
        Category              MainText
        Margin                Static

diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc
index d4beb4ae9f93784d7e6c424b9f1ecfcbb4653e20..d50ee4f1111f681394f475a1e4e0b823822ff409 100644 (file)
--- a/lib/layouts/stdlists.inc
+++ b/lib/layouts/stdlists.inc
@@ -7,7 +7,8 @@
 # This include files contains various standard environments for lists.
 
 
-Format 11
+Format 16
+
 Style Itemize
        Category              List
        Margin                Static

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index f3cbc605f134ad2fea0eb87c33bad025b8bb7eb5..59dba1c46bc8ec9f4597107ab8e558c58ecfb491 100644 (file)
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -7,7 +7,8 @@
 # commands that are useful for article-like document classes, but not
 # for letters.
 
-Format 11
+Format 16
+
 Style Part
        Category              Section
        Margin                Dynamic

diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc
index 6b7b65f288c941567b0530e55d46c0d229d85bba..d3593bea98ded23756b7f41eb00f17f60c4231f9 100644 (file)
--- a/lib/layouts/stdtitle.inc
+++ b/lib/layouts/stdtitle.inc
@@ -8,7 +8,8 @@
 # a document, like title, author and such.
 
 
-Format 11
+Format 16
+
 Style Title
        Margin                Static
        LatexType             Command

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 53fa54f9e3a89b8afa77b5019ba60d1fcc436077..dc4bbf0728f457ff31e39451fd6ff2e19ebdd8d5 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -55,7 +55,7 @@ import os, re, string, sys
 # Do not forget to document format change in Customization
 # Manual (section "Declaring a new text class").
 
-currentFormat = 15
+currentFormat = 16
 
 
 def usage(prog_name):
@@ -232,7 +232,7 @@ def convert(lines):
             continue
 
         # This just involved new features, not any changes to old ones
-        if format == 14:
+        if format == 14 or format == 15:
           i += 1
           continue
 

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 53634ca9af33cb542b98e633a98e317d0587cd79..75ff1d348262f1801cfeb7b775904b24f10d1b25 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -62,7 +62,7 @@ private:
 };
 
 // Keep the changes documented in the Customization manual. 
-int const FORMAT = 15;
+int const FORMAT = 16;
 
 
 bool layout2layout(FileName const & filename, FileName const & tempfile)