From: Guillaume Munch Date: Wed, 18 Nov 2015 01:35:14 +0000 (+0000) Subject: Set AddToToc for custom insets X-Git-Tag: 2.2.0beta1~387 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3dcb71eaa25b505b0a10d378d6815ed57d13781e;p=features.git Set AddToToc for custom insets * Fixme * Todonotes * Literate programming (sweave, knitr) * Theorems --- diff --git a/lib/layouts/fixme.module b/lib/layouts/fixme.module index 73eb1c1a63..9f91cc4cf3 100644 --- a/lib/layouts/fixme.module +++ b/lib/layouts/fixme.module @@ -12,7 +12,9 @@ # Authors: Mark Edgington # Jürgen Spitzmüller -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 b781650085..259c986dce 100644 --- 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 >>=
+ IsTocCaption 1 EndArgument ResetsFont false ForceOwnlines true diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc index 6e94ac3029..5ba3156948 100644 --- 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 01a2d7745f..fa05b497f7 100644 --- 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 e45af63b04..e2a7aa7efa 100644 --- 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 9e6931e95f..c6d8f6c1dd 100644 --- 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 e3cb13e7ca..1034a05c19 100644 --- 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 0787882d10..f1bc731198 100644 --- a/lib/layouts/todonotes.module +++ b/lib/layouts/todonotes.module @@ -8,7 +8,9 @@ # Authors: Stephen # Jürgen Spitzmüller -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"