X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=a902912e93f2c06efa1730c128a41046ea9514d3;hb=8f9520eda5a0ecf2458341e5d8ea40f5970d54db;hp=8dc7d76ac8a3c2a2148ddc84e49d2fdaedd68bbf;hpb=70ad54bec920fb861609fd741a6d2d74ac163439;p=lyx.git

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 8dc7d76ac8..a902912e93 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 35
+Format 45
 
 Provides stdinsets 1
 
@@ -170,8 +170,93 @@ InsetLayout Phantom
 	ForcePlain            true
 End
 
+InsetLayout IPADeco
+	Decoration            minimalistic
+	Font
+	  Color               foreground
+	EndFont
+	MultiPar              false
+	CustomPars            false
+	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.
+	# "Listings[[List of Listings]]" is the name of the "List of listings"
+	# ("Listings" is the predefined english name) in listings.sty, so it
+	# must be used here as well.
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])}}
+	EndBabelPreamble
+	# The command does not need to be defined in LangPreamble, since
+	# listings.sty does that already. However it needs to be redefined
+	# in order to be used for non-english single-language documents.
+	LangPreamble
+		\renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])}
+	EndLangPreamble
+  HTMLTag h2
+  HTMLStyle
+    div.lyxtoc-flat {
+      margin: 0em 0em 0em 1em;
+      font-size: large;
+      font-weight: normal;
+    }
+  EndHTMLStyle
+End
+
+InsetLayout Include:Listings
+	BabelPreamble
+		\addto\captions$$lang{\renewcommand{\lstlistingname}{_(Listing)}}
+	EndBabelPreamble
+	# The command does not need to be defined in LangPreamble, since
+	# listings.sty does that already. However it needs to be redefined
+	# in order to be used for non-english single-language documents.
+	LangPreamble
+		\renewcommand{\lstlistingname}{_(Listing)}
+	EndLangPreamble
+End
+
 InsetLayout Listings
-	LabelString           Listings
+	CopyStyle Include:Listings
+	LabelString           Listings[[inset]]
 	LatexType             none
 	Decoration            minimalistic
 	Font
@@ -190,6 +275,7 @@ InsetLayout Listings
 	FreeSpacing           true
 	ForceLTR              true
 	RefPrefix             lst
+	HTMLTag               pre
 End
 
 InsetLayout Branch
@@ -347,6 +433,7 @@ InsetLayout "Flex:URL"
 	PassThru              true
 	FreeSpacing           true
 	ForceLTR              true
+	ResetsFont            false
 	Font
 	  Family              Typewriter
 	  Color               urltext
@@ -360,12 +447,13 @@ InsetLayout "Flex:URL"
 End
 
 InsetLayout Argument
-	LabelString           opt
+	LabelString           Argument
 	LabelFont
 	  Color               collapsable
 	  Size                Small
 	EndFont
 	MultiPar              false
+	ForceLocalFontSwitch  1
 End
 
 InsetLayout Info
@@ -428,7 +516,14 @@ InsetLayout Info:shortcuts
 	EndHTMLStyle
 End
 
-InsetLayout Caption
+InsetLayout Caption:Standard
+	LabelString          standard
+	LaTeXType            command
+	LatexName            caption
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The caption as it appears in the list of figures/tables"
+	EndArgument
 	HTMLStyle
 		div.float-caption {
 			text-align: center;
@@ -437,6 +532,17 @@ InsetLayout Caption
 			margin: 1ex;
 		}
 	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-standard'"
+End
+
+
+InsetLayout Caption:LongTableNoNumber
+	CopyStyle            Caption:Standard
+	LatexName            caption*
+	Argument 1
+		LabelString   "Long Table Caption (unnumbered)"
+		Tooltip       "The caption as it appears in the list of tables"
+	EndArgument
 End
 
 
@@ -445,3 +551,33 @@ InsetLayout Preview
 	Decoration            minimalistic
 	MultiPar              true
 End
+
+
+InsetLayout Script
+	LatexType       command
+	MultiPar        false
+	ForcePlain      1
+	CustomPars      0
+	InToc           1
+	HTMLIsBlock     0
+End
+
+
+InsetLayout Script:superscript
+	CopyStyle       Script
+	LaTeXName       textsuperscript
+	HTMLTag         sup
+End
+
+
+InsetLayout Script:subscript
+	CopyStyle       Script
+	Requires        subscript
+	LaTeXName       textsubscript
+	HTMLTag         sub
+End
+
+
+InsetLayout PrintNomencl
+  HTMLTag h2
+End