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

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 8a248dfeac..e4fec96613 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -4,10 +4,17 @@
 #
 # Detailed format description is available in the customization manual
 
-Format 45
+Format 89
 
 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,10 +42,15 @@ InsetLayout Marginal
 			font-style: normal;
 		}
 	EndHTMLStyle
+	AddToToc              marginalnote
+	IsTocCaption          true
+	DocBookTag            para
 End
 
 InsetLayout Foot
 	LabelString           foot
+	LatexType             Command
+	LatexName             footnote
 	Counter               footnote
 	Font
 	  Size                Small
@@ -74,12 +86,57 @@ InsetLayout Foot
 			padding: 1em;
 		}
 	EndHTMLStyle
+	AddToToc              footnote
+	IsTocCaption          true
+	DocBookTag            footnote
+	DocBookTagType        inline
+End
+
+InsetLayout Foot:InTitle
+	CopyStyle             Foot
+	LatexName             thanks
+	NeedProtect           true
+	Counter               thanks
+	MultiPar              false
+	HTMLLabel             \fnsymbol{thanks}
+	HTMLInnerTag          span
+	HTMLStyle
+		span.foot_intitle_label {
+			vertical-align: super;
+			font-size: smaller;
+			font-weight: bold;
+			text-decoration: underline;
+		}
+		span.foot_intitle {
+			display: inline;
+			font-size: small;
+			font-weight: medium;
+			font-family: serif;
+			font-variant: normal;
+			font-style: normal;
+		}
+		span.foot_intitle_inner { display: none; }
+		span.foot_intitle:hover span.foot_intitle_inner {
+			display: block;
+			border: 1px double black;
+			margin: 0em 1em;
+			padding: 1em;
+		}
+	EndHTMLStyle
+End
+
+InsetLayout Foot:InFloatTable
+	CopyStyle             Foot
+	LatexName             tablefootnote
+	Requires              tablefootnote
 End
 
+
 InsetLayout Note:Comment
 	LabelString           Comment
 	LatexType             environment
 	LatexName             comment
+	Requires	      verbatim
 	BgColor               commentbg
 	LabelFont
 	  Color               comment
@@ -89,11 +146,14 @@ 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
+	NeedCProtect          true
 End
 
 
@@ -107,8 +167,9 @@ InsetLayout Note:Note
 	  Size                Small
 	EndFont
 	MultiPar              true
-	HTMLIsBlock           false
-# FIXME HTML Need CSS
+	# Not output for XHTML
+	AddToToc              note
+	IsTocCaption          true
 End
 
 
@@ -116,6 +177,7 @@ InsetLayout Note:Greyedout
 	LabelString           Greyedout
 	LatexType             environment
 	LatexName             lyxgreyedout
+	Requires	      color,lyxgreyedout
 	BgColor               greyedoutbg
 	Font
 	  Color               greyedouttext
@@ -136,6 +198,9 @@ InsetLayout Note:Greyedout
 		}
 	EndHTMLStyle
 	HTMLIsBlock           false
+	AddToToc              note
+	IsTocCaption          true
+	NeedCProtect          true
 End
 
 InsetLayout ERT
@@ -158,6 +223,7 @@ InsetLayout ERT
 	KeepEmpty             true
 	FreeSpacing           true
 	ForceLTR              true
+	EditExternal          true
 End
 
 InsetLayout Phantom
@@ -201,14 +267,14 @@ InsetLayout TOC
       font-weight: bold;
     }
     div.lyxtoc-2 {
-      margin: 0em 0em 0em 1em;
+      margin: 0em 0.1em 0em 1em;
       font-size: large;
       font-weight: normal;
     }
-    div.lyxtoc-3 { margin: 0em 0em 0em 0.5em; font-size: medium; }
-    div.lyxtoc-4 { margin: 0em 0em 0em 0.5em; }
-    div.lyxtoc-5 { margin: 0em 0em 0em 0.5em; }
-    div.lyxtoc-6 { margin: 0em 0em 0em 0.5em; }
+    div.lyxtoc-3 { margin: 0em 0.1em 0em 0.5em; font-size: medium; }
+    div.lyxtoc-4 { margin: 0em 0.1em 0em 0.5em; }
+    div.lyxtoc-5 { margin: 0em 0.1em 0em 0.5em; }
+    div.lyxtoc-6 { margin: 0em 0.1em 0em 0.5em; }
     a.tocentry {
       text-decoration: none;
       color: black;
@@ -232,6 +298,30 @@ InsetLayout TOC:Listings
 	LangPreamble
 		\renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])}
 	EndLangPreamble
+	FixedWidthPreambleEncoding true
+  HTMLTag h2
+  HTMLStyle
+    div.lyxtoc-flat {
+      margin: 0em 0em 0em 1em;
+      font-size: large;
+      font-weight: normal;
+    }
+  EndHTMLStyle
+End
+
+InsetLayout TOC:MintedListings
+	# "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}{_(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}{_(List of Listings)}
+	EndLangPreamble
+	FixedWidthPreambleEncoding false
   HTMLTag h2
   HTMLStyle
     div.lyxtoc-flat {
@@ -252,6 +342,7 @@ InsetLayout Include:Listings
 	LangPreamble
 		\renewcommand{\lstlistingname}{_(Listing)}
 	EndLangPreamble
+	FixedWidthPreambleEncoding true
 End
 
 InsetLayout Listings
@@ -274,8 +365,39 @@ InsetLayout Listings
 	KeepEmpty             true
 	FreeSpacing           true
 	ForceLTR              true
+	ForcePlain            true
+	NeedCProtect          true
 	RefPrefix             lst
+	EditExternal          true
 	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
+	DocBookTag            programlisting
+End
+
+InsetLayout MintedListings
+	CopyStyle Listings
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\listingscaption}{_(Listing)}}
+	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{\listingscaption}{_(Listing)}
+	EndLangPreamble
+	FixedWidthPreambleEncoding false
 End
 
 InsetLayout Branch
@@ -287,6 +409,8 @@ InsetLayout Branch
 	MultiPar              true
 	InToc                 true
 	HTMLIsBlock           false
+	AddToToc              branch
+	IsTocCaption          true
 End
 
 InsetLayout Index
@@ -303,6 +427,7 @@ InsetLayout Index
 	CustomPars            false
 	ForcePlain            true
 	ContentAsLabel        true
+	PassThruChars         @|!
 End
 
 InsetLayout Box
@@ -311,6 +436,8 @@ InsetLayout Box
 	  Size                Small
 	EndFont
 	MultiPar              true
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
 End
 
 InsetLayout Box:Frameless
@@ -318,6 +445,9 @@ InsetLayout Box:Frameless
 	HTMLStyle
 		div.Frameless { margin: 1em; }
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='frameless'
 End
 
 InsetLayout Box:Shaded
@@ -329,6 +459,9 @@ InsetLayout Box:Shaded
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='shaded'
 End
 
 InsetLayout Box:Boxed
@@ -339,6 +472,9 @@ InsetLayout Box:Boxed
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='boxed'
 End
 
 InsetLayout Box:Framed
@@ -349,6 +485,9 @@ InsetLayout Box:Framed
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='framed'
 End
 
 InsetLayout Box:ovalbox
@@ -359,6 +498,9 @@ InsetLayout Box:ovalbox
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='ovalbox'
 End
 
 InsetLayout Box:Ovalbox
@@ -369,6 +511,9 @@ InsetLayout Box:Ovalbox
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='ovalbox-var'
 End
 
 InsetLayout Box:Shadowbox
@@ -376,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
@@ -386,11 +534,15 @@ InsetLayout Box:Doublebox
 			padding: 0.5ex;
 		}
 	EndHTMLStyle
+	DocBookWrapperTag     sidebar
+	DocBookTag            para
+	DocBookWrapperAttr    role='doublebox'
 End
 
 InsetLayout Float
+	LaTeXType             environment
 	LabelFont
-	  Color               collapsable
+	  Color               collapsible
 	  Size                Small
 	EndFont
 	MultiPar              true
@@ -402,9 +554,13 @@ 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
+	  Color               collapsible
 	  Size                Small
 	EndFont
 	MultiPar              true
@@ -433,7 +589,7 @@ InsetLayout "Flex:URL"
 	PassThru              true
 	FreeSpacing           true
 	ForceLTR              true
-	ResetsFont            false
+	NeedCProtect          true
 	Font
 	  Family              Typewriter
 	  Color               urltext
@@ -444,12 +600,14 @@ InsetLayout "Flex:URL"
 	  Size                Small
 	EndFont
 	HTMLIsBlock           false
+	DocBookTag            link
+	DocBookTagType        inline
 End
 
 InsetLayout Argument
 	LabelString           Argument
 	LabelFont
-	  Color               collapsable
+	  Color               collapsible
 	  Size                Small
 	EndFont
 	MultiPar              false
@@ -480,6 +638,8 @@ InsetLayout Info:menu
 	HTMLStyle
 		span.menu { font-family: sans-serif; }
 	EndHTMLStyle
+	DocBookTag            guimenu
+	DocBookTagType        inline
 End
 
 InsetLayout Info:shortcut
@@ -497,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
@@ -514,15 +678,22 @@ InsetLayout Info:shortcuts
 	HTMLStyle
 		span.shortcuts { font-family: sans-serif; }
 	EndHTMLStyle
+	DocBookWrapperTag     keycombo
+	DocBookWrapperTagType inline
+	DocBookTag            keycap
+	DocBookTagType        inline
 End
 
 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 {
@@ -536,13 +707,11 @@ InsetLayout Caption:Standard
 End
 
 
-InsetLayout Caption:LongTableNoNumber
+InsetLayout Caption:Unnumbered
 	CopyStyle            Caption:Standard
+	LabelString          unlabelled
 	LatexName            caption*
-	Argument 1
-		LabelString   "Long Table Caption (unnumbered)"
-		Tooltip       "The caption as it appears in the list of tables"
-	EndArgument
+	ResetArgs            1
 End
 
 
@@ -569,9 +738,42 @@ InsetLayout Script:superscript
 	HTMLTag         sup
 End
 
+
 InsetLayout Script:subscript
 	CopyStyle       Script
 	Requires        subscript
 	LaTeXName       textsubscript
 	HTMLTag         sub
 End
+
+
+InsetLayout PrintNomencl
+	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
+	HTMLStyle
+		table {
+			border-collapse: collapse;
+			display: inline-block;
+		}
+		td {
+			border: 1px solid black;
+			padding: 0.5ex;
+		}
+	EndHTMLStyle
+End