apa6 layout: update format, categorize properly, and whitespace.

IMHO we should take care that layout submissions to trunk are at least properly categorized

lib/layouts/apa6.layout

@@ -1,8 +1,9 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[apa6,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{article (APA6)}
+#  \DeclareLaTeXClass[apa,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{American Psychological Association (APA), v. 6}
+#  \DeclareCategory{Articles}
 # Author: Jacob Bishop <bishop.jacob@gmail.com> based on the apa 
 # layout written by Randy Gobbel.
-Format 35
+Format 42
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -355,7 +356,10 @@ Style CenteredCaption
 	Align                 Center
 	LabelType             Sensitive
 	LabelString           "Senseless!"
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The caption as it appears in the list of figures/tables"
+	EndArgument
 	LabelFont
 	  Series              Bold
 	EndFont
@@ -464,6 +468,10 @@ Style Itemize
 	AlignPossible         Block, Left
 	LabelType             Itemize
 	LabelString           "*"
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
 
@@ -484,6 +492,10 @@ Style Enumerate
 	AlignPossible         Block, Left
 	LabelType             Enumerate
 	RefPrefix             enu
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
 
@@ -508,4 +520,3 @@ Style Seriate
 	LabelStringAppendix   "(\alph{enumii})"
 	RefPrefix             ser
 End
-