From aa2b14afce0c64cc3f20f575f194415ab7953a41 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 5 Jun 2009 19:05:48 +0000 Subject: [PATCH] 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 --- lib/layouts/logicalmkup.module | 2 +- lib/layouts/paper.layout | 2 +- lib/layouts/stdclass.inc | 2 +- lib/layouts/stdinsets.inc | 2 +- lib/layouts/stdlayouts.inc | 3 ++- lib/layouts/stdlists.inc | 3 ++- lib/layouts/stdsections.inc | 3 ++- lib/layouts/stdtitle.inc | 3 ++- lib/scripts/layout2layout.py | 4 ++-- src/TextClass.cpp | 2 +- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module index fa8032c802..4836091001 100644 --- a/lib/layouts/logicalmkup.module +++ b/lib/layouts/logicalmkup.module @@ -5,7 +5,7 @@ # Author : Martin vermeer -Format 11 +Format 16 InsetLayout CharStyle:Noun LyxType charstyle diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index cd3203c10a..bd0dc03dfb 100644 --- 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 afd863f98a..7debe974d5 100644 --- 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 d916a326a9..a1d7c7e097 100644 --- 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 d4b099c526..27dcf19fab 100644 --- 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 d4beb4ae9f..d50ee4f111 100644 --- 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 f3cbc605f1..59dba1c46b 100644 --- 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 6b7b65f288..d3593bea98 100644 --- 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 53fa54f9e3..dc4bbf0728 100644 --- 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 53634ca9af..75ff1d3482 100644 --- 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) -- 2.39.5