The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 56da307e19a8d3ddb60b8963b4cd710269d0930c
Author: Uwe Stöhr <[email protected]>
Date:   Mon Nov 26 06:05:23 2012 +0100

    achemso: complete revision of layout and example

diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx
index 4647554..88bac72 100644
--- a/lib/examples/achemso.lyx
+++ b/lib/examples/achemso.lyx
@@ -4,37 +4,10 @@
 \begin_header
 \textclass achemso
 \begin_preamble
-% Each author should be given as a separate \author command.
-%
-% Corresponding authors should have an e-mail given after the author
-% 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{[email protected]}
-\affiliation[University of Sometown]{University of Somewhere, Sometown, USA}
-\altaffiliation{Previous address: Minute University, Nowhereville, USA}
-\author{Indus Trialguy}
-\email{[email protected]}
-\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}
+% If issues arise when submitting your manuscript, you may want to
+% un-comment the next line. This provides information on the
+% version of every file you have used.
+%\listfiles
 \end_preamble
 \options journal=jacsat,manuscript=article
 \use_default_options false
@@ -132,8 +105,36 @@ status open
 \series bold
 Note:
 \series default
- The author, affiliation, email addresses, and the document title have to
- set up in the LaTeX preamble of this document!
+ The journal where you want to submit is specified in the document class
+ options of this file.
+\end_layout
+
+\end_inset
+
+
+\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
@@ -141,17 +142,60 @@ Note:
 
 \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
 
-\series bold
-Note:
-\series default
- The journal where you want to sumit is specified in the document class
- options of this file.
+\begin_layout Plain Layout
+
+\family sans
+Altaffiliation
+\family default
+ 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
@@ -159,6 +203,54 @@ Note:
 
 \end_layout
 
+\begin_layout Email
[email protected]
+\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
@@ -408,64 +500,41 @@ H2SO4
 
 \end_layout
 
-\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
+\begin_layout Acknowledgement
 Acknowledgments go here.
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-suppinfo
+\begin_layout SupplementalInfo
+Supplemental informations go here.
 \end_layout
 
-\end_inset
-
-
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-Optional
+\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 Standard
-Supplemental informations go here.
+\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
diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index eb4bd87..d209e7c 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -1,43 +1,43 @@
 #% 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)}
-# achemso textclass definition file.
+# textclass definition file for achemso 3.7c
 # Author: Uwe Stöhr ([email protected])
 
 Format 35
 
-Columns                 1
-Sides                   1
-SecNumDepth             3
-TocDepth                3
-DefaultStyle            Standard
+Columns                        1
+Sides                  1
+SecNumDepth            3
+TocDepth               3
+DefaultStyle           Standard
 
-Provides float 1
+Provides float         1
 
 ClassOptions
-       FontSize                10|11|12
+       FontSize        10|11|12
 end
 
 
 # This is just to show how to declare the default font.
 # The defaults are exactly those shown here.
 DefaultFont
-       Family                  Roman
-       Series                  Medium
-       Shape                   Up
-       Size                    Normal
-       Color                   None
+       Family          Roman
+       Series          Medium
+       Shape           Up
+       Size            Normal
+       Color           None
 EndFont
 
 
 Style Standard
-       Margin                  Static
-       LatexType               Paragraph
-       LatexName               dummy
-       ParIndent               MM
-       ParSkip                 0.4
-       Align                   Block
-       AlignPossible           Block, Left, Right, Center
-       LabelType               No_Label
+       Margin          Static
+       LatexType       Paragraph
+       LatexName       dummy
+       ParIndent       MM
+       ParSkip         0.4
+       Align           Block
+       AlignPossible   Block, Left, Right, Center
+       LabelType       No_Label
 End
 
 
@@ -52,221 +52,238 @@ NoCounter chapter
 NoStyle Chapter*
 
 Style Title
-  Margin                Static
-  LatexType             Command
-  Category              FrontMatter
-  InTitle               1
-  InPreamble            1
-  LatexName             title
-  ParSkip               0.4
-  ItemSep               0
-  TopSep                0
-  BottomSep             1
-  ParSep                1
-  Align                 Center
-  LabelType             No_Label
-  Font
-    Family              Sans
-    Size                Largest
-  EndFont
-  HTMLTag               h1
-  HTMLTitle             true
-  OptionalArgs          1
-End  
+       Margin          Static
+       LatexType       Command
+       Category        FrontMatter
+       InPreamble      1
+       LatexName       title
+       ParSkip         0.4
+       ItemSep         0
+       TopSep          0
+       BottomSep       0.7
+       ParSep          1
+       Align           Center
+       LabelType       No_Label
+       Font
+         Family        Sans
+         Size          Largest
+         Series        Bold
+         EndFont
+       HTMLTag         h1
+       HTMLTitle       true
+       OptionalArgs    1
+End
 
 Style Author
-  LatexType             command
-  LatexName             author
-  InTitle               1
-  InPreamble            1
-  Align                 Center
-  Font
-    Family              Sans
-    Size                Large
-  EndFont
+       LatexType       command
+       LatexName       author
+       Category        FrontMatter
+       InPreamble      1
+       TopSep          0.7
+       Align           Center
+       Font
+         Family        Sans
+         Size          Large
+       EndFont
 End
 
 Style Email
-  CopyStyle             Author
-  LatexName             email
+       CopyStyle       Author
+       LatexName       email
+       TopSep          1
+       Font
+         Size          Normal
+       EndFont
 End
 
 Style Affiliation
-  CopyStyle             Author
-  LatexName             affiliation
-  OptionalArgs          1
+       CopyStyle       Email
+       LatexName       affiliation
+       Font
+         Shape         Italic
+       EndFont
+       OptionalArgs    1
 End
 
 Style Alt_Affiliation
-  CopyStyle             Author
-  LatexName             altaffiliation
+       CopyStyle       Affiliation
+       LatexName       altaffiliation
+       TopSep          0.7
 End
 
 Style Also_Affiliation
-  CopyStyle             Author
-  LatexName             alsoaffiliation
+       CopyStyle       Affiliation
+       LatexName       alsoaffiliation
+       TopSep          0.5
 End
 
 Style Fax
-  CopyStyle             Author
-  LatexName             fax
+       CopyStyle       Email
+       LatexName       fax
+       TopSep          0
+       LabelSep        xx
+       LabelType       Static
+       LabelString     "Fax:"
 End
 
 Style Phone
-  CopyStyle             Author
-  LatexName             phone
+       CopyStyle       Fax
+       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
-       Type                    scheme
-       GuiName                 Scheme
-       Placement               tbp
-       Extension               los
-       NumberWithin            none
-       Style                   plain
-       ListName                "List of Schemes"
-       IsPredefined true
-       UsesFloatPkg true
+       Type            scheme
+       GuiName         Scheme
+       Placement       tbp
+       Extension       los
+       NumberWithin    none
+       Style           plain
+       ListName        "List of Schemes"
+       IsPredefined    true
+       UsesFloatPkg    true
 End
 
 InsetLayout scheme
-       LabelString             Scheme
+       LabelString     Scheme
        LabelFont
-         Color                 collapsable
-         Size                  Small
+         Color         collapsable
+         Size          Small
        EndFont
-       MultiPar                true
+       MultiPar        true
 End
 
 
 Float
-       Type                    chart
-       GuiName                 Chart
-       Placement               tbp
-       Extension               loc
-       NumberWithin            none
-       Style                   plain
-       ListName                "List of Charts"
-       IsPredefined true
-       UsesFloatPkg true
+       Type            chart
+       GuiName         Chart
+       Placement       tbp
+       Extension       loc
+       NumberWithin    none
+       Style           plain
+       ListName        "List of Charts"
+       IsPredefined    true
+       UsesFloatPkg    true
 End
 
 InsetLayout chart
-       LabelString             Chart
+       LabelString     Chart
        LabelFont
-         Color                 collapsable
-         Size                  Small
+         Color         collapsable
+         Size          Small
        EndFont
-       MultiPar                true
+       MultiPar        true
 End
 
 
 Float
-       Type                    graph
-       GuiName                 Graph
-       Placement               tbp
-       Extension               loh
-       NumberWithin            none
-       Style                   plain
-       ListName                "List of Graphs"
-       IsPredefined true
-       UsesFloatPkg true
+       Type            graph
+       GuiName         Graph
+       Placement       tbp
+       Extension       loh
+       NumberWithin    none
+       Style           plain
+       ListName        "List of Graphs"
+       IsPredefined    true
+       UsesFloatPkg    true
 End
 
 InsetLayout graph
-       LabelString             Graph
+       LabelString     Graph
        LabelFont
-         Color                 collapsable
-         Size                  Small
+         Color         collapsable
+         Size          Small
        EndFont
-       MultiPar                true
+       MultiPar        true
 End
 
-
-Style Abstract
-       Margin                  Static
-       LatexType               Environment
-       LatexName               abstract
-       Category                FrontMatter
-       InTitle                 1
-       NextNoIndent            1
-       LeftMargin              MMM
-       RightMargin             MMM
-       ParIndent               MM
-       ItemSep                 0
-       TopSep                  0.7
-       BottomSep               0.7
-       ParSep                  0
-       Align                   Block
-       AlignPossible           Block
-       LabelType               Centered_Top_Environment
-       LabelString             "Abstract"
-       LabelBottomSep          0.5
+# insert Abtract and Bibliography style
+Input stdstruct.inc
+
+Style Acknowledgement
+       CopyStyle       Abstract
+       LatexName       acknowledgement
+       Category        BackMatter
+       InTitle         0
+       BottomSep       0.7
+       LabelType       Top_Environment
+       LabelString     "Acknowledgement"
        Font
-         Size                  Small
+         Size          Normal
        EndFont
        LabelFont
-         Series                Bold
-         Size                  Large
+         Series        Bold
+         Size          Large
        EndFont
 End
 
+Style SupplementalInfo
+       CopyStyle       Acknowledgement
+       LatexName       suppinfo
+       LabelString     "Supporting Information Available"
+End
 
-InsetLayout Flex:Bibnote
-       LyxType                 custom
-       LatexType               command
-       LatexName               bibnote
-       LabelString             "bibnote"
-       Decoration              Classic
-       Font
-         Color                 foreground
-         Size                  Small
-         Family                Roman
-         Shape                 Up
-         Series                Medium
-         Misc                  No_Emph
-         Misc                  No_Noun
-         Misc                  No_Bar
-       EndFont
-       LabelFont
-         Size                  Small
-       EndFont
-       MultiPar                true
+Style TOC_entry
+       CopyStyle       Acknowledgement
+       LatexName       tocentry
+       ParSep          0.3
+       LabelString     "Graphical TOC Entry"
 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
+InsetLayout Flex:Bibnote
+       LyxType         custom
+       LatexType       command
+       LatexName       bibnote
+       LabelString     "bibnote"
+       Decoration      Classic
+       Font
+         Color         foreground
+         Size          Small
+         Family        Roman
+         Shape         Up
+         Series        Medium
+         Misc          No_Emph
+         Misc          No_Noun
+         Misc          No_Bar
+       EndFont
        LabelFont
-         Series                Bold
-         Size                  Larger
+         Size          Small
        EndFont
+       MultiPar        true
 End
 
 
 InsetLayout Flex:Chemistry
-       CopyStyle               Flex:Bibnote
-       LatexName               ce
-       LabelString             "chemistry"
+       CopyStyle       Flex:Bibnote
+       LatexName       ce
+       LabelString     "chemistry"
        Preamble
          \usepackage[version=3]{mhchem}
        EndPreamble
        LabelFont
-         Color                 blue
+         Color         blue
        EndFont
-       MultiPar                false
+       MultiPar        false
 End
+
diff --git a/status.20x b/status.20x
index bf4b797..e7bced2 100644
--- a/status.20x
+++ b/status.20x
@@ -43,6 +43,12 @@ What's new
 - Show a symbol on collapsed branches indicating whether they are
   active.
 
+- completely revised layout and example files for
+  - achemso
+  - modernCV (Note: Due to massive changes in the modernCV document class
+              you need to adapt your existing files according to the new
+              example file to keep them compilable.)
+
 
 * DOCUMENTATION AND LOCALIZATION
 

-----------------------------------------------------------------------

Summary of changes:
 lib/examples/achemso.lyx   |  237 +++++++++++++++++++-----------
 lib/layouts/achemso.layout |  355 +++++++++++++++++++++++---------------------
 status.20x                 |    6 +
 3 files changed, 345 insertions(+), 253 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to