Adapt stdinsets.inc and linguistics.module to the new InsetLayout framework.

There may be some other changes to be made here still, but they should be
fairly painless. What will need checking are InsetFlex's. Those that set
MultiPar to true will now default to ForcePlain false and CustomPars true;
those that set MultiPar to false (or don't set it, since that's the default)
will have CustomPars false and ForcePlain true. If that's wrong, the right
tag can be added, but it must be AFTER the MultiPar tag, since MultiPar will
reset CustomPars and ForcePlain, as described in stdinsets.inc.

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

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 87e542107aad990b8a283d10141180e87c6b09c6..d76ae8f7b0f40ff83d2381d36bb5caf0acf843ff 100644 (file)
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -76,6 +76,8 @@ InsetLayout Custom:Glosse
          Size                Small
        EndFont
        MultiPar              true
+       CustomPars            false
+       ForcePlain            false
        PassThru              true
        FreeSpacing           true
        Requires              covington

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index febb75d466b1c832effee6cb10de5a6d0da8b291..b0f5f1500ef9eb97188838fce7b47ceec255b552 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -35,7 +35,13 @@
 #      EndFont               Nothing to put here, it's just a markup to indicate that we are
 #                         finished with the LabelFont definition.
 #      MultiPar              Indicates that multiple paragraphs are allowed within the inset
-#                         or not. FIXME: what is the default?
+#                         or not. Defaults to false. Sets CustomPars, as well, to the same
+#                         value, and sets ForcePlain to the opposite value. If you want
+#                         those to be different, then, you must set them after you set 
+#                         MultiPar.
+# CustomPars            Whether to allow the use of the Paragraph Settings dialog. Default is
+#                         false.
+# ForcePlain            Whether to force the PlainLayout. Default is true.
 #      Decoration:           Classic, Minimalistic, Conglomerate. Decoration styles
 #      PassThru              Do not do various LaTeX conversions, like the phrases
 #                              LaTeX, LyX, quote commands, etc.
@@ -143,6 +149,8 @@ InsetLayout ERT
          Size                Small
        EndFont
        MultiPar              true
+       CustomPars            false
+       ForcePlain            true
        PassThru              true
        KeepEmpty             true
        FreeSpacing           true
@@ -198,6 +206,8 @@ InsetLayout Index
          Size                Small
        EndFont
        MultiPar              false
+#      CustomPars            false
+#      ForcePlain            true
        NeedProtect           true
 End
 
@@ -271,7 +281,7 @@ InsetLayout OptArg
          Color               collapsable
          Size                Small
        EndFont
-       MultiPar              false
+#      MultiPar              false
 End
 
 InsetLayout Info