X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flayouts%2Flinguistics.module;h=6b02038d4cfb3acdd5d69146a7a77507112135b0;hb=72ee3a1b17a79b9098d14b2815d4c9ab4d85bf43;hp=51b379f2b29704d01e3ff940606e6aac99010581;hpb=7c28905b177b8366531915903ac903a0fff716de;p=lyx.git

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 51b379f2b2..6b02038d4c 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -1,19 +1,20 @@
 #\DeclareLyXModule[covington.sty]{Linguistics}
 #DescriptionBegin
 #Defines some special environments useful for linguistics (numbered examples,
-#glosses, semantic markup).
+#glosses, semantic markup, tableau floats).
+#See linguistics.lyx file in examples.
 #DescriptionEnd
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 6
+Format 36
 
 # 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
@@ -35,8 +36,6 @@ 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 +45,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 +62,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 +72,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 +85,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
@@ -99,8 +101,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}{%
@@ -111,7 +118,8 @@ InsetLayout Custom:Tri-Glosse
 End
 
 
-InsetLayout CharStyle:Expression
+# Some semantik markup for Semantics
+InsetLayout Flex:Expression
 	LyxType               charstyle
 	LabelString           expr.
 	LatexType             command
@@ -122,10 +130,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
@@ -136,16 +145,33 @@ 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
+
+
+# Tableaux for Optimality Theory
+Float
+	Type                  tableau
+	GuiName               Tableau
+	Placement             tbp
+	Extension             otl
+	NumberWithin          none
+	Style                 plain
+	ListName              "List of Tableaux"
+	IsPredefined          false
+	UsesFloatPkg          true
+End
+