X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faguplus.inc;h=e55211784421ef9431b72848d644702c2cb2d599;hb=edaf28fdd6a64ce277a1c5f39d99a6568485887f;hp=8c5c039e09569268a61efeae11cdf181f00cb035;hpb=98595ca7c28e58b1dffc153a34e03e13ecf37d50;p=lyx.git

diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 8c5c039e09..e552117844 100644
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -6,7 +6,7 @@
 # ftp://ftp.agu.org/journals/latex/journals
 
 
-Format 2
+Format 100
 Input stdclass.inc
 
 SecNumDepth             4
@@ -18,9 +18,11 @@ EndPreamble
 
 
 NoStyle Chapter
+NoCounter chapter
 NoStyle Chapter*
 
 NoStyle Subparagraph
+NoCounter subparagraph
 NoStyle Subparagraph*
 
 
@@ -28,6 +30,7 @@ Style Section
 	Font
 	  Size                Large
 	EndFont
+	TocLevel 1
 End
 
 
@@ -42,6 +45,7 @@ Style Subsection
 	Font
 	  Size                Normal
 	EndFont
+	TocLevel 2
 End
 
 
@@ -54,6 +58,7 @@ End
 
 Style Paragraph
 	LatexName             subsubsection
+	TocLevel 4
 End
 
 
@@ -68,7 +73,7 @@ Style Paragraph*
 	Margin                Static
 	LatexName             subsubsubsection*
 	LabelType             No_Label
-	OptionalArgs          0
+	ResetArgs             1
 End
 
 
@@ -84,14 +89,13 @@ Style Left_Header
 	BottomSep             0.7
 	ParSep                0.7
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Left Header:"
 	InTitle               1
 	LabelFont
 	  Series              Bold
 	  Shape               Italic
-	  Color               red
+	  Color               textlabel3
 	EndFont
 End
 
@@ -172,9 +176,14 @@ Style Bibliography
 	  Series              Bold
 	  Size                Huge
 	EndFont
+	TocLevel              1
+	IsTocCaption          0
 End
 
 
+OutlinerName plate        "Plates" #no AddToToc
+OutlinerName planotable  "Planotables" #no AddToToc
+
 Float
 	Type                  plate
 	GuiName               Plate
@@ -182,7 +191,8 @@ Float
 	Extension             lof
 	NumberWithin          none
 	Style                 plain
-	LatexBuiltin          true
+	IsPredefined          true
+	UsesFloatPkg          false
 End
 
 
@@ -193,36 +203,36 @@ Float
 	Extension             lot
 	NumberWithin          none
 	Style                 Ruled
-	LatexBuiltin          true
+	IsPredefined          true
+	UsesFloatPkg          false
 End
 
 
-
-Style Table_Caption
-	Margin                First_Dynamic
-	LatexType             Command
-	LatexName             tablecaption
-	NeedProtect           1
-	LabelSep              xx
-	ParSkip               0.4
-	TopSep                0.5
-	Align                 Center
-	AlignPossible         Center
-	LabelType             Sensitive
-	LabelString           "TableCaption"
-	LabelFont
-	  Series              Bold
-	EndFont
+InsetLayout Caption:Table
+	LabelString          table
+	LaTeXType            command
+	LatexName            tablecaption
+	NeedProtect          1
+	MultiPar             false
+	HTMLStyle
+		div.float-caption {
+			text-align: center;
+			border: 2px solid black;
+			padding: 1ex;
+			margin: 1ex;
+		}
+	EndHTMLStyle
+	HTMLClass   "float-caption float-caption-table"
 End
 
 
-Counter
-	Name                  plate
+Counter plate
+	GuiName Plate
 	Within                none
 End
 
 
-Counter
-	Name                  planotable
+Counter planotable
+	GuiName "Plano Table"
 	Within                none
 End