X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Flinguistics.module;h=a3a4002cc286e53ff8bdd61fb1c13ad1488956b2;hb=1a89f89337413adb6188e6265c6e1c49e0969f65;hp=0941176be46aefb907ce71434f34c54f6e2069ef;hpb=31df77771662575bbd0636c96179e415799a987c;p=lyx.git

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 0941176be4..a3a4002cc2 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -1,4 +1,4 @@
-#\DeclareLyXModule[covington.sty]{Linguistics}
+#\DeclareLyXModule[covington.sty,enumitem.sty,forest.sty]{Linguistics}
 #DescriptionBegin
 #Defines some special environments useful for linguistics (numbered examples,
 #glosses, semantic markup, tableau floats).
@@ -7,12 +7,12 @@
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 11
+Format 60
 
 # single numbered example with covington.sty
 Style Numbered_Example_(multiline)
 	LatexType             Environment
-	LatexName             example
+	LatexName             covexample
 	NextNoIndent          1
 	Margin                Dynamic
 	LabelSep              xx
@@ -30,6 +30,14 @@ Style Numbered_Example_(multiline)
 		Color         Blue
 	EndFont
 	Requires	      covington
+	Preamble
+	% Backwards compatibility with covington < 1.1
+	% This code can be removed eventually
+	\@ifundefined{covexample}{%
+	    \newenvironment{covexample}{\begin{example}}{\end{example}}%
+	}
+	EndPreamble
+	Category              Linguistics
 End
 
 
@@ -37,15 +45,25 @@ End
 Style Numbered_Examples_(consecutive)
 	CopyStyle	      Numbered_Example_(multiline)
 	LatexType             Item_Environment
-	LatexName             examples
+	LatexName             covexamples
 	LabelString           "Examples:"
+	Argument item:1
+		LabelString   "Custom Numbering|s"
+		Tooltip       "Customize the numeration"
+	EndArgument
+	Preamble
+	% Backwards compatibility with covington < 1.1
+	% This code can be removed eventually
+	\@ifundefined{covexamples}{%
+	    \newenvironment{covexamples}{\begin{examples}}{\end{examples}}%
+	}
+	EndPreamble
 End
 
 
 # multiple numbered example with covington.sty
 Style Subexample
-	CopyStyle	      Numbered_Example_(multiline)
-	LatexType             Item_Environment
+	CopyStyle	      Numbered_Examples_(consecutive)
 	LatexName             subexample
 	LabelString           "Subexample:"
 	Requires	      covington,enumitem
@@ -61,8 +79,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
@@ -74,23 +91,30 @@ InsetLayout Custom:Glosse
 	MultiPar              true
 	CustomPars            false
 	ForcePlain            true
-	PassThru              true
+	ParbreakIsNewline     true
 	FreeSpacing           true
-	ForceLTR              true
 	Requires	      covington
 	Preamble
+		\def\glosstr{}
 		\@ifundefined{linggloss}{%
-		\newenvironment{linggloss}[1]{%
-			\gll #1}
-		{\glend}}{}
+		\newenvironment{linggloss}[2][]{
+			\def\glosstr{\glt #1}%
+			\gll #2}
+		{\glosstr\glend}}{}
 	EndPreamble
 	InToc                 true
+	ResetsFont            true
+	Argument 1
+		Decoration    conglomerate
+		LabelString   "Translation"
+		MenuString    "Glosse Translation|s"
+		Tooltip       "Add a translation for the glosse"
+	EndArgument
 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,22 +126,56 @@ InsetLayout Custom:Tri-Glosse
 	MultiPar              true
 	CustomPars            false
 	ForcePlain            true
-	PassThru              true
+	ParbreakIsNewline     true
 	FreeSpacing           true
-	ForceLTR              true
 	InToc                 true
 	Requires	      covington
 	Preamble
+		\def\glosstr{}
 		\@ifundefined{lingglosss}{%
-		\newenvironment{lingglosss}[1]{%
-			\glll #1}
-		{\glend}}{}
+		\newenvironment{lingglosss}[2][]{
+			\def\glosstr{\glt #1}%
+			\glll #2}
+		{\glosstr\glend}}{}
+	EndPreamble
+	ResetsFont            true
+	Argument 1
+		Decoration    conglomerate
+		LabelString   "Translation"
+		MenuString    "Glosse Translation|s"
+		Tooltip       "Add a translation for the glosse"
+	EndArgument
+End
+
+
+# Structure trees via the forest package
+InsetLayout Flex:Structure_Tree
+	LyXType               custom
+	LabelString           Tree
+	LatexType             environment
+	LatexName             forest
+	Decoration            classic
+	LabelFont
+	  Size                Small
+	EndFont
+	MultiPar              true
+	CustomPars            false
+	ParbreakIsNewline     true
+	FreeSpacing           true
+	Requires              forest
+	ResetsFont            true
+	PassThruChars         []
+	Preamble
+	% Load forest linguistics library, if available
+	\@ifpackagelater{forest}{2016/02/20}{%
+	\useforestlibrary*{linguistics}
+	}{}
 	EndPreamble
 End
 
 
 # Some semantik markup for Semantics
-InsetLayout CharStyle:Expression
+InsetLayout Flex:Expression
 	LyxType               charstyle
 	LabelString           expr.
 	LatexType             command
@@ -129,10 +187,11 @@ InsetLayout CharStyle:Expression
 		\newcommand{\lingexpr}[1]{\emph{#1}}
 	EndPreamble
 	InToc                 true
+	ResetsFont            true
 End
 
 
-InsetLayout CharStyle:Concepts
+InsetLayout Flex:Concepts
 	LyxType               charstyle
 	LabelString           concept
 	LatexType             command
@@ -144,10 +203,11 @@ InsetLayout CharStyle:Concepts
 		\newcommand{\lingconcept}[1]{\textsc{#1}}
 	EndPreamble
 	InToc                 true
+	ResetsFont            true
 End
 
 
-InsetLayout CharStyle:Meaning
+InsetLayout Flex:Meaning
 	LyxType               charstyle
 	LabelString           meaning
 	LatexType             command
@@ -157,6 +217,17 @@ InsetLayout CharStyle:Meaning
 		\newcommand{\lingmeaning}[1]{\enquote*{#1}}
 	EndPreamble
 	InToc                 true
+	ResetsFont            true
+End
+
+
+# A helper to group words in Glosses
+InsetLayout Flex:GroupGlossedWords
+	LyxType               charstyle
+	LabelString           Group
+	LeftDelim             {
+	RightDelim            }
+	ResetsFont            true
 End
 
 
@@ -169,6 +240,7 @@ Float
 	NumberWithin          none
 	Style                 plain
 	ListName              "List of Tableaux"
-	LaTeXBuiltin          false
+	IsPredefined          false
+	UsesFloatPkg          true
 End