X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Faastex.layout;h=654d5920fe231e80a3328687e226a2a9990fd754;hb=517cd50e051d3debce752f565d6ba1880fd6184d;hp=7e34d3c830c0a54014eb21f5a65dd7842ef4bf06;hpb=f623ded10945d1bc81efcb9ac4b63c25de5c21a1;p=lyx.git diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index 7e34d3c830..654d5920fe 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -1,7 +1,9 @@ #% Do not delete the line below; configure depends on this -# \DeclareLaTeXClass[aastex,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX)} +# \DeclareLaTeXClass[aastex,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX v. 5)} # \DeclareCategory{Articles} # +# LyX support for the AAS TeX package http://www.ctan.org/pkg/aastex +# # Author: Mike Ressler # Author: Uwe Stöhr # @@ -33,9 +35,14 @@ # Version 1.4 26/10/08 - new custom insets for \altaffilmark, \tablenotemark # - new environments for \altaffiltext and \tablenotetext # Version 1.5 26/11/12 - added mandatory argument for \altaffiltext +# Version 1.6 23/01/15 - fix for the optional argument of \figcaption +# Note: aastex.cls was replaced by aastex6.cls (v.1 2016/02/16) +# in the CTAN and TeXLive "aastex" package in march 2016. +# The new "aastex6.layout" depends on aastex6.cls but inputs this +# file for the definitions (cf. LyX ticket #10027) -Format 43 +Format 63 Columns 1 Sides 1 #SecNumDepth 3 @@ -64,98 +71,6 @@ Style Standard End -# I want to keep the entries in a logical order. -# Therefore I'll define the entries first, then fill them in - -Style Section - TocLevel 1 -End - -Style Subsection - TocLevel 2 -End - -Style Subsubsection - TocLevel 3 -End - -Style Paragraph - TocLevel 4 -End - -Style Itemize -End - -Style Enumerate -End - -Style Description -End - -Style List -End - -Style Title -End - -Style Author -End - -Style Affiliation -End - -Style Email -End - -Style And -End - -Style Date -End - -Style Abstract -End - -Style Keywords -End - -Style Acknowledgements -End - -Style Appendix -End - -Style References -End - -Style PlaceFigure -End - -Style PlaceTable -End - -Style TableComments -End - -Style TableRefs -End - - -Style MathLetters -End - -Style NoteToEditor -End - -Style Facility -End - -Style Objectname -End - -Style Dataset -End - # OK, now we have a more or less consistent Ordering. Now fill the # definitions. First, the standard includes @@ -241,37 +156,6 @@ Style Author End -Style Date - InTitle 0 - LabelSep "" - TopSep 1.2 - Align Center - Font - Size Small - EndFont -End - - -Style Abstract - LeftMargin "MMM" - RightMargin "MMM" - ParIndent "MM" - InTitle 0 - TopSep 1.4 - BottomSep 0.7 - LabelType Centered_Top_Environment - Align Block - AlignPossible Block, Left, Right, Center - Font - Size Normal - EndFont - LabelFont - Series Bold - Size Normal - EndFont -End - - Style Affiliation Margin Static LatexType Command @@ -300,6 +184,7 @@ Style Altaffilation Mandatory 1 LabelString "Number" Tooltip "Consecutive number for the alternative affiliations" + PassThru 1 EndArgument LabelSep xx LabelType Static @@ -310,6 +195,76 @@ Style Altaffilation End +Style Email + Margin Static + LatexType Command + InTitle 0 + LatexName email + Category FrontMatter + ParSkip 0.4 + BottomSep 0.4 + Align Center + AlignPossible Block, Left, Right, Center + LabelType No_Label + Font + Family Roman + Size Normal + Shape Italic + EndFont +End + + +Style And + Margin Dynamic + LatexType Command + InTitle 0 + LatexName and + Category FrontMatter + TopSep 1.2 + ParSkip 0.4 + BottomSep 1.2 + Align Center + LabelType Static + LabelString "and" + KeepEmpty 1 + Font + Family Roman + Size Normal + EndFont +End + + +Style Date + InTitle 0 + LabelSep "" + TopSep 1.2 + Align Center + Font + Size Small + EndFont +End + + +Style Abstract + LeftMargin "MMM" + RightMargin "MMM" + ParIndent "MM" + InTitle 0 + TopSep 1.4 + BottomSep 0.7 + LabelType Centered + Align Block + AlignPossible Block, Left, Right, Center + Font + Size Normal + EndFont + LabelFont + Series Bold + Size Normal + EndFont +End + + InsetLayout "Flex:altaffilmark" LyxType custom LatexType command @@ -359,25 +314,6 @@ Style Keywords End -Style Email - Margin Static - LatexType Command - InTitle 0 - LatexName email - Category FrontMatter - ParSkip 0.4 - BottomSep 0.4 - Align Center - AlignPossible Block, Left, Right, Center - LabelType No_Label - Font - Family Roman - Size Normal - Shape Italic - EndFont -End - - Style Acknowledgements Category BackMatter Margin Dynamic @@ -399,26 +335,6 @@ Style Acknowledgements End -Style And - Margin Dynamic - LatexType Command - InTitle 0 - LatexName and - Category FrontMatter - TopSep 1.2 - ParSkip 0.4 - BottomSep 1.2 - Align Center - LabelType Static - LabelString "and" - KeepEmpty 1 - Font - Family Roman - Size Normal - EndFont -End - - Style PlaceFigure Margin Dynamic LatexType Command @@ -497,6 +413,7 @@ Style References LatexName thebibliography Category BackMatter NextNoIndent 1 + ToggleIndent Never LeftMargin MM ParSkip 0.4 ItemSep 0 @@ -617,12 +534,13 @@ End InsetLayout Caption:FigCaption - LabelString fig. - LaTeXType command - LatexName figcaption + LabelString fig. + LaTeXType command + LatexName figcaption + MultiPar false Argument 1 - LabelString "Short Title|S" - Tooltip "The caption as it appears in the list of figures" + LabelString "Filename" + Tooltip "Filename to identify the corresponding figure file" EndArgument HTMLStyle div.float-caption {