Revert "achemso: complete revision of layout and example"

This reverts commit 56da307e19.

Revert the achemso.layout changes because they were not that pressing  (preamble stuff was supported via styles).

For modernCV I don't see another way than to let it in because it is not working as it was, neither with TeXLive 2012 nor with MiKTeX and therefore in most cases unusable

lib/examples/achemso.lyx

@@ -4,10 +4,37 @@
 \begin_header
 \textclass achemso
 \begin_preamble
-% If issues arise when submitting your manuscript, you may want to
+% Each author should be given as a separate \author command.
-% un-comment the next line. This provides information on the
+%
-% version of every file you have used.
+% Corresponding authors should have an e-mail given after the author
-%\listfiles
+% name as an \email command.
+%
+% The affiliation of authors is given after the authors; each
+% \affiliation command applies to all preceding authors not already
+% assigned an affiliation.
+%
+% The affiliation takes an option argument for the short name.  This
+% will typically be something like "University of Somewhere".
+%
+% Notice that \alsoaffiliation is used when one (or more) authors work
+% at multiple institutions, while \altaffiliation is intended for previous
+% addresses (or other notes). Only \affiliation applies to multiple
+% authors: both \alsoaffiliation and \altaffiliation are set on a per
+% author basis.
+
+\author{Author Person}
+\author{Second Bloke}
+\email{second.bloke@some.place}
+\affiliation[University of Sometown]{University of Somewhere, Sometown, USA}
+\altaffiliation{Previous address: Minute University, Nowhereville, USA}
+\author{Indus Trialguy}
+\email{i.trialguy@sponsor.co}
+\affiliation[SponsoCo]{Research Department, SponsorCo, BigCity, USA}
+\alsoaffiliation{University of Somewhere, Sometown, USA}
+
+% A short title can be given as a *suggestion* for running headers.
+\title[\texttt{achemso} demonstration]
+{A demonstration of the \textsf{achemso} \LaTeX class}
 \end_preamble
 \options journal=jacsat,manuscript=article
 \use_default_options false
@@ -105,8 +132,8 @@ status open
 \series bold
 Note:
 \series default
- The journal where you want to submit is specified in the document class
+ The author, affiliation, email addresses, and the document title have to
- options of this file.
+ set up in the LaTeX preamble of this document!
 \end_layout
 
 \end_inset
@@ -114,88 +141,17 @@ Note:
 
 \end_layout
 
-\begin_layout Title
-A demonstration of the achemso LaTeX class
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-
-\family sans
-achemso
-\family default
- demonstration
-\end_layout
-
-\end_inset
-
-
-\begin_inset Foot
-status open
-
-\begin_layout Plain Layout
-A footnote for the title
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Author
-Andrew N.
- Other
-\end_layout
-
-\begin_layout Alt Affiliation
-A shared footnote
-\end_layout
-
-\begin_layout Author
-Fred T.
- Secondauthor
-\end_layout
-
-\begin_layout Affiliation
-Current address: Some other place, Othertöwn, Germany
-\end_layout
-
-\begin_layout Author
-I.
- Ken Groupleader
-\end_layout
-
-\begin_layout Affiliation
-A shared footnote
-\end_layout
-
 \begin_layout Standard
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
-The affiliation of authors is given after the authors; each 
-\family sans
-Affiliation
-\family default
- applies to all preceding authors not already assigned an affiliation.
-\end_layout
 
-\begin_layout Plain Layout
+\series bold
-
+Note:
-\family sans
+\series default
-Altaffiliation
+ The journal where you want to sumit is specified in the document class
-\family default
+ options of this file.
- should be used for new address, etc.
-\end_layout
-
-\begin_layout Plain Layout
-
-\family sans
-Alsoaffiliation
-\family default
- is used on a per author basis when authors are associated with multiple
- institutions.
 \end_layout
 
 \end_inset
@@ -203,54 +159,6 @@ Alsoaffiliation
 
 \end_layout
 
-\begin_layout Email
-i.k.groupleader@unknown.uu
-\end_layout
-
-\begin_layout Phone
-+123 (0)123 4445556
-\end_layout
-
-\begin_layout Fax
-+123 (0)123 4445557
-\end_layout
-
-\begin_layout Affiliation
-Department of Chemistry, Unknown University, Unknown Town
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Unknown University
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Also Affiliation
-Department of Chemistry, Second University, Nearby Town
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Second University
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Abbreviations
-IR,NMR,UV
-\end_layout
-
-\begin_layout Keywords
-American Chemical Society, LaTeX
-\end_layout
-
 \begin_layout Abstract
 This is the abstract.
 \end_layout
@@ -500,43 +408,66 @@ H2SO4
 
 \end_layout
 
-\begin_layout Acknowledgement
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+acknowledgement
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Optional
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 Acknowledgments go here.
 \end_layout
 
-\begin_layout SupplementalInfo
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+suppinfo
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Optional
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 Supplemental informations go here.
 \end_layout
 
-\begin_layout TOC entry
-Some journals require a graphical entry for the Table of Contents.
- This should be laid out ``print ready'' so that the sizing of the text
- is correct.
-\end_layout
-
-\begin_layout TOC entry
-The surrounding frame is 9
-\begin_inset space \thinspace{}
-\end_inset
-
-cm by 3.5
-\begin_inset space \thinspace{}
-\end_inset
-
-cm, which is the maximum permitted for 
-\emph on
-Journal of the American Chemical Society
-\emph default
- graphical table of content entries.
- The box will not resize if the content is too big: instead it will overflow
- the edge of the box.
-\end_layout
-
-\begin_layout TOC entry
-This box and the associated title will always be printed on a separate page
- at the end of the document.
-\end_layout
-
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex

lib/layouts/achemso.layout

@@ -1,6 +1,6 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[achemso,caption.sty,courier.sty,cleveref.sty,float.sty,helvet.sty,mathptmx.sty,mciteplus.sty,natbib.sty,natmove.sty,setspace.sty,xkeyval.sty]{article (ACS)}
-# textclass definition file for achemso 3.7c
+# achemso textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)
 
 Format 35
@@ -55,19 +55,19 @@ Style Title
 	Margin                Static
 	LatexType             Command
 	Category              FrontMatter
+	InTitle               1
 	InPreamble            1
 	LatexName             title
 	ParSkip               0.4
 	ItemSep               0
 	TopSep                0
-	BottomSep	0.7
+	BottomSep             1
 	ParSep                1
 	Align                 Center
 	LabelType             No_Label
 	Font
 	  Family              Sans
 	  Size                Largest
-	  Series	Bold
 	EndFont
 	HTMLTag               h1
 	HTMLTitle             true
@@ -77,9 +77,8 @@ End
 Style Author
 	LatexType             command
 	LatexName             author
-	Category	FrontMatter
+	InTitle               1
 	InPreamble            1
-	TopSep		0.7
 	Align                 Center
 	Font
 	  Family              Sans
@@ -90,66 +89,32 @@ End
 Style Email
 	CopyStyle             Author
 	LatexName             email
-	TopSep		1
-	Font
-	  Size		Normal
-	EndFont
 End
 
 Style Affiliation
-	CopyStyle	Email
+	CopyStyle             Author
 	LatexName             affiliation
-	Font
-	  Shape		Italic
-	EndFont
 	OptionalArgs          1
 End
 
 Style Alt_Affiliation
-	CopyStyle	Affiliation
+	CopyStyle             Author
 	LatexName             altaffiliation
-	TopSep		0.7
 End
 
 Style Also_Affiliation
-	CopyStyle	Affiliation
+	CopyStyle             Author
 	LatexName             alsoaffiliation
-	TopSep		0.5
 End
 
 Style Fax
-	CopyStyle	Email
+	CopyStyle             Author
 	LatexName             fax
-	TopSep		0
-	LabelSep	xx
-	LabelType	Static
-	LabelString	"Fax:"
 End
 
 Style Phone
-	CopyStyle	Fax
+	CopyStyle             Author
 	LatexName             phone
-	LabelString	"Phone:"
-	TopSep		0.5
-End
-
-Style Abbreviations
-	CopyStyle	Fax
-	Margin		Dynamic
-	LatexName	abbreviations
-	TopSep		1
-	Align		Left
-	LabelString	"Abbreviations:"
-	LabelFont
-	  Color		Blue
-	EndFont
-End
-
-Style Keywords
-	CopyStyle	Abbreviations
-	LatexName	keywords
-	LabelString	"Keywords:"
-	TopSep		0.3
 End
 
 Float
@@ -217,19 +182,28 @@ InsetLayout graph
 	MultiPar		true
 End
 
-# insert Abtract and Bibliography style
-Input stdstruct.inc
 
-Style Acknowledgement
+Style Abstract
-	CopyStyle	Abstract
+	Margin			Static
-	LatexName	acknowledgement
+	LatexType		Environment
-	Category	BackMatter
+	LatexName		abstract
-	InTitle		0
+	Category		FrontMatter
+	InTitle			1
+	NextNoIndent		1
+	LeftMargin		MMM
+	RightMargin		MMM
+	ParIndent		MM
+	ItemSep			0
+	TopSep			0.7
 	BottomSep		0.7
-	LabelType	Top_Environment
+	ParSep			0
-	LabelString	"Acknowledgement"
+	Align			Block
+	AlignPossible		Block
+	LabelType		Centered_Top_Environment
+	LabelString		"Abstract"
+	LabelBottomSep		0.5
 	Font
-	  Size		Normal
+	  Size			Small
 	EndFont
 	LabelFont
 	  Series		Bold
@@ -237,19 +211,6 @@ Style Acknowledgement
 	EndFont
 End
 
-Style SupplementalInfo
-	CopyStyle	Acknowledgement
-	LatexName	suppinfo
-	LabelString	"Supporting Information Available"
-End
-
-Style TOC_entry
-	CopyStyle	Acknowledgement
-	LatexName	tocentry
-	ParSep		0.3
-	LabelString	"Graphical TOC Entry"
-End
-
 
 InsetLayout Flex:Bibnote
 	LyxType			custom
@@ -274,6 +235,29 @@ InsetLayout Flex:Bibnote
 End
 
 
+Style Bibliography
+	Margin			First_Dynamic
+	LatexType		Bib_Environment
+	LatexName		thebibliography
+	NextNoIndent		1
+	LeftMargin		MM
+	ParSkip			0.4
+	ItemSep			0
+	TopSep			0.7
+	BottomSep		0.7
+	ParSep			0.5
+	Align			Block
+	AlignPossible		Block, Left
+	LabelType		Bibliography
+	LabelString		"References"
+	LabelBottomSep		1.2
+	LabelFont
+	  Series		Bold
+	  Size			Larger
+	EndFont
+End
+
+
 InsetLayout Flex:Chemistry
 	CopyStyle		Flex:Bibnote
 	LatexName		ce
@@ -286,4 +270,3 @@ InsetLayout Flex:Chemistry
 	EndFont
 	MultiPar		false
 End
-