X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=e4fec966135028f1cdb11a45021dcff242d854b5;hb=aa39a2aaf7d2175bdcf423d3d3d22c93588c5c20;hp=b66b1caee2716e22c108372151fdfd2d19de8352;hpb=8d8ee12e6481a2d9687228a4a5f9dd44a21a052e;p=lyx.git

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index b66b1caee2..e4fec96613 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,7 +4,7 @@
 #
 # Detailed format description is available in the customization manual
 
-Format 66
+Format 89
 
 Provides stdinsets 1
 
@@ -44,6 +44,7 @@ InsetLayout Marginal
 	EndHTMLStyle
 	AddToToc              marginalnote
 	IsTocCaption          true
+	DocBookTag            para
 End
 
 InsetLayout Foot
@@ -87,6 +88,8 @@ InsetLayout Foot
 	EndHTMLStyle
 	AddToToc              footnote
 	IsTocCaption          true
+	DocBookTag            footnote
+	DocBookTagType        inline
 End
 
 InsetLayout Foot:InTitle
@@ -150,6 +153,7 @@ InsetLayout Note:Comment
 	EndHTMLStyle
 	AddToToc              note
 	IsTocCaption          true
+	NeedCProtect          true
 End
 
 
@@ -196,6 +200,7 @@ InsetLayout Note:Greyedout
 	HTMLIsBlock           false
 	AddToToc              note
 	IsTocCaption          true
+	NeedCProtect          true
 End
 
 InsetLayout ERT
@@ -218,6 +223,7 @@ InsetLayout ERT
 	KeepEmpty             true
 	FreeSpacing           true
 	ForceLTR              true
+	EditExternal          true
 End
 
 InsetLayout Phantom
@@ -359,7 +365,10 @@ InsetLayout Listings
 	KeepEmpty             true
 	FreeSpacing           true
 	ForceLTR              true
+	ForcePlain            true
+	NeedCProtect          true
 	RefPrefix             lst
+	EditExternal          true
 	HTMLTag               pre
 	HTMLStyle
 		div.float-listings {
@@ -374,6 +383,7 @@ InsetLayout Listings
 			margin: 1ex;
 	}
 	EndHTMLStyle
+	DocBookTag            programlisting
 End
 
 InsetLayout MintedListings
@@ -426,6 +436,8 @@ InsetLayout Box
 	  Size                Small
 	EndFont
 	MultiPar              true
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
 End
 
 InsetLayout Box:Frameless
@@ -433,6 +445,9 @@ InsetLayout Box:Frameless
 	HTMLStyle
 		div.Frameless { margin: 1em; }
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='frameless'
 End
 
 InsetLayout Box:Shaded
@@ -444,6 +459,9 @@ InsetLayout Box:Shaded
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='shaded'
 End
 
 InsetLayout Box:Boxed
@@ -454,6 +472,9 @@ InsetLayout Box:Boxed
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='boxed'
 End
 
 InsetLayout Box:Framed
@@ -464,6 +485,9 @@ InsetLayout Box:Framed
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='framed'
 End
 
 InsetLayout Box:ovalbox
@@ -474,6 +498,9 @@ InsetLayout Box:ovalbox
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='ovalbox'
 End
 
 InsetLayout Box:Ovalbox
@@ -484,6 +511,9 @@ InsetLayout Box:Ovalbox
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='ovalbox-var'
 End
 
 InsetLayout Box:Shadowbox
@@ -491,6 +521,9 @@ InsetLayout Box:Shadowbox
 	HTMLStyle
 		div.Shadowbox { border: solid gray medium; border-bottom: solid black 1ex; border-right: solid black 1ex; padding: 0.5ex; }
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='shadowbox'
 End
 
 InsetLayout Box:Doublebox
@@ -501,9 +534,13 @@ InsetLayout Box:Doublebox
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='doublebox'
 End
 
 InsetLayout Float
+	LaTeXType             environment
 	LabelFont
 	  Color               collapsible
 	  Size                Small
@@ -552,6 +589,7 @@ InsetLayout "Flex:URL"
 	PassThru              true
 	FreeSpacing           true
 	ForceLTR              true
+	NeedCProtect          true
 	Font
 	  Family              Typewriter
 	  Color               urltext
@@ -562,6 +600,8 @@ InsetLayout "Flex:URL"
 	  Size                Small
 	EndFont
 	HTMLIsBlock           false
+	DocBookTag            link
+	DocBookTagType        inline
 End
 
 InsetLayout Argument
@@ -598,6 +638,8 @@ InsetLayout Info:menu
 	HTMLStyle
 		span.menu { font-family: sans-serif; }
 	EndHTMLStyle
+	DocBookTag            guimenu
+	DocBookTagType        inline
 End
 
 InsetLayout Info:shortcut
@@ -615,6 +657,10 @@ InsetLayout Info:shortcut
 	HTMLStyle
 		span.shortcut { font-family: sans-serif; }
 	EndHTMLStyle
+	DocBookWrapperTag     keycombo
+	DocBookWrapperTagType inline
+	DocBookTag            keycap
+	DocBookTagType        inline
 End
 
 InsetLayout Info:shortcuts
@@ -632,6 +678,10 @@ InsetLayout Info:shortcuts
 	HTMLStyle
 		span.shortcuts { font-family: sans-serif; }
 	EndHTMLStyle
+	DocBookWrapperTag     keycombo
+	DocBookWrapperTagType inline
+	DocBookTag            keycap
+	DocBookTagType        inline
 End
 
 InsetLayout Caption:Standard