X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fapa.layout;h=f631428d93a7a497a68791789aaa85c8508eff96;hb=f8f9eec358c5dcd45665defed13d51c0b304fb8e;hp=bb608397451da77c096890d9350ce4163dcc7d1d;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index bb60839745..f631428d93 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -1,311 +1,426 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[apa,apacite.sty]{APA style}
+#  \DeclareLaTeXClass[apa,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{American Psychological Association (APA)}
+#  \DeclareCategory{Articles}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>
 
-# General textclass parameters
-# Description	"APA style"
-Columns		1
-Sides		1
-PageStyle	Headers
-MaxCounter	Counter_Section
+Format 68
+Columns                 1
+Sides                   1
+PageStyle               Headers
+
 
 ClassOptions
-  Other	"man"
-  FontSize	6|8|10|12
+	Other "man"
+	FontSize              6|8|10|12
 End
 
+
 Preamble
-\helvetica
-\author{Author} % hack around some bugs in apa.cls
-\affiliation{Affiliation} % hack around some bugs in apa.cls
+	\helvetica
+	\author{Author} % hack around some bugs in apa.cls
+	\affiliation{Affiliation} % hack around some bugs in apa.cls
 EndPreamble
 
-DefaultFont
-  Family	Roman
-  Series	Medium
-  Shape		Up
-  Size		Normal
-  Color		None
-EndFont
 
 Style Standard
-  LatexName 	dummy
-  LatexType	Paragraph
-  Margin	Static
-  ParIndent	MM
-  ParSkip 	0.4
-  ParSep	0.4
-  TopSep	1.0
-  BottomSep	1.0
-  Align 	Block
-  AlignPossible Block, Left, Right, Center
-  LabelType 	No_Label
+	Category              MainText
+	LatexName             dummy
+	LatexType             Paragraph
+	Margin                Static
+	ParIndent             MM
+	ParSkip               0.4
+	ParSep                0.4
+	TopSep                1.0
+	BottomSep             1.0
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	LabelType             No_Label
 End
 
+
 Style Title
-  LatexName	title
-  LatexType	Command
-  InTitle	1
-  Font
-    Size	Huge
-  EndFont
-  Align		Center
+	Category              FrontMatter
+	LatexName             title
+	LatexType             Command
+	InTitle               1
+	Font
+	  Size                Huge
+	EndFont
+	Align                 Center
+	HTMLTitle             true
 End
 
+
 Style RightHeader
-  LatexName	rightheader
-  LatexType	Command
-  InTitle	1
-  Font
-    Size	Small
-    Shape	SmallCaps
-  EndFont
-  Labeltype	Static
-  LabelString	"Right header: "
-  Labelsep	M
-  LabelFont
-    Series	Bold
-    Size	Small
-  EndFont
-  Align		Right
-  AlignPossible	Right
+	LatexName             rightheader
+	LatexType             Command
+	InTitle               1
+	Font
+	  Size                Small
+	  Shape               SmallCaps
+	EndFont
+	Labeltype             Static
+	LabelString           "Right header:"
+	Labelsep              M
+	LabelFont
+	  Series              Bold
+	  Size                Small
+	EndFont
+	Align                 Right
 End
 
+
 Style Abstract
-  LatexName	abstract
-  LatexType	Command
-  InTitle	1
-  Font
-    Size	Small
-  EndFont
-  Margin	Dynamic
-  LeftMargin	MMN
-  RightMargin	MMN
-  Align		Block
-  AlignPossible	Block, Left, Right, Center
-  Labeltype	Static
-  LabelString	"Abstract: "
-  Labelsep	M
-  LabelFont
-    Series	Bold
-    Size	Small
-  EndFont
+	Category              FrontMatter
+	LatexName             abstract
+	LatexType             Command
+	InTitle               1
+	Font
+	  Size                Small
+	EndFont
+	Margin                Dynamic
+	LeftMargin            MMN
+	RightMargin           MMN
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	Labeltype             Static
+	LabelString           "Abstract:"
+	Labelsep              M
+	LabelFont
+	  Series              Bold
+	  Size                Small
+	EndFont
 End
 
+
 Style ShortTitle
-  LatexName	shorttitle
-  LatexType	Command
-  InTitle	1
-  Align		Left
-  AlignPossible	Left, Right, Center
-  Margin	Dynamic
-  Labeltype	Static
-  LabelString	"Short title: "
-  Labelsep	M
-  Font
-    Shape	SmallCaps
-    Size	Small
-  EndFont
-  LabelFont
-    Series	Bold
-    Size	Small
-    Shape	Up
-  EndFont
+	Category              FrontMatter
+	LatexName             shorttitle
+	LatexType             Command
+	InTitle               1
+	Align                 Left
+	AlignPossible         Left, Right, Center
+	Margin                Dynamic
+	Labeltype             Static
+	LabelString           "Short title:"
+	Labelsep              M
+	Font
+	  Shape               SmallCaps
+	  Size                Small
+	EndFont
+	LabelFont
+	  Series              Bold
+	  Size                Small
+	  Shape               Up
+	EndFont
 End
 
+
 Style Author
-  LatexName	author
-  LatexType	Command
-  InTitle	1
-  Align		Center
-  AlignPossible	Left, Right, Center
-  TopSep	0.5
-  BottomSep	0.5
-  Font
-    Shape	Italic
-    Size	Small
-  EndFont
+	Category              FrontMatter
+	LatexName             author
+	LatexType             Command
+	InTitle               1
+	Align                 Center
+	AlignPossible         Left, Right, Center
+	TopSep                0.5
+	BottomSep             0.5
+	Font
+	  Shape               Italic
+	  Size                Small
+	EndFont
 End
 
+
 Style TwoAuthors
-  LatexName	twoauthors
-  LatexType	Command
-  InTitle	1
+	Category              FrontMatter
+	LatexName             twoauthors
+	LatexType             Command
+	InTitle               1
 End
 
+
 Style ThreeAuthors
-  LatexName	threeauthors
-  LatexType	Command
-  InTitle	1
+	Category              FrontMatter
+	LatexName             threeauthors
+	LatexType             Command
+	InTitle               1
 End
 
+
 Style FourAuthors
-  LatexName	fourauthors
-  LatexType	Command
-  InTitle	1
+	Category              FrontMatter
+	LatexName             fourauthors
+	LatexType             Command
+	InTitle               1
 End
 
+
 Style Affiliation
-  LatexName	affiliation
-  LatexType	Command
-  InTitle	1
-  Margin	Dynamic
-  ParSkip	0.4
-  BottomSep	1.5
-  TopSep	1.5
-  ParSep	1.5
-  Align		Left
-  AlignPossible	Block, Left, Right, Center
-  LabelType	Static
-  LabelString	"Affiliation: "
-  Labelsep	M
-  LabelFont
-    Series	Bold
-    Size	Small
-  EndFont
+	Category              FrontMatter
+	LatexName             affiliation
+	LatexType             Command
+	InTitle               1
+	Margin                Dynamic
+	ParSkip               0.4
+	BottomSep             1.5
+	TopSep                1.5
+	ParSep                1.5
+	Align                 Left
+	AlignPossible         Block, Left, Right, Center
+	LabelType             Static
+	LabelString           "Affiliation:"
+	Labelsep              M
+	LabelFont
+	  Series              Bold
+	  Size                Small
+	EndFont
 End
 
+
 Style TwoAffiliations
-  LatexName	twoaffiliations
-  LatexType	Command
-  InTitle	1
+	Category              FrontMatter
+	LatexName             twoaffiliations
+	LatexType             Command
+	InTitle               1
 End
 
+
 Style ThreeAffiliations
-  LatexName	threeaffiliations
-  LatexType	Command
-  InTitle	1
+	Category              FrontMatter
+	LatexName             threeaffiliations
+	LatexType             Command
+	InTitle               1
 End
 
+
 Style FourAffiliations
-  LatexName	fouraffiliations
-  LatexType	Command
-  InTitle	1
+	Category              FrontMatter
+	LatexName             fouraffiliations
+	LatexType             Command
+	InTitle               1
 End
 
-Style Journal
-  LatexName	journal
-  LatexType	Command
-  InTitle	1
-End
 
 Style Copyright
-  LatexName	ccoppy
-  LatexType	Command
-  InTitle	1
+	LatexName             ccoppy
+	LatexType             Command
+	InTitle               1
 End
 
-Style CopNum
-  LatexName	copnum
-  LatexType	Command
-  InTitle	1
-End
 
-Style Note
-  LatexName	note
-  LatexType	Command
-  Font
-    Size	Small
-  EndFont
+Style Acknowledgements
+	Category              BackMatter
+	LatexName             acknowledgements
+	LatexType             Command
+	Font
+	  Size                Small
+	EndFont
+	Margin                Dynamic
+	LeftMargin            MMN
+	RightMargin           MMN
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	Labeltype             Static
+	LabelString           "Acknowledgements:"
+	Labelsep              M
+	LabelFont
+	  Series              Bold
+	  Size                Small
+	EndFont
 End
 
+
 Style Acknowledgments
-  LatexName	acknowledgments
-  LatexType	Command
+	ObsoletedBy           Acknowledgements
 End
 
+
 Style ThickLine
-  LatexName	thickline
-  LatexType	Command
-  KeepEmpty	1
+	LatexName             thickline
+	LatexType             Command
+	KeepEmpty             1
 End
 
+
+
 Input stdlayouts.inc
 
-Style CenteredCaption
-  CopyStyle	Caption
-  LatexName	centeredcaption
-  Align		Center
-  AlignPossible	Center
+
+InsetLayout Caption:Centered
+	LabelString          standard
+	LaTeXType            command
+	LatexName            centeredcaption
+	NeedProtect          1
+	MultiPar             false
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The caption as it appears in the list of figures/tables"
+		InsertCotext  1
+	EndArgument
+	HTMLStyle
+		div.float-caption {
+			text-align: center;
+			border: 2px solid black;
+			padding: 1ex;
+			margin: 1ex;
+		}
+	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-centered'"
 End
 
+
 Style FitFigure
-  LatexName	fitfigure
-  LatexType	Command
+	LatexName             fitfigure
+	LatexType             Command
 End
 
+
 Style FitBitmap
-  LatexName	fitbitmap
-  LatexType	Command
+	LatexName             fitbitmap
+	LatexType             Command
 End
 
-############### Sections.
-# First the standard numbered definitions
+
 Input stdsections.inc
-# then define the unumbered sections, based on the numbered ones.
 Input stdstarsections.inc
+Input stdinsets.inc
+
+Input stdfloats.inc
+Input stdcounters.inc
+
+NoStyle Part
+NoCounter part
+NoStyle Part*
+NoStyle Chapter
+NoCounter chapter
+NoStyle Chapter*
+NoStyle Section*
+NoStyle Subsection*
+NoStyle Subsubsection*
+NoStyle Paragraph*
+NoStyle Subparagraph*
+
+
+Style Section
+	LabelType             No_Label
+	Align                 Center
+	Font
+	  Series              Bold
+	  Size                Huge
+	EndFont
+	TocLevel              1
+End
+
+
+Style Subsection
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Larger
+	EndFont
+	TocLevel              2
+End
+
+
+Style Subsubsection
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Large
+	EndFont
+	TocLevel              3
+End
+
+
+Style Paragraph
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Normal
+	EndFont
+	TocLevel              4
+End
+
+
+Style Subparagraph
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Normal
+	  Shape               Italic
+	EndFont
+	TocLevel 5
+End
+
 
-# remove the layouts that we do not need.
-NoStyle	Part
-NoStyle	Section
-NoStyle	Subsection
-NoStyle	Subsubsection
-NoStyle	Chapter
-NoStyle	Paragraph
-NoStyle	Subparagraph
-NoStyle	Chapter*
-
-# Itemize style definition
 Style Itemize
-  Margin		Static
-  LatexType		Item_Environment
-  LatexName		APAitemize
-  NextNoIndent		1
-  LeftMargin		MMN
-  LabelSep		xx
-  ItemSep		0.2
-  TopSep		0.7
-  BottomSep		0.7
-  ParSep		0.3
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Static
-  LabelString		*
+	Category              List
+	Margin                Static
+	LatexType             Item_Environment
+	LatexName             APAitemize
+	NextNoIndent          1
+	ToggleIndent          Never
+	LeftMargin            MMN
+	LabelSep              xx
+	ItemSep               0.2
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.3
+	Align                 Block
+	AlignPossible         Block, Left
+	LabelType             Itemize
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
-# Enumerate style definition
+
 Style Enumerate
-  Margin		Static
-  LatexType		Item_Environment
-  LatexName		APAenumerate
-  NextNoIndent		1
-  LeftMargin		MMN
-  LabelSep		xx
-  ParSkip		0.0
-  ItemSep		0.2
-  TopSep		0.7
-  BottomSep		0.7
-  ParSep		0.3
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_EnumI
+	Category              List
+	Margin                Static
+	LatexType             Item_Environment
+	LatexName             APAenumerate
+	NextNoIndent          1
+	ToggleIndent          Never
+	LeftMargin            MMN
+	LabelSep              xx
+	ParSkip               0.0
+	ItemSep               0.2
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.3
+	Align                 Block
+	AlignPossible         Block, Left
+	LabelType             Enumerate
+	RefPrefix             enu
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
-#seriate style definition
+
 Style Seriate
-  Margin		Static
-  LatexType		Item_Environment
-  LatexName		seriate
-  NextNoIndent		1
-  LeftMargin		MMN
-  LabelSep		x
-  ParSkip		0.0
-  ItemSep		0.9
-  TopSep		0.5
-  BottomSep		0.5
-  ParSep		0.0
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_EnumII
+	Category              List
+	Margin                Static
+	LatexType             Item_Environment
+	LatexName             seriate
+	NextNoIndent          1
+	LeftMargin            MMN
+	LabelSep              x
+	ParSkip               0.0
+	ItemSep               0.9
+	TopSep                0.5
+	BottomSep             0.5
+	ParSep                0.0
+	Align                 Block
+	AlignPossible         Block, Left
+	LabelType             Static
+	LabelCounter          enumii
+	LabelString           "(\alph{enumii})"
+	LabelStringAppendix   "(\alph{enumii})"
+	RefPrefix             ser
 End