diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh index 814ec99d5d..dcdacba108 100644 --- a/development/Win32/packaging/AltInstaller/Updated.nsh +++ b/development/Win32/packaging/AltInstaller/Updated.nsh @@ -20,8 +20,11 @@ Function UpdateModifiedFiles SetOutPath "$INSTDIR\Resources\doc\fr" File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\UserGuide.lyx" SetOutPath "$INSTDIR\Resources\examples" + File "${PRODUCT_SOURCEDIR}\Resources\examples\achemso.lyx" + File "${PRODUCT_SOURCEDIR}\Resources\examples\biblioExample.bib" File "${PRODUCT_SOURCEDIR}\Resources\examples\seminar.lyx" SetOutPath "$INSTDIR\Resources\layouts" + File "${PRODUCT_SOURCEDIR}\Resources\layouts\achemso.layout" File "${PRODUCT_SOURCEDIR}\Resources\layouts\amsbook.layout" SetOutPath "$INSTDIR\Resources\lyx2lyx" # always here File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx2lyx_version.py" # always here diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index a96b2c1b19..1b51fb3e25 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -2309,14 +2309,9 @@ lib_doc_uk_clipart_files = Split(''' lib_examples_files = Split(''' - Braille.lyx - CV-image.eps - CV-image.png - Foils.lyx - ItemizeBullets.lyx - Literate.lyx aa_sample.lyx aas_sample.lyx + achemso.lyx addressExample.adr amsart-test.lyx amsbook-test.lyx @@ -2334,18 +2329,24 @@ lib_examples_files = Split(''' beamer-knight4.png beamerlyxexample1.lyx biblioExample.bib + Braille.lyx chess-article.lyx chessgame.lyx + CV-image.eps + CV-image.png docbook_article.lyx europeCV.lyx example_lyxified.lyx example_raw.lyx + Foils.lyx iecc05.fen iecc07.fen iecc12.fen + ItemizeBullets.lyx landslide.lyx linguistics.lyx listerrors.lyx + Literate.lyx modernCV.lyx multicol.lyx noweb2lyx.lyx @@ -2529,6 +2530,7 @@ lib_layouts_files = Split(''' aa.layout aapaper.layout aastex.layout + achemso.layout agu-dtd.layout agums.layout amsart.layout diff --git a/lib/Makefile.am b/lib/Makefile.am index 4c990594af..12db219cc3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -192,6 +192,7 @@ dist_examples_DATA = \ examples/Literate.lyx \ examples/aa_sample.lyx \ examples/aas_sample.lyx \ + examples/achemso.lyx \ examples/addressExample.adr \ examples/amsart-test.lyx \ examples/amsbook-test.lyx \ @@ -942,6 +943,7 @@ dist_layouts_DATA =\ layouts/aapaper.inc \ layouts/aapaper.layout \ layouts/aastex.layout \ + layouts/achemso.layout \ layouts/agu-dtd.layout \ layouts/agu_stdclass.inc \ layouts/agu_stdcounters.inc \ diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx new file mode 100644 index 0000000000..fb9f7a39fa --- /dev/null +++ b/lib/examples/achemso.lyx @@ -0,0 +1,460 @@ +#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/ +\lyxformat 345 +\begin_document +\begin_header +\textclass achemso +\begin_preamble + % Formula chemical sum formula subscripts using the command \ce +\usepackage[version=3]{mhchem} + +%% 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". +%% +%% The \altaffiliation macro should be used for new address, etc. +\author{Andrew N. Other} +\author{Fred T. Secondauthor} +\altaffiliation{Current address: Some other place, Othertown, +Germany} +\author{I. Ken Groupleader} +\email{i.k.groupleader@unknown.uu} +\affiliation[Unknown University] +{Department of Chemistry, Unknown University, Unknown Town} + +% 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 +\begin_modules +theorems-ams +\end_modules +\language english +\inputencoding auto +\font_roman default +\font_sans default +\font_typewriter default +\font_default_family default +\font_sc false +\font_osf false +\font_sf_scale 100 +\font_tt_scale 100 + +\graphics default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_amsmath 0 +\use_esint 0 +\cite_engine basic +\use_bibtopic false +\paperorientation portrait +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\defskip medskip +\quotes_language english +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\author "" +\author "" +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\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! +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\series bold +Note: +\series default + The journal where you want to sumit is specified in the document class + options of this file. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Abstract +This is the abstract. +\end_layout + +\begin_layout Section +Introduction +\end_layout + +\begin_layout Standard +This is a paragraph of text. +\end_layout + +\begin_layout Section +Results and discussion +\end_layout + +\begin_layout Subsection +Outline +\end_layout + +\begin_layout Subsection +References +\end_layout + +\begin_layout Standard +The class makes various changes to the way that references are handled. + The class loads +\family sans +natbib +\family default +, and also the appropriate bibliography style. + References can be made using the normal method; the citation should be + placed before any punctuation, as the class will move it if using a superscript + citation style +\begin_inset CommandInset citation +LatexCommand cite +key "Mena2000,Abernethy2003" + +\end_inset + +. + The use of +\family sans +natbib +\family default + allows the use of the various citation commands of that package: +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +citeauthor{ +\end_layout + +\end_inset + +Abernethy2003 +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + have shown something, or in +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +citeyear{ +\end_layout + +\end_inset + +Cotton1999 +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + +. + Long lists of authors will be automatically truncated in most article formats, + but not in supplementary information or reviews +\begin_inset CommandInset citation +LatexCommand cite +key "Pople2003" + +\end_inset + +. +\end_layout + +\begin_layout Standard +Multiple citations to be combined into a list can be given as a single citation. + This uses the +\family sans +mciteplus +\family default + package +\begin_inset CommandInset citation +LatexCommand cite +key "Arduengo1992,*Eisenstein2005,*Arduengo1994" + +\end_inset + +. + Citations other than the first of the list should be indicated with a star. +\end_layout + +\begin_layout Standard +The class also handles notes to be added to the bibliography. + These should be given in place in the document +\begin_inset Flex Bibnote +status open + +\begin_layout Plain Layout +This is a bibnote; its text will be moved the the references section. + Bibnotes are inserted with the menu +\family sans +Insert\SpecialChar \menuseparator +Custom Insets +\family default +. +\end_layout + +\end_inset + +. +\end_layout + +\begin_layout Standard +As with citations, the text should be placed before punctuation. + A note is also generated if a citation has an optional note. + This assumes that the whole work has already been cited: odd numbering + will result if this is not the case +\begin_inset CommandInset citation +LatexCommand cite +after "p.~1" +key "Cotton1999" + +\end_inset + +. +\end_layout + +\begin_layout Subsection +Some Infos +\end_layout + +\begin_layout Standard +Besides the standard figure and table floats, the achemso LaTeX-class profives + scheme, chart, and graph floats. +\end_layout + +\begin_layout Standard +\begin_inset Float scheme +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption + +\begin_layout Plain Layout +An example scheme +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Float chart +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption + +\begin_layout Plain Layout +An example chart +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Float graph +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption + +\begin_layout Plain Layout +An example graph +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +The example file also loads the +\family sans +mhchem +\family default + package, so that formulas are easy to input: +\family typewriter + +\backslash +ce{H2SO4} +\family default + gives +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +ce{ +\end_layout + +\end_inset + +H2SO4 +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + +. +\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 +Acknowledgments go here. +\end_layout + +\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 Standard +\begin_inset CommandInset bibtex +LatexCommand bibtex +bibfiles "biblioExample" + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/examples/biblioExample.bib b/lib/examples/biblioExample.bib index f1be181d12..23236fdf22 100644 --- a/lib/examples/biblioExample.bib +++ b/lib/examples/biblioExample.bib @@ -1,5 +1,110 @@ -This file was created with JabRef 2.2. -Encoding: Cp1252 +% This file was created with JabRef 2.4.2. +% Encoding: Cp1252 + +@ARTICLE{Mena2000, + author = {Angel Abarca and Pilar G\'omez-Sal and Avelino Mart\'in and Miguel + Mena and Josep Mar\'ia Poblet and Carlos Y\'elamos}, + title = {{A}mmonolysis of mono(pentamethylcyclopentadienyl) titanium(\textsc{iv}) + derivatives}, + journal = {Inorg. Chem.}, + year = {2000}, + volume = {39}, + pages = {642--651}, + number = {4}, + doi = {10.1021/ic9907718} +} + +@ARTICLE{Abernethy2003, + author = {Colin D. Abernethy and Gareth M. Codd and Mark D. Spicer and Michelle + K. Taylor}, + title = {{A} highly stable {N}-heterocyclic carbene complex of trichloro-oxo-vanadium(\textsc{v}) + displaying novel {C}l---{C}(carbene) bonding interactions}, + journal = {{J}. {A}m. {C}hem. {S}oc.}, + year = {2003}, + volume = {125}, + pages = {1128--1129}, + number = {5}, + doi = {10.1021/ja0276321} +} + +@ARTICLE{Eisenstein2005, + author = {Appelhans, Leah N. and Zuccaccia, Daniele and Kovacevic, Anes and + Chianese, Anthony R. and Miecznikowski, John R. and Macchioni, Aleco + and Clot, Eric and Eisenstein, Odile and Crabtree, Robert H.}, + title = {{A}n anion-dependent switch in selectivity results from a change + of {C}---{H} activation mechanism in the reaction of an imidazolium + salt with \ce{IrH5(PPh3)2}}, + journal = {{J}.~{A}m.\ {C}hem. {S}oc.}, + year = {2005}, + volume = {127}, + pages = {16299--16311}, + number = {46}, + doi = {10.1021/ja055317j} +} + +@ARTICLE{Arduengo1992, + author = {Arduengo, III, Anthony J. and H. V. Rasika Dias and Richard L. Harlow + and Michael Kline}, + title = {{E}lectronic stabilization of nucleophilic carbenes}, + journal = {{J}.~{A}m.\ {C}hem.\ {S}oc.}, + year = {1992}, + volume = {114}, + pages = {5530--5534}, + number = {14}, + doi = {10.1021/ja00040a007} +} + +@ARTICLE{Arduengo1994, + author = {Arduengo, III, Anthony J. and Siegfried F. Gamper and Joseph C. Calabrese + and Fredric Davidson}, + title = {{L}ow-coordinate carbene complexes of nickel(0) and platinum(0)}, + journal = jacsat, + year = {1994}, + volume = {116}, + pages = {4391--4394}, + number = {10}, + doi = {10.1021/ja00089a029} +} + +@BOOK{Cotton1999, + title = {{A}dvanced {I}norganic {C}hemistry}, + publisher = {Wiley}, + year = {1999}, + author = {Cotton, Frank Albert and Wilkinson, Geoffrery and Murillio, Carlos + A. and Bochmann, Manfred}, + address = {Chichester}, + edition = {6} +} + +@MANUAL{Pople2003, + title = {{G}aussian 03}, + author = {M.~J. Frisch and G.~W. Trucks and H.~B. Schlegel and G.~E. Scuseria + and M.~A. Robb and J.~R. Cheeseman and Montgomery and Jr. and J. + A. and T. Vreven and K.~N. Kudin and J.~C. Burant and J.~M. Millam + and S.~S. Iyengar and J. Tomasi and V. Barone and B. Mennucci and + M. Cossi and G. Scalmani and N. Rega and G.~A. Petersson and H. Nakatsuji + and M. Hada and M. Ehara and K. Toyota and R. Fukuda and J. Hasegawa + and M. Ishida and T. Nakajima and Y. Honda and O. Kitao and H. Nakai + and M. Klene and X. Li and J.~E. Knox and H.~P. Hratchian and J.~B. + Cross and V. Bakken and C. Adamo and J. Jaramillo and R. Gomperts + and R.~E. Stratmann and O. Yazyev and A.~J. Austin and R. Cammi and + C. Pomelli and J.~W. Ochterski and P.~Y. Ayala and K. Morokuma and + G.~A. Voth and P. Salvador and J.~J. Dannenberg and V.~G. Zakrzewski + and S. Dapprich and A.~D. Daniels and M.~C. Strain and O. Farkas + and D.~K. Malick and A.~D. Rabuck and K. Raghavachari and J.~B. Foresman + and J.~V. Ortiz and Q. Cui and A.~G. Baboul and S. Clifford and J. + Cioslowski and B.~B. Stefanov and G. Liu and A. Liashenko and P. + Piskorz and I. Komaromi and R.~L. Martin and D.~J. Fox and T. Keith + and M.~A. Al-Laham and C.~Y. Peng and A. Nanayakkara and M. Challacombe + and P.~M.~W. Gill and B. Johnson and W. Chen and M.~W. Wong and C. + Gonzalez and J.~A. Pople}, + organization = {Gaussian, Inc.}, + address = {Wallingford, CT}, + year = {2004}, + howpublished = {Gaussian, Inc., Wallingford, CT, USA}, + institution = {Gaussian, Inc.}, + publisher = {Gaussian, Inc.} +} @BOOK{LComp2004, title = {The LaTeX Companion Second Edition}, diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout new file mode 100644 index 0000000000..ab0c0a71b7 --- /dev/null +++ b/lib/layouts/achemso.layout @@ -0,0 +1,188 @@ +#% Do not delete the line below; configure depends on this +# \DeclareLaTeXClass[achemso]{article (ACS)} +# achemso textclass definition file. +# Author: Uwe Stöhr (uwestoehr@web.de) + +Format 11 + +Columns 1 +Sides 1 +SecNumDepth 3 +TocDepth 3 +DefaultStyle Standard + +ClassOptions + 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 +EndFont + + +Style Standard + Margin Static + LatexType Paragraph + LatexName dummy + ParIndent MM + ParSkip 0.4 + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label +End + + +Input stdcounters.inc +Input stdfloats.inc +Input stdlists.inc +Input stdsections.inc +Input stdstarsections.inc + +NoStyle Chapter +NoStyle Chapter* + + +Float + Type scheme + GuiName Scheme + Placement tbp + Extension los + NumberWithin none + Style plain + ListName "List of Schemes" + LaTeXBuiltin true +End + +InsetLayout scheme + LabelString Scheme + LabelFont + Color collapsable + Size Small + EndFont + MultiPar true +End + + +Float + Type chart + GuiName Chart + Placement tbp + Extension loc + NumberWithin none + Style plain + ListName "List of Charts" + LaTeXBuiltin true +End + +InsetLayout chart + LabelString Chart + LabelFont + Color collapsable + Size Small + EndFont + MultiPar true +End + + +Float + Type graph + GuiName Graph + Placement tbp + Extension loh + NumberWithin none + Style plain + ListName "List of Graphs" + LaTeXBuiltin true +End + +InsetLayout graph + LabelString Graph + LabelFont + Color collapsable + Size Small + EndFont + 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 + Font + Size Small + EndFont + LabelFont + Series Bold + Size Large + EndFont +End + + +InsetLayout 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 +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 + diff --git a/status.16x b/status.16x index 15a29596d0..8b9706c968 100644 --- a/status.16x +++ b/status.16x @@ -27,6 +27,9 @@ What's new * DOCUMENT INPUT/OUTPUT +- New layout file for journal articles published by the American Chemical + Society. + - Updated localization of the user interface for German, Italian, Czech and Turkish.