X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=422d8931a319ec260e615b40dcacd626235b4155;hb=47886ebbb1c72a103b3ed68ae8b7313b96a149bf;hp=f6db1bf70b5fefca067593988219a2a1340f8188;hpb=b95c17cfdd469aac842304073a56e3fb64bfe629;p=lyx.git

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index f6db1bf70b..422d8931a3 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 40
+Format 54
 
 Provides stdinsets 1
 
@@ -39,6 +39,8 @@ End
 
 InsetLayout Foot
 	LabelString           foot
+	LatexType             Command
+	LatexName             footnote
 	Counter               footnote
 	Font
 	  Size                Small
@@ -76,6 +78,39 @@ InsetLayout Foot
 	EndHTMLStyle
 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 Note:Comment
 	LabelString           Comment
 	LatexType             environment
@@ -180,6 +215,43 @@ InsetLayout IPADeco
 	ForcePlain            true
 End
 
+InsetLayout TOC
+  HTMLTag h2
+  HTMLStyle
+    div.toc {
+      margin: 2em 0em;
+      border-style: solid;
+      border-width: 2px 0px;
+      padding: 1em 0em;
+    }
+    h2.tochead { font-size: x-large; font-weight: bold; }
+    div.lyxtoc-0 {
+      margin: 2em 0em 0em 0em;
+      font-size: xx-large;
+      font-weight: bold;
+    }
+    div.lyxtoc-1 {
+      margin: 1em 0em 0em 0em;
+      font-size: x-large;
+      font-weight: bold;
+    }
+    div.lyxtoc-2 {
+      margin: 0em 0.1em 0em 1em;
+      font-size: large;
+      font-weight: normal;
+    }
+    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;
+    }
+    a.tocentry:visited { color: black; }
+  EndHTMLStyle
+End
+
 InsetLayout TOC:Listings
 	# We need the [[List of Listings]] context, since "Listings" is also
 	# the name of the inset and translated differently.
@@ -195,6 +267,15 @@ 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 Include:Listings
@@ -207,6 +288,7 @@ InsetLayout Include:Listings
 	LangPreamble
 		\renewcommand{\lstlistingname}{_(Listing)}
 	EndLangPreamble
+	FixedWidthPreambleEncoding true
 End
 
 InsetLayout Listings
@@ -230,6 +312,7 @@ InsetLayout Listings
 	FreeSpacing           true
 	ForceLTR              true
 	RefPrefix             lst
+	HTMLTag               pre
 End
 
 InsetLayout Branch
@@ -400,12 +483,13 @@ InsetLayout "Flex:URL"
 End
 
 InsetLayout Argument
-	LabelString           opt
+	LabelString           Argument
 	LabelFont
 	  Color               collapsable
 	  Size                Small
 	EndFont
 	MultiPar              false
+	ForceLocalFontSwitch  1
 End
 
 InsetLayout Info
@@ -468,11 +552,16 @@ InsetLayout Info:shortcuts
 	EndHTMLStyle
 End
 
-InsetLayout Caption
+InsetLayout Caption:Standard
+	LabelString          standard
+	LaTeXType            command
+	LatexName            caption
+	NeedProtect	     1
+	MultiPar             false
 	Argument 1
-		LabelString   "Short Title"
-		Shortcut      S
+		LabelString   "Short Title|S"
 		Tooltip       "The caption as it appears in the list of figures/tables"
+		InsertCotext  1
 	EndArgument
 	HTMLStyle
 		div.float-caption {
@@ -482,6 +571,15 @@ InsetLayout Caption
 			margin: 1ex;
 		}
 	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-standard'"
+End
+
+
+InsetLayout Caption:LongTableNoNumber
+	CopyStyle            Caption:Standard
+	LabelString          unlabelled
+	LatexName            caption*
+	ResetArgs            1
 End
 
 
@@ -508,9 +606,15 @@ InsetLayout Script:superscript
 	HTMLTag         sup
 End
 
+
 InsetLayout Script:subscript
 	CopyStyle       Script
 	Requires        subscript
 	LaTeXName       textsubscript
 	HTMLTag         sub
 End
+
+
+InsetLayout PrintNomencl
+  HTMLTag h2
+End