X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Flinguistics.module;h=ce9d6a4311e80f1b821991f0e06912fd9c94d5a6;hb=4beba4e8f87ca218473448caf10563b99faf7b21;hp=d76ae8f7b0f40ff83d2381d36bb5caf0acf843ff;hpb=ee4db4a133ee5b5ac1654137631ff6c5cfe7a951;p=lyx.git

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index d76ae8f7b0..ce9d6a4311 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -7,14 +7,14 @@
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 8
+Format 45
 
 # single numbered example with covington.sty
 Style Numbered_Example_(multiline)
 	LatexType             Environment
 	LatexName             example
 	NextNoIndent          1
-	LeftMargin            XExample:
+	Margin                Dynamic
 	LabelSep              xx
 	ParSkip               0.0
 	ItemSep               0.2
@@ -30,14 +30,13 @@ Style Numbered_Example_(multiline)
 		Color         Blue
 	EndFont
 	Requires	      covington
+	Category              Linguistics
 End
 
 
 # multiple numbered examples with covington.sty
 Style Numbered_Examples_(consecutive)
 	CopyStyle	      Numbered_Example_(multiline)
-	Margin                Static
-	LeftMargin            XExamples:
 	LatexType             Item_Environment
 	LatexName             examples
 	LabelString           "Examples:"
@@ -47,10 +46,8 @@ End
 # multiple numbered example with covington.sty
 Style Subexample
 	CopyStyle	      Numbered_Example_(multiline)
-	Margin                Static
 	LatexType             Item_Environment
 	LatexName             subexample
-	LeftMargin            XSubexample:
 	LabelString           "Subexample:"
 	Requires	      covington,enumitem
 	Preamble
@@ -66,7 +63,7 @@ End
 
 # glosse (2 lines) with covington.sty
 # mandatory translation must be entered verbatim!
-InsetLayout Custom:Glosse
+InsetLayout Flex:Glosse
 	LyXType               custom
 	LabelString           Glosse
 	LatexType             environment
@@ -77,9 +74,11 @@ InsetLayout Custom:Glosse
 	EndFont
 	MultiPar              true
 	CustomPars            false
-	ForcePlain            false
+	ForcePlain            true
 	PassThru              true
+	ParbreakIsNewline     true
 	FreeSpacing           true
+	ForceLTR              true
 	Requires	      covington
 	Preamble
 		\@ifundefined{linggloss}{%
@@ -87,12 +86,13 @@ InsetLayout Custom:Glosse
 			\gll #1}
 		{\glend}}{}
 	EndPreamble
+	InToc                 true
 End
 
 
 # glosse (3 lines) with covington.sty
 # mandatory translation must be entered verbatim!
-InsetLayout Custom:Tri-Glosse
+InsetLayout Flex:Tri-Glosse
 	LyXType               custom
 	LabelString           Tri-Glosse
 	LatexType             environment
@@ -102,8 +102,13 @@ InsetLayout Custom:Tri-Glosse
 	  Size                Small
 	EndFont
 	MultiPar              true
+	CustomPars            false
+	ForcePlain            true
 	PassThru              true
+	ParbreakIsNewline     true
 	FreeSpacing           true
+	ForceLTR              true
+	InToc                 true
 	Requires	      covington
 	Preamble
 		\@ifundefined{lingglosss}{%
@@ -115,7 +120,7 @@ End
 
 
 # Some semantik markup for Semantics
-InsetLayout CharStyle:Expression
+InsetLayout Flex:Expression
 	LyxType               charstyle
 	LabelString           expr.
 	LatexType             command
@@ -126,10 +131,11 @@ InsetLayout CharStyle:Expression
 	Preamble
 		\newcommand{\lingexpr}[1]{\emph{#1}}
 	EndPreamble
+	InToc                 true
 End
 
 
-InsetLayout CharStyle:Concepts
+InsetLayout Flex:Concepts
 	LyxType               charstyle
 	LabelString           concept
 	LatexType             command
@@ -140,18 +146,20 @@ InsetLayout CharStyle:Concepts
 	Preamble
 		\newcommand{\lingconcept}[1]{\textsc{#1}}
 	EndPreamble
+	InToc                 true
 End
 
 
-InsetLayout CharStyle:Meaning
+InsetLayout Flex:Meaning
 	LyxType               charstyle
 	LabelString           meaning
 	LatexType             command
 	LatexName             lingmeaning
-	Requires	      csquotes
+	Requires              csquotes
 	Preamble
 		\newcommand{\lingmeaning}[1]{\enquote*{#1}}
 	EndPreamble
+	InToc                 true
 End
 
 
@@ -164,14 +172,7 @@ Float
 	NumberWithin          none
 	Style                 plain
 	ListName              "List of Tableaux"
-	LaTeXBuiltin          false
+	IsPredefined          false
+	UsesFloatPkg          true
 End
 
-InsetLayout tableau
-	LabelString           Tableau
-	LabelFont
-	  Color               collapsable
-	  Size                Small
-	EndFont
-	MultiPar              true
-End