X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flayouts%2Flinguistics.module;h=efe0b66ac06e48316422e078bd03b16e5fdcd416;hb=a88e6e1ea5861f8275adbe4c962c2629fb482613;hp=2410a4aeaedb12993c789acbcd603254f8b7ce20;hpb=36967c8887000dedf2242b79a61d7dd7accade73;p=lyx.git

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 2410a4aeae..efe0b66ac0 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -2,18 +2,19 @@
 #DescriptionBegin
 #Defines some special environments useful for linguistics (numbered examples,
 #glosses, semantic markup, tableau floats).
+#See linguistics.lyx file in examples.
 #DescriptionEnd
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 8
+Format 53
 
 # 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
@@ -29,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:"
@@ -46,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
@@ -65,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
@@ -75,8 +73,12 @@ InsetLayout Custom:Glosse
 	  Size                Small
 	EndFont
 	MultiPar              true
+	CustomPars            false
+	ForcePlain            true
 	PassThru              true
+	ParbreakIsNewline     true
 	FreeSpacing           true
+	ForceLTR              true
 	Requires	      covington
 	Preamble
 		\@ifundefined{linggloss}{%
@@ -84,12 +86,14 @@ InsetLayout Custom:Glosse
 			\gll #1}
 		{\glend}}{}
 	EndPreamble
+	InToc                 true
+	ResetsFont 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
@@ -99,8 +103,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}{%
@@ -108,11 +117,12 @@ InsetLayout Custom:Tri-Glosse
 			\glll #1}
 		{\glend}}{}
 	EndPreamble
+	ResetsFont true
 End
 
 
 # Some semantik markup for Semantics
-InsetLayout CharStyle:Expression
+InsetLayout Flex:Expression
 	LyxType               charstyle
 	LabelString           expr.
 	LatexType             command
@@ -123,10 +133,12 @@ InsetLayout CharStyle:Expression
 	Preamble
 		\newcommand{\lingexpr}[1]{\emph{#1}}
 	EndPreamble
+	InToc                 true
+	ResetsFont true
 End
 
 
-InsetLayout CharStyle:Concepts
+InsetLayout Flex:Concepts
 	LyxType               charstyle
 	LabelString           concept
 	LatexType             command
@@ -137,18 +149,22 @@ InsetLayout CharStyle:Concepts
 	Preamble
 		\newcommand{\lingconcept}[1]{\textsc{#1}}
 	EndPreamble
+	InToc                 true
+	ResetsFont 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
+	ResetsFont true
 End
 
 
@@ -161,14 +177,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