Catalan mathed.lyx: move outdated file to attic/ca/mathed.lyx

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

diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 2d71717aa89ddfc8701c20990b914737e394dc9d..655705cc250235e0d3ba61c12a3213d69adc1607 100644 (file)
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -7,14 +7,37 @@
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 54
+Format 65
+
+Counter example
+       Within               chapter
+       LabelString          "(\arabic{example})"
+End
+
+Counter examplei
+       Within               chapter
+       LabelString          "(\arabic{examplei})"
+End
+
+Counter subexample
+       Within               examplei
+       LabelString          "\theexamplei (\alph{subexample})"
+End
+
+Counter subexamplei
+       Within               examplei
+       LabelString          "\theexamplei (\alph{subexamplei})"
+End
+
+OutlinerName tableau    "Tableaux" #no AddToToc (built-in)
 
 # single numbered example with covington.sty
 Style Numbered_Example_(multiline)
        LatexType             Environment
-       LatexName             example
+       LatexName             covexample
        NextNoIndent          1
-       Margin                Dynamic
+       Margin                First_Dynamic
+       ParIndent             (1)x
        LabelSep              xx
        ParSkip               0.0
        ItemSep               0.2
@@ -24,12 +47,18 @@ Style Numbered_Example_(multiline)
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           "Example:"
+       LabelCounter          "examplei"
        LabelFont
-               Shape         Italic
                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 +67,21 @@ End
 Style Numbered_Examples_(consecutive)
        CopyStyle             Numbered_Example_(multiline)
        LatexType             Item_Environment
-       LatexName             examples
-       LabelString           "Examples:"
+       LatexName             covexamples
+       LabelType             Enumerate
+       LabelCounter          "example"
+       ResumeCounter         true
        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
 
 
@@ -51,7 +89,8 @@ End
 Style Subexample
        CopyStyle             Numbered_Examples_(consecutive)
        LatexName             subexample
-       LabelString           "Subexample:"
+       LabelCounter          "subexample"
+       StepMasterCounter     true
        Requires              covington,enumitem
        Preamble
                \newenvironment{subexample}{%
@@ -151,6 +190,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 +212,7 @@ InsetLayout Flex:Expression
                \newcommand{\lingexpr}[1]{\emph{#1}}
        EndPreamble
        InToc                 true
-       ResetsFont true
+       ResetsFont            true
 End
 
 
@@ -183,7 +228,7 @@ InsetLayout Flex:Concepts
                \newcommand{\lingconcept}[1]{\textsc{#1}}
        EndPreamble
        InToc                 true
-       ResetsFont true
+       ResetsFont            true
 End
 
 
@@ -197,7 +242,7 @@ InsetLayout Flex:Meaning
                \newcommand{\lingmeaning}[1]{\enquote*{#1}}
        EndPreamble
        InToc                 true
-       ResetsFont true
+       ResetsFont            true
 End
 
 
@@ -212,6 +257,8 @@ End
 
 
 # Tableaux for Optimality Theory
+OutlinerName tableau        "Tableaux" #no AddToToc
+
 Float
        Type                  tableau
        GuiName               Tableau