Bump layout format for the new Display tag used in Comments and Greyedout notes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37381 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index e94a0bfb8a473a6745d3ba6197df1c128a263b13..69f70ec019f00218f9a31055524f27921b73e094 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -14266,6 +14266,98 @@ Conglomerate
 \begin_inset Flex Code
 status collapsed
 
+\begin_layout Plain Layout
+Display
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
+\end_inset
+
+,
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\emph on
+1
+\end_layout
+
+\end_inset
+
+] Only useful if 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+LatexType
+\end_layout
+
+\end_inset
+
+ is 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+Environment
+\end_layout
+
+\end_inset
+
+.
+ Indicates whether the environment will stand on its own in LaTeX output
+ or will appear inline with the surrounding text.
+ If set to false, it is supposed that the LaTeX environment ignores white
+ space (including one newline character) after the 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+begin{
+\emph on
+LatexName
+\emph default
+}
+\end_layout
+
+\end_inset
+
+ and 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+end{
+\emph on
+LatexName
+\emph default
+}
+\end_layout
+
+\end_inset
+
+ tags.
+ Default is true.
+\end_layout
+
+\begin_layout Description
+\begin_inset Flex Code
+status collapsed
+
 \begin_layout Plain Layout
 End
 \end_layout

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 1224644e27840fc56df1d767d185f454c0483d23..39bee4caacf3359392da67731db99ebc6c8c0268 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,7 +4,7 @@
 #
 # Detailled format description is available in the customization manual
 
-Format 31
+Format 32
 
 Provides stdinsets 1
 

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index e27b1da1d6174dfb1dd2a8e80aa088dd1a628cbb..f4b89f5563a96852d8b6d0b37eae94b362eef721 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -110,6 +110,9 @@ import os, re, string, sys
 # Incremented to format 31, 12 January 2011 by rgh
 # Introducted NoCounter tag.
 
+# Incremented to format 32, 30 January 2011 by forenr
+# Added Display tag for InsetLayout
+
 # Do not forget to document format change in Customization
 # Manual (section "Declaring a new text class").
 
@@ -117,7 +120,7 @@ import os, re, string, sys
 # development/tools/updatelayouts.sh script to update all
 # layout files to the new format.
 
-currentFormat = 31
+currentFormat = 32
 
 
 def usage(prog_name):
@@ -291,9 +294,9 @@ def convert(lines):
             while i < len(lines) and not re_EndBabelPreamble.match(lines[i]):
                 i += 1
             continue
-        
+
         # Only new features
-        if format == 29 or format == 30:
+        if format >= 29 and format <= 31:
           i += 1
           continue
 

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 74267644ff50df36723a1743a016f250ef258e74..b90627cbf9ef3391f96b98efeb00628274ca7823 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -60,7 +60,7 @@ namespace lyx {
 // development/updatelayouts.sh script, to update the format of 
 // all of our layout files.
 //
-int const LAYOUT_FORMAT = 31;
+int const LAYOUT_FORMAT = 32;
        
 namespace {