X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=04c464a1e3b4ca01541ca73fbb6e00dceb21417a;hb=761648b1f7d1df9de87921143b8004b6d3dd21e9;hp=6ee56de25ba2ee9ae198c8648400c3fabb5b78d1;hpb=3cc3ff39a044a484faaaefbecf2a2937f7f102ef;p=lyx.git

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 6ee56de25b..04c464a1e3 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 63
+Format 82
 
 Provides stdinsets 1
 
@@ -44,6 +44,8 @@ InsetLayout Marginal
 	EndHTMLStyle
 	AddToToc              marginalnote
 	IsTocCaption          true
+	DocBookTag            sidebar
+	DocBookAttr           role="margin"
 End
 
 InsetLayout Foot
@@ -87,6 +89,7 @@ InsetLayout Foot
 	EndHTMLStyle
 	AddToToc              footnote
 	IsTocCaption          true
+	DocBookTag            footnote
 End
 
 InsetLayout Foot:InTitle
@@ -122,6 +125,13 @@ InsetLayout Foot:InTitle
 	EndHTMLStyle
 End
 
+InsetLayout Foot:InFloatTable
+	CopyStyle             Foot
+	LatexName             tablefootnote
+	Requires              tablefootnote
+End
+
+
 InsetLayout Note:Comment
 	LabelString           Comment
 	LatexType             environment
@@ -143,6 +153,7 @@ InsetLayout Note:Comment
 	EndHTMLStyle
 	AddToToc              note
 	IsTocCaption          true
+	NeedCProtect          true
 End
 
 
@@ -189,6 +200,7 @@ InsetLayout Note:Greyedout
 	HTMLIsBlock           false
 	AddToToc              note
 	IsTocCaption          true
+	NeedCProtect          true
 End
 
 InsetLayout ERT
@@ -211,6 +223,7 @@ InsetLayout ERT
 	KeepEmpty             true
 	FreeSpacing           true
 	ForceLTR              true
+	EditExternal          true
 End
 
 InsetLayout Phantom
@@ -297,21 +310,18 @@ InsetLayout TOC:Listings
 End
 
 InsetLayout TOC:MintedListings
-	# We need the [[List of Listings]] context, since "Listings" is also
-	# the name of the inset and translated differently.
-	# "Listings[[List of Listings]]" is the name of the "List of listings"
-	# ("Listings" is the predefined english name) in minted.sty so it
-	# must be used here as well.
+	# "List of Listings" is the name of the "List of listings"
+	# in minted.sty so it must be used here as well.
 	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\listoflistingscaption}{_(Listings[[List of Listings]])}}
+		\addto\captions$$lang{\renewcommand{\listoflistingscaption}{_(List of Listings)}}
 	EndBabelPreamble
 	# The command does not need to be defined in LangPreamble, since
 	# minted.sty does that already. However it needs to be redefined
 	# in order to be used for non-english single-language documents.
 	LangPreamble
-		\renewcommand{\listoflistingscaption}{_(Listings[[List of Listings]])}
+		\renewcommand{\listoflistingscaption}{_(List of Listings)}
 	EndLangPreamble
-	FixedWidthPreambleEncoding true
+	FixedWidthPreambleEncoding false
   HTMLTag h2
   HTMLStyle
     div.lyxtoc-flat {
@@ -355,6 +365,8 @@ InsetLayout Listings
 	KeepEmpty             true
 	FreeSpacing           true
 	ForceLTR              true
+	ForcePlain            true
+	NeedCProtect          true
 	RefPrefix             lst
 	HTMLTag               pre
 	HTMLStyle
@@ -370,6 +382,7 @@ InsetLayout Listings
 			margin: 1ex;
 	}
 	EndHTMLStyle
+	DocBookTag            programlisting
 End
 
 InsetLayout MintedListings
@@ -383,7 +396,7 @@ InsetLayout MintedListings
 	LangPreamble
 		\renewcommand{\listingscaption}{_(Listing)}
 	EndLangPreamble
-	FixedWidthPreambleEncoding true
+	FixedWidthPreambleEncoding false
 End
 
 InsetLayout Branch
@@ -500,8 +513,9 @@ InsetLayout Box:Doublebox
 End
 
 InsetLayout Float
+	LaTeXType             environment
 	LabelFont
-	  Color               collapsable
+	  Color               collapsible
 	  Size                Small
 	EndFont
 	MultiPar              true
@@ -519,7 +533,7 @@ OutlinerName figure       "Figures" #no AddToToc (built-in)
 
 InsetLayout Wrap
 	LabelFont
-	  Color               collapsable
+	  Color               collapsible
 	  Size                Small
 	EndFont
 	MultiPar              true
@@ -548,6 +562,7 @@ InsetLayout "Flex:URL"
 	PassThru              true
 	FreeSpacing           true
 	ForceLTR              true
+	NeedCProtect          true
 	Font
 	  Family              Typewriter
 	  Color               urltext
@@ -558,12 +573,13 @@ InsetLayout "Flex:URL"
 	  Size                Small
 	EndFont
 	HTMLIsBlock           false
+	DocBookTag            link
 End
 
 InsetLayout Argument
 	LabelString           Argument
 	LabelFont
-	  Color               collapsable
+	  Color               collapsible
 	  Size                Small
 	EndFont
 	MultiPar              false
@@ -694,7 +710,21 @@ End
 
 
 InsetLayout PrintNomencl
-  HTMLTag h2
+	BabelPreamble
+		\addto\captions$$lang{%
+			\def\eqdeclaration#1{, _(see equation[[nomencl]])\nobreakspace(#1)}%
+			\def\pagedeclaration#1{, _(page[[nomencl]])\nobreakspace#1}%
+			\def\nomname{_(Nomenclature[[output]])}%
+		}
+	EndBabelPreamble
+	# The command is defined for several languages in nomencl.sty. However, we need to define
+	# it anyway for the other, non suppported languages.
+	LangPreamble
+		\def\eqdeclaration#1{, _(see equation[[nomencl]])\nobreakspace(#1)}
+		\def\pagedeclaration#1{, _(page[[nomencl]])\nobreakspace#1}
+		\def\nomname{_(Nomenclature[[output]])}
+	EndLangPreamble
+	HTMLTag h2
 End
 
 InsetLayout Tabular