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

diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 16b40613f4..00b20978e8 100644
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -1,219 +1,234 @@
-# AGUplus textclass definition file. 
+# AGUplus textclass definition file.
 # Author: Martin Vermeer <martin.vermeer@hut.fi>
 #
 # Necessary LaTeX files to be found on
 #
 # ftp://ftp.agu.org/journals/latex/journals
-#
-# Input general definitions
+
+
+Format 66
 Input stdclass.inc
 
-SecNumDepth     4
-MaxCounter      Counter_Section
+SecNumDepth             4
+
+Preamble
+	\usepackage{times}
+	\sectionnumbers
+EndPreamble
+
 
-# There are no chapters in an article.
 NoStyle Chapter
+NoCounter chapter
 NoStyle Chapter*
 
 NoStyle Subparagraph
+NoCounter subparagraph
 NoStyle Subparagraph*
 
-# Redefine these a bit:
 
 Style Section
 	Font
-	  Size        Large
+	  Size                Large
 	EndFont
+	TocLevel 1
 End
 
+
 Style Section*
 	Font
-	  Size        Large
+	  Size                Large
 	EndFont
 End
 
+
 Style Subsection
 	Font
-	  Size        Normal
+	  Size                Normal
 	EndFont
+	TocLevel 2
 End
 
+
 Style Subsection*
 	Font
-	  Size        Normal
+	  Size                Normal
 	EndFont
 End
 
-# Subsubsubsection style (re-)definition
+
 Style Paragraph
-	LatexName     subsubsection
+	LatexName             subsubsection
+	TocLevel 4
 End
 
-# SubSubsubsection* style (re-)definition
+
+Style Affiliation
+	CopyStyle             Author
+	LatexName             affil
+End
+
+
 Style Paragraph*
-	CopyStyle     Paragraph
-	Margin        Static
-	LatexName     subsubsubsection*
-	LabelType     No_Label
-	OptionalArgs      0
+	CopyStyle             Paragraph
+	Margin                Static
+	LatexName             subsubsubsection*
+	LabelType             No_Label
+	ResetArgs             1
 End
 
-Preamble
-\usepackage{times}
-\sectionnumbers
-EndPreamble
 
-# Headers style definition
 Style Left_Header
-	Margin        Static
-	LatexType     Command
-	LatexName     lefthead
-	NextNoIndent  1
-	LeftMargin    "Left Header:xx"
-	LabelSep      xxx
-	ParSkip       0.4
-	TopSep        1.3
-	BottomSep     0.7
-	ParSep        0.7
-	Align         Left
-	AlignPossible     Left
-	LabelType     Static
-	LabelString   "Left Header:"
+	Margin                Static
+	LatexType             Command
+	LatexName             lefthead
+	NextNoIndent          1
+	LeftMargin            "Left Header:xx"
+	LabelSep              xxx
+	ParSkip               0.4
+	TopSep                1.3
+	BottomSep             0.7
+	ParSep                0.7
+	Align                 Left
+	LabelType             Static
+	LabelString           "Left Header:"
 	InTitle               1
-
-	# standard font definition
 	LabelFont
-	  Series      Bold
-	  Shape       Italic
-	  Color       red
+	  Series              Bold
+	  Shape               Italic
+	  Color               red
 	EndFont
-
 End
 
+
 Style Right_Header
-	CopyStyle             "Left Header"
-	LatexName     righthead
-	LeftMargin    "Right Header:xx"
-	LabelString   "Right Header:"
+	CopyStyle             Left_Header
+	LatexName             righthead
+	LeftMargin            "Right Header:xx"
+	LabelString           "Right Header:"
 End
 
+
 Style Received
-	CopyStyle             "Left Header"
-	LatexName     received
-	LeftMargin    Received:xx
-	LabelString   Recieved:
+	CopyStyle             Left_Header
+	LatexName             received
+	LeftMargin            Received:xx
+	LabelString           "Received:"
 End
 
+
 Style Revised
-	CopyStyle             "Left Header"
-	LatexName     revised
-	LeftMargin    Revised:xx
-	LabelString   Revised:
+	CopyStyle             Left_Header
+	LatexName             revised
+	LeftMargin            Revised:xx
+	LabelString           "Revised:"
 End
 
+
 Style Accepted
-	CopyStyle             "Left Header"
-	LatexName     accepted
-	LeftMargin    Accepted:xx
-	LabelString   Accepted:
+	CopyStyle             Left_Header
+	LatexName             accepted
+	LeftMargin            Accepted:xx
+	LabelString           "Accepted:"
 End
 
+
 Style CCC
-	CopyStyle             "Left Header"
-	LatexName     ccc
-	LeftMargin    "CCC code:xx"
-	LabelString   "CCC code:"
+	CopyStyle             Left_Header
+	LatexName             ccc
+	LeftMargin            "CCC code:xx"
+	LabelString           "CCC code:"
 End
 
-# cpright
 
+# cpright
 # journalid
-
 # articleid
 
+
 Style PaperId
-	CopyStyle             "Left Header"
-	LatexName     paperid
-	LeftMargin    "Paper Id:xx"
-	LabelString   "Paper Id:"
+	CopyStyle             Left_Header
+	LatexName             paperid
+	LeftMargin            "Paper Id:xx"
+	LabelString           "Paper Id:"
 End
 
+
 Style AuthorAddr
-	CopyStyle             "Left Header"
-	LatexName     authoraddr
-	LeftMargin    "Author Address:xx"
-	LabelString   "Author Address:"
+	CopyStyle             Left_Header
+	LatexName             authoraddr
+	LeftMargin            "Author Address:xx"
+	LabelString           "Author Address:"
 End
 
+
 Style SlugComment
-	CopyStyle             "Left Header"
-	LatexName     slugcomment
-	LeftMargin    "Slug Comment:xx"
-	LabelString   "Slug Comment:"
+	CopyStyle             Left_Header
+	LatexName             slugcomment
+	LeftMargin            "Slug Comment:xx"
+	LabelString           "Slug Comment:"
 End
 
 
-# a few changes to the bibliography
 Style Bibliography
 	TopSep                4
-	LabelString           Bibliography
-
-	# label font definition
-	LabelFont 
+	LabelString           "Bibliography"
+	LabelFont
 	  Series              Bold
 	  Size                Huge
 	EndFont
 End
 
-# plate
+
+OutlinerName plate        "Plates" #no AddToToc
+OutlinerName planotable  "Planotables" #no AddToToc
+
 Float
 	Type                  plate
 	GuiName               Plate
 	Placement             htbp
 	Extension             lof
-	NumberWithin  none
+	NumberWithin          none
 	Style                 plain
-	LatexBuiltin  true
+	IsPredefined          true
+	UsesFloatPkg          false
 End
 
-# planotable
+
 Float
 	GuiName               Planotable
 	Type                  planotable
 	Placement             htbp
 	Extension             lot
-	NumberWithin  none
+	NumberWithin          none
 	Style                 Ruled
-	LatexBuiltin  true
+	IsPredefined          true
+	UsesFloatPkg          false
 End
 
 
-# Table Caption style definition
-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
-
-	# label font definition
-	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
-	Within        none
+
+Counter plate
+	Within                none
 End
 
-Counter
-	Name          planotable
-	Within        none
+
+Counter planotable
+	Within                none
 End