Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index d2e32322a8ee513ddaee173d55640cd1b9a57cb7..fb742157ea693d4c97cf59c97fd461c9dbda7c6b 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,7 +4,7 @@
 #
 # Detailed format description is available in the customization manual
 
-Format 53
+Format 62
 
 Provides stdinsets 1
 
@@ -115,6 +115,7 @@ InsetLayout Note:Comment
        LabelString           Comment
        LatexType             environment
        LatexName             comment
+       Requires              verbatim
        BgColor               commentbg
        LabelFont
          Color               comment
@@ -124,11 +125,11 @@ InsetLayout Note:Comment
        Display               false
        HTMLTag               div
        HTMLIsBlock           true
-  HTMLStyle
-    div.note_comment {
-      display: none;
-    }
-  EndHTMLStyle
+       HTMLStyle
+       div.note_comment {
+               display: none;
+       }
+       EndHTMLStyle
 End
 
 
@@ -142,8 +143,7 @@ InsetLayout Note:Note
          Size                Small
        EndFont
        MultiPar              true
-       HTMLIsBlock           false
-# FIXME HTML Need CSS
+       # Not output for XHTML
 End
 
 
@@ -151,6 +151,7 @@ InsetLayout Note:Greyedout
        LabelString           Greyedout
        LatexType             environment
        LatexName             lyxgreyedout
+       Requires              color,lyxgreyedout
        BgColor               greyedoutbg
        Font
          Color               greyedouttext
@@ -267,6 +268,7 @@ InsetLayout TOC:Listings
        LangPreamble
                \renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])}
        EndLangPreamble
+       FixedWidthPreambleEncoding true
   HTMLTag h2
   HTMLStyle
     div.lyxtoc-flat {
@@ -287,6 +289,7 @@ InsetLayout Include:Listings
        LangPreamble
                \renewcommand{\lstlistingname}{_(Listing)}
        EndLangPreamble
+       FixedWidthPreambleEncoding true
 End
 
 InsetLayout Listings
@@ -311,6 +314,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
@@ -554,9 +570,12 @@ InsetLayout Caption:Standard
        LabelString          standard
        LaTeXType            command
        LatexName            caption
+       NeedProtect          1
+       MultiPar             false
        Argument 1
                LabelString   "Short Title|S"
                Tooltip       "The caption as it appears in the list of figures/tables"
+               InsertCotext  1
        EndArgument
        HTMLStyle
                div.float-caption {
@@ -570,7 +589,7 @@ InsetLayout Caption:Standard
 End
 
 
-InsetLayout Caption:LongTableNoNumber
+InsetLayout Caption:Unnumbered
        CopyStyle            Caption:Standard
        LabelString          unlabelled
        LatexName            caption*
@@ -613,3 +632,16 @@ End
 InsetLayout PrintNomencl
   HTMLTag h2
 End
+
+InsetLayout Tabular
+       HTMLStyle
+               table {
+                       border-collapse: collapse;
+                       display: inline-block;
+               }
+               td {
+                       border: 1px solid black;
+                       padding: 0.5ex;
+               }
+       EndHTMLStyle
+End