Remove debugging code.

[lyx.git] / lib / layouts / linguistics.module

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index d93885abc875cc6e6ea54333d7fca1150b7cd796..a3a4002cc286e53ff8bdd61fb1c13ad1488956b2 100644 (file)
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -1,4 +1,4 @@
-#\DeclareLyXModule[covington.sty,elocalloc.sty,enumitem.sty,forest.sty,pgfopts.sty,trimspaces.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 59
+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,13 @@ 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
 
@@ -38,12 +45,19 @@ 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
 
 
@@ -151,6 +165,12 @@ InsetLayout Flex:Structure_Tree
        Requires              forest
        ResetsFont            true
        PassThruChars         []
+       Preamble
+       % Load forest linguistics library, if available
+       \@ifpackagelater{forest}{2016/02/20}{%
+       \useforestlibrary*{linguistics}
+       }{}
+       EndPreamble
 End
 
 
@@ -167,7 +187,7 @@ InsetLayout Flex:Expression
                \newcommand{\lingexpr}[1]{\emph{#1}}
        EndPreamble
        InToc                 true
-       ResetsFont true
+       ResetsFont            true
 End
 
 
@@ -183,7 +203,7 @@ InsetLayout Flex:Concepts
                \newcommand{\lingconcept}[1]{\textsc{#1}}
        EndPreamble
        InToc                 true
-       ResetsFont true
+       ResetsFont            true
 End
 
 
@@ -197,7 +217,7 @@ InsetLayout Flex:Meaning
                \newcommand{\lingmeaning}[1]{\enquote*{#1}}
        EndPreamble
        InToc                 true
-       ResetsFont true
+       ResetsFont            true
 End