]> git.lyx.org Git - features.git/commitdiff
projects / features.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3c9b62a)
Set AddToToc for custom insets
authorGuillaume Munch <gm@lyx.org>
Wed, 18 Nov 2015 01:35:14 +0000 (01:35 +0000)
committerGuillaume Munch <gm@lyx.org>
Sun, 13 Dec 2015 19:56:49 +0000 (19:56 +0000)
* Fixme
* Todonotes
* Literate programming (sweave, knitr)
* Theorems

lib/layouts/fixme.module patch | blob | history
lib/layouts/litinsets.inc patch | blob | history
lib/layouts/theorems-ams-bytype.inc patch | blob | history
lib/layouts/theorems-ams.inc patch | blob | history
lib/layouts/theorems-starred.inc patch | blob | history
lib/layouts/theorems-without-preamble.inc patch | blob | history
lib/layouts/theorems.inc patch | blob | history
lib/layouts/todonotes.module patch | blob | history

diff --git a/lib/layouts/fixme.module b/lib/layouts/fixme.module
index 73eb1c1a63f76c0beb896a199400d64f5e9f7f52..9f91cc4cf3f1986dc1aaa5d712d602c6ba8cd3e4 100644 (file)
--- a/lib/layouts/fixme.module
+++ b/lib/layouts/fixme.module
@@ -12,7 +12,9 @@
 # Authors: Mark Edgington <edgimar@gmail.com>
 #          Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 58
+Format 59
+
+OutlinerName fixme "Fixme"
 
 #
 # List of FIXMEs
@@ -59,6 +61,8 @@ InsetLayout Flex:Fixme_Note
           Size                Small
         EndFont
         MultiPar              false
+        AddToToc              fixme
+        IsTocCaption          1
         Argument 1
           LabelString         "Options"
           MenuString          "Fixme Note Options|s"
@@ -103,6 +107,7 @@ InsetLayout Flex:Fixme_Note_(Targeted)
           LabelString         "Note"
           Mandatory            1
           MenuString          "Fixme Note|x"
+          IsTocCaption        1
           Tooltip             "Insert the FIXME note here"
           AutoInsert          1
         EndArgument
@@ -144,6 +149,7 @@ InsetLayout Flex:Fixme_Note_(Multipar)
         Argument 2
           LabelString         "Summary"
           Mandatory            1
+          IsTocCaption        1
           MenuString          "Fixme Summary"
           Tooltip             "Insert a summary of the FIXME note here"
           AutoInsert          1
@@ -184,6 +190,7 @@ InsetLayout Flex:Fixme_Note_(Multipar_Targeted)
         EndArgument
         Argument 2
           LabelString         "Summary"
+          IsTocCaption        1
           Mandatory            1
           MenuString          "Fixme Summary"
           Tooltip             "Insert a summary of the FIXME note here"
diff --git a/lib/layouts/litinsets.inc b/lib/layouts/litinsets.inc
index b781650085f1dd0c1fd47d9fc5827ee3bd647bb7..259c986dcef95ac541b4655d376ed61e08570d36 100644 (file)
--- a/lib/layouts/litinsets.inc
+++ b/lib/layouts/litinsets.inc
@@ -6,12 +6,14 @@
 # Note that this file is included in sweave.module,
 # knitr.module and noweb.module.
 
-Format 58
+Format 59
 
 Counter chunk
     PrettyFormat "Chunk ##"
 End
 
+OutlinerName literate "Literate programming"
+
 InsetLayout "Flex:Chunk"
     LabelString          "Chunk"
     LatexType            none
@@ -36,12 +38,15 @@ InsetLayout "Flex:Chunk"
     Spellcheck            0
     FreeSpacing           true
     ForceLTR              true
+    AddToToc              literate
+    IsTocCaption          0
     Argument 1
             Mandatory     1
             LabelString   "Options"
             Tooltip       "Options"
             LeftDelim     <<
             RightDelim    >>=<br/>
+                       IsTocCaption  1
     EndArgument
     ResetsFont            false
     ForceOwnlines         true
diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc
index 6e94ac3029e6a65efc01ba3cefa384b5c6ac86fd..5ba315694871efa6f94fe75f4d3977dd90951dd4 100644 (file)
--- a/lib/layouts/theorems-ams-bytype.inc
+++ b/lib/layouts/theorems-ams-bytype.inc
@@ -22,7 +22,7 @@
 # - Case (by inclusion)
 
 # We need separate counters for each theorem-like style.
-Format 58
+Format 59
 Counter theorem
 End
 Counter corollary
@@ -50,6 +50,8 @@ End
 Counter claim
 End
 
+OutlinerName thm "Definitions & Theorems"
+
 Style Theorem
        Category              Reasoning
        Margin                First_Dynamic
@@ -57,9 +59,12 @@ Style Theorem
        LatexName             thm
        NextNoIndent          1
        ResetArgs             1
+       AddToToc              thm
+       IsTocCaption          1
        Argument 1
                LabelString    "Additional Theorem Text"
                Tooltip        "Additional text appended to the theorem header"
+               IsTocCaption      1
        EndArgument
        LabelSep              xx
        ParIndent             MMM
diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc
index 01a2d7745f1e060dc9b7a54e71608cea5b3c291f..fa05b497f7d65edda61329c3faec95f88f9a8eb1 100644 (file)
--- a/lib/layouts/theorems-ams.inc
+++ b/lib/layouts/theorems-ams.inc
@@ -20,7 +20,9 @@
 # - Proof
 # - Case (by inclusion)
 
-Format 58
+Format 59
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
        Category              Reasoning
@@ -29,9 +31,12 @@ Style Theorem
        LatexName             thm
        NextNoIndent          1
        ResetArgs             1
+       AddToToc              thm
+       IsTocCaption          1
        Argument 1
                LabelString    "Additional Theorem Text"
                Tooltip        "Additional text appended to the theorem header"
+               IsTocCaption      1
        EndArgument
        LabelSep              xx
        ParIndent             MMM
@@ -69,7 +74,7 @@ End
 
 Style Corollary
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             cor
        LabelString           "Corollary \thetheorem."
        Preamble
@@ -87,7 +92,7 @@ End
 
 Style Lemma
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             lem
        LabelString           "Lemma \thetheorem."
        Preamble
@@ -105,7 +110,7 @@ End
 
 Style Proposition
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             prop
        LabelString           "Proposition \thetheorem."
        Preamble
@@ -123,7 +128,7 @@ End
 
 Style Conjecture
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             conjecture
        LabelString           "Conjecture \thetheorem."
        Preamble
@@ -141,7 +146,7 @@ End
 
 Style Fact
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             fact
        LabelString           "Fact \thetheorem."
        Preamble
@@ -159,7 +164,7 @@ End
 
 Style Definition
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             defn
        LabelString           "Definition \thetheorem."
        Font
@@ -252,7 +257,7 @@ End
 
 Style Remark
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             rem
        LabelString           "Remark \thetheorem."
        Font
diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc
index e45af63b043631952c6c365d672337b56ed9861a..e2a7aa7efae660d60956ad6844450ef0f5d5b1ea 100644 (file)
--- a/lib/layouts/theorems-starred.inc
+++ b/lib/layouts/theorems-starred.inc
@@ -19,7 +19,9 @@
 # - Claim
 # - Proof
 
-Format 58
+Format 59
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem*
        Category              Reasoning
@@ -30,9 +32,12 @@ Style Theorem*
        LabelString           "Theorem."
        NextNoIndent          1
        ResetArgs             1
+       AddToToc              thm
+       IsTocCaption          1
        Argument 1
                LabelString    "Additional Theorem Text"
                Tooltip        "Additional text appended to the theorem header"
+               IsTocCaption      1
        EndArgument
        LabelSep              xx
        ParIndent             MMM
diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc
index 9e6931e95fc1b278513bc77acede087fe09d2a42..c6d8f6c1dd5ebae30519e2599cf4165835fc4e44 100644 (file)
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -26,8 +26,9 @@
 # - Note
 
 
-Format 58
+Format 59
 
+OutlinerName thm "Definitions & Theorems"
 
 Counter                theorem
 End
@@ -37,9 +38,12 @@ Style Theorem
        LatexType       Environment
        LatexName       theorem
        NextNoIndent    1
+       AddToToc              thm
+       IsTocCaption          1
        Argument 1
          LabelString   "Name/Title"
          Tooltip       "Alternative optional name or title"
+         IsTocCaption      1
        EndArgument
        LabelSep        xx
        ParIndent       MMM
@@ -259,6 +263,8 @@ Style Prob
        LabelFont
          Series        Bold
        EndFont
+       AddToToc        thm
+       IsTocCaption    true
 End
 
 
@@ -288,6 +294,7 @@ Style Sol
          Mandatory     1
          LabelString   "Label of Problem"
          Tooltip       "Label of the corresponding problem"
+         InToc
        EndArgument
 End
 
diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc
index e3cb13e7cab68bb6c63e1420c710af8e52780b5e..1034a05c1912be31b9622c49906949768800dbf4 100644 (file)
--- a/lib/layouts/theorems.inc
+++ b/lib/layouts/theorems.inc
@@ -20,7 +20,9 @@
 # - Claim
 # - Case (by inclusion)
 
-Format 58
+Format 59
+
+OutlinerName thm "Definitions & Theorems"
 
 Style Theorem
        Category              Reasoning
@@ -29,9 +31,12 @@ Style Theorem
        LatexName             thm
        NextNoIndent          1
        ResetArgs             1
+       AddToToc              thm
+       IsTocCaption          1
        Argument 1
                LabelString    "Additional Theorem Text"
                Tooltip        "Additional text appended to the theorem header"
+               IsTocCaption      1
        EndArgument
        LabelSep              xx
        ParIndent             MMM
@@ -69,7 +74,7 @@ End
 
 Style Corollary
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             cor
        LabelString           "Corollary \thetheorem."
        Preamble
@@ -87,7 +92,7 @@ End
 
 Style Lemma
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             lem
        LabelString           "Lemma \thetheorem."
        Preamble
@@ -105,7 +110,7 @@ End
 
 Style Proposition
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             prop
        LabelString           "Proposition \thetheorem."
        Preamble
@@ -123,7 +128,7 @@ End
 
 Style Conjecture
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             conjecture
        LabelString           "Conjecture \thetheorem."
        Preamble
@@ -141,7 +146,7 @@ End
 
 Style Fact
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             fact
        LabelString           "Fact \thetheorem."
        Preamble
@@ -159,7 +164,7 @@ End
 
 Style Definition
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             defn
        LabelString           "Definition \thetheorem."
        Font
@@ -252,7 +257,7 @@ End
 
 Style Remark
        CopyStyle             Theorem
-       DependsOn             Theorem
+       DependsOn             Theorem
        LatexName             rem
        LabelString           "Remark \thetheorem."
        Font
diff --git a/lib/layouts/todonotes.module b/lib/layouts/todonotes.module
index 0787882d10db67f08c7c171a1b69891a76d9a398..f1bc731198be1e5e9a02e6763a79345bce47b5a0 100644 (file)
--- a/lib/layouts/todonotes.module
+++ b/lib/layouts/todonotes.module
@@ -8,7 +8,9 @@
 # Authors: Stephen <stephen4mailinglists@googlemail.com>
 #          Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 58
+Format 59
+
+OutlinerName todonotes "TODO"
 
 #
 # List of TODOs
@@ -67,6 +69,8 @@ InsetLayout Flex:TODO_Note_(Margin)
        MultiPar        true
        LatexType       command
        LatexName       todo
+       AddToToc      todonotes
+       IsTocCaption  1
        Argument 1
                LabelString     "Options"
                MenuString      "TODO Note Options|s"
Repository for new features