X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faguplus.inc;h=00b20978e8006783c1a921e3975a2664a489a0e3;hb=8d8ee12e6481a2d9687228a4a5f9dd44a21a052e;hp=0d2737ab7337d929308ded6bbf04ce66b810e6ca;hpb=3e885523c305c260a52c4b6e65047bc6f5f3a867;p=lyx.git

diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 0d2737ab73..00b20978e8 100644
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -6,9 +6,8 @@
 # ftp://ftp.agu.org/journals/latex/journals
 
 
-Format 2
+Format 66
 Input stdclass.inc
-Input numarticle.inc
 
 SecNumDepth             4
 
@@ -19,9 +18,11 @@ EndPreamble
 
 
 NoStyle Chapter
+NoCounter chapter
 NoStyle Chapter*
 
 NoStyle Subparagraph
+NoCounter subparagraph
 NoStyle Subparagraph*
 
 
@@ -29,6 +30,7 @@ Style Section
 	Font
 	  Size                Large
 	EndFont
+	TocLevel 1
 End
 
 
@@ -43,6 +45,7 @@ Style Subsection
 	Font
 	  Size                Normal
 	EndFont
+	TocLevel 2
 End
 
 
@@ -55,6 +58,7 @@ End
 
 Style Paragraph
 	LatexName             subsubsection
+	TocLevel 4
 End
 
 
@@ -69,7 +73,7 @@ Style Paragraph*
 	Margin                Static
 	LatexName             subsubsubsection*
 	LabelType             No_Label
-	OptionalArgs          0
+	ResetArgs             1
 End
 
 
@@ -85,7 +89,6 @@ Style Left_Header
 	BottomSep             0.7
 	ParSep                0.7
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Left Header:"
 	InTitle               1
@@ -176,6 +179,9 @@ Style Bibliography
 End
 
 
+OutlinerName plate        "Plates" #no AddToToc
+OutlinerName planotable  "Planotables" #no AddToToc
+
 Float
 	Type                  plate
 	GuiName               Plate
@@ -183,7 +189,8 @@ Float
 	Extension             lof
 	NumberWithin          none
 	Style                 plain
-	LatexBuiltin          true
+	IsPredefined          true
+	UsesFloatPkg          false
 End
 
 
@@ -194,36 +201,34 @@ 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
+	HTMLAttr "class='float-caption float-caption-table'"
 End
 
 
-Counter
-	Name                  plate
+Counter plate
 	Within                none
 End
 
 
-Counter
-	Name                  planotable
+Counter planotable
 	Within                none
 End