Two places where coverity urges us to limit string length

[lyx.git] / lib / layouts / stdinsets.inc

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index e6a4641909ddeb39c01c699ccb3badaa4ba246a3..981feb056c4783b03f57fdfeb0b8bc7244733fc2 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,10 +4,17 @@
 #
 # Detailed format description is available in the customization manual
 
-Format 60
+Format 63
 
 Provides stdinsets 1
 
+OutlinerName marginalnote "Marginal notes"
+OutlinerName footnote     "Footnotes"
+OutlinerName note         "Notes"
+OutlinerName branch       "Branches"
+OutlinerName index        "Index Entries" #no AddToToc (built-in)
+OutlinerName listing      "Listings" #no AddToToc (built-in)
+
 InsetLayout Marginal
        LabelString           margin
        LatexType             command
@@ -35,6 +42,8 @@ InsetLayout Marginal
                        font-style: normal;
                }
        EndHTMLStyle
+       AddToToc              marginalnote
+       IsTocCaption          true
 End
 
 InsetLayout Foot
@@ -76,6 +85,8 @@ InsetLayout Foot
                        padding: 1em;
                }
        EndHTMLStyle
+       AddToToc              footnote
+       IsTocCaption          true
 End
 
 InsetLayout Foot:InTitle
@@ -115,6 +126,7 @@ InsetLayout Note:Comment
        LabelString           Comment
        LatexType             environment
        LatexName             comment
+       Requires              verbatim
        BgColor               commentbg
        LabelFont
          Color               comment
@@ -124,11 +136,13 @@ InsetLayout Note:Comment
        Display               false
        HTMLTag               div
        HTMLIsBlock           true
-  HTMLStyle
-    div.note_comment {
-      display: none;
-    }
-  EndHTMLStyle
+       HTMLStyle
+       div.note_comment {
+               display: none;
+       }
+       EndHTMLStyle
+       AddToToc              note
+       IsTocCaption          true
 End
 
 
@@ -142,8 +156,9 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
-       HTMLIsBlock           false
-# FIXME HTML Need CSS
+       # Not output for XHTML
+       AddToToc              note
+       IsTocCaption          true
 End
 
 
@@ -151,6 +166,7 @@ InsetLayout Note:Greyedout
        LabelString           Greyedout
        LatexType             environment
        LatexName             lyxgreyedout
+       Requires              color,lyxgreyedout
        BgColor               greyedoutbg
        Font
          Color               greyedouttext
@@ -171,6 +187,8 @@ InsetLayout Note:Greyedout
                }
        EndHTMLStyle
        HTMLIsBlock           false
+       AddToToc              note
+       IsTocCaption          true
 End
 
 InsetLayout ERT
@@ -313,6 +331,19 @@ InsetLayout Listings
        ForceLTR              true
        RefPrefix             lst
        HTMLTag               pre
+       HTMLStyle
+               div.float-listings {
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+               div.listings-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+       }
+       EndHTMLStyle
 End
 
 InsetLayout Branch
@@ -324,6 +355,8 @@ InsetLayout Branch
        MultiPar              true
        InToc                 true
        HTMLIsBlock           false
+       AddToToc              branch
+       IsTocCaption          true
 End
 
 InsetLayout Index
@@ -340,6 +373,7 @@ InsetLayout Index
        CustomPars            false
        ForcePlain            true
        ContentAsLabel        true
+       PassThruChars         @|!
 End
 
 InsetLayout Box
@@ -439,6 +473,10 @@ InsetLayout Float
        EndHTMLStyle
 End
 
+#InsetWrap requires these, independently of whether stdfloats.inc is included
+OutlinerName table        "Tables" #no AddToToc (built-in)
+OutlinerName figure       "Figures" #no AddToToc (built-in)
+
 InsetLayout Wrap
        LabelFont
          Color               collapsable