From b0b1d2f8b1673e07c1c9e1225a4d83850dc2340d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Mon, 26 Nov 2012 04:21:23 +0100 Subject: [PATCH] AGUTeX: update layout and example file --- lib/layouts/agutex.layout | 263 +++++++++++++++++++------------------- lib/lyx2lyx/lyx_2_1.py | 30 ++++- lib/templates/AGUTeX.lyx | 56 ++++---- 3 files changed, 189 insertions(+), 160 deletions(-) diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 443db50b0c..7fb6a41bfa 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -1,4 +1,4 @@ -#% Do not delete the line below; configure depends on this + #% Do not delete the line below; configure depends on this # \DeclareLaTeXClass[agutex]{American Geophysical Union (AGUTeX)} # \DeclareCategory{Articles} # elsarticle textclass definition file. @@ -14,30 +14,30 @@ DefaultStyle Standard Provides natbib 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 Input stdcounters.inc @@ -53,171 +53,176 @@ NoStyle Chapter* Style Title - Margin Static - LatexType Command - LatexName title - Category FrontMatter - ParSkip 0.4 - ItemSep 0 - TopSep 0 - BottomSep 1 - ParSep 1 - Align Center - LabelType No_Label + Margin Static + LatexType Command + LatexName title + Category FrontMatter + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Center + LabelType No_Label Font - Size Largest + Size Largest EndFont End Style Authors - Margin Static - LatexType Command - Category FrontMatter - LatexName authors - LabelSep xxx - ParSkip 0.4 - TopSep 1.3 - BottomSep 0.7 - ParSep 0.7 - Align Center - LabelType No_Label + Margin Static + LatexType Command + Category FrontMatter + LatexName authors + LabelSep xxx + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Center + LabelType No_Label Font - Size Large + Size Large EndFont End InsetLayout "Flex:Affiliation Mark" - LyxType custom - LatexType command - LatexName altaffilmark - LabelString "Affiliation Mark" + LyxType custom + LatexType command + LatexName altaffilmark + LabelString "Affiliation Mark" Font - Color foreground - Size Small - Family Roman - Shape Up - Series Medium - Misc No_Emph - Misc No_Noun - Misc No_Bar + Color foreground + Size Small + Family Roman + Shape Up + Series Medium + Misc No_Emph + Misc No_Noun + Misc No_Bar EndFont LabelFont - Color latex - Size Small + Color latex + Size Small EndFont End Style "Author affiliation" - Margin Dynamic - LatexType Command - LatexName altaffiltext - Category FrontMatter - ParSkip 0.4 - BottomSep 0.5 - Align Left - LabelSep xx - LabelType Static - LabelString "Author affiliation:" + Margin Dynamic + LatexType Command + LatexName altaffiltext + Category FrontMatter + ParSkip 0.4 + BottomSep 0.5 + Align Left + Argument 1 + Mandatory 1 + LabelString "Number" + Tooltip "Consecutive number for the author affiliations" + EndArgument + LabelSep xx + LabelType Static + LabelString "Author affiliation:" LabelFont - Color Green - Series Bold + Color Green + Series Bold EndFont End Style Abstract - Margin Dynamic - LatexType Environment - LatexName abstract - Category FrontMatter - NextNoIndent 1 - LabelSep xxx - ParSkip 0.4 - TopSep 0.7 - BottomSep 0.4 - Align Block - LabelType Static - LabelString "Abstract." + Margin Dynamic + LatexType Environment + LatexName abstract + Category FrontMatter + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 0.7 + BottomSep 0.4 + Align Block + LabelType Static + LabelString "Abstract." LabelFont - Series Bold + Series Bold EndFont End Style Paragraph - CopyStyle Subsection* - Category BackMatter - LatexName paragraph - TocLevel 4 + CopyStyle Subsection* + Category BackMatter + LatexName paragraph + TocLevel 4 End Style Notation - Margin Static - LatexType Environment - LatexName notation - Category BackMatter - NextNoIndent 1 - LabelSep xxx - ParSkip 0.4 - TopSep 0.7 - BottomSep 0.4 - Align Block - LabelType Top_Environment - LabelString "Notation" + Margin Static + LatexType Environment + LatexName notation + Category BackMatter + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 0.7 + BottomSep 0.4 + Align Block + LabelType Top_Environment + LabelString "Notation" LabelFont - Series Bold - Size Larger + Series Bold + Size Larger EndFont End Style Acknowledgments - Margin Dynamic - LatexType Environment - LatexName acknowledgments - Category BackMatter - NextNoIndent 1 - LabelSep xxx - ParSkip 0.4 - TopSep 0.7 - BottomSep 0.4 - Align Block - LabelType Static - LabelString "Acknowledgments." + Margin Dynamic + LatexType Environment + LatexName acknowledgments + Category BackMatter + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 0.7 + BottomSep 0.4 + Align Block + LabelType Static + LabelString "Acknowledgments." Font - Size Small + Size Small EndFont LabelFont - Series Bold - Size Small + Series Bold + Size Small EndFont End Style Bibliography - Margin First_Dynamic - LatexType Bib_Environment - LatexName thebibliography - Category BackMatter - 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 + Margin First_Dynamic + LatexType Bib_Environment + LatexName thebibliography + Category BackMatter + 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 + Series Bold + Size Larger EndFont End diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index cab19d82dd..15e176ea80 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -1338,6 +1338,32 @@ def convert_AASTeX(document): return +def revert_AGUTeX(document): + " Reverts InsetArgument of Author affiliation to TeX-code " + i = 0 + while True: + if i != -1: + i = find_token(document.body, "\\begin_layout Author affiliation", i) + if i != -1: + revert_Argument_to_TeX_brace(document, i, 1, 1, False) + i = i + 1 + if i == -1: + return + + +def convert_AGUTeX(document): + " Converts ERT of Author affiliation to InsetArgument " + i = 0 + while True: + if i != -1: + i = find_token(document.body, "\\begin_layout Author affiliation", i) + if i != -1: + convert_Argument_to_TeX_brace(document, i, 1, 1, False) + i = i + 1 + if i == -1: + return + + ## # Conversion hub # @@ -1377,11 +1403,11 @@ convert = [ [444, []], [445, []], [446, [convert_latexargs]], - [447, [convert_IEEEtran, convert_AASTeX]] + [447, [convert_IEEEtran, convert_AASTeX, convert_AGUTeX]] ] revert = [ - [446, [revert_IEEEtran, revert_AASTeX]], + [446, [revert_IEEEtran, revert_AASTeX, revert_AGUTeX]], [445, [revert_latexargs]], [444, [revert_uop]], [443, [revert_biolinum]], diff --git a/lib/templates/AGUTeX.lyx b/lib/templates/AGUTeX.lyx index 4b5fe3f230..32299c3092 100644 --- a/lib/templates/AGUTeX.lyx +++ b/lib/templates/AGUTeX.lyx @@ -1,5 +1,5 @@ -#LyX 2.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 413 +#LyX 2.1 created this file. For more info see http://www.lyx.org/ +\lyxformat 447 \begin_document \begin_header \textclass agutex @@ -50,13 +50,13 @@ theorems-std \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 - \graphics default \default_output_format default \output_sync 0 @@ -67,15 +67,21 @@ theorems-std \use_hyperref false \papersize default \use_geometry false -\use_amsmath 0 -\use_esint 1 -\use_mhchem 1 -\use_mathdots 1 -\cite_engine natbib_authoryear +\use_package amsmath 0 +\use_package amssymb 0 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 0 +\use_package mhchem 1 +\use_package undertilde 0 +\cite_engine natbib +\cite_engine_type authoryear +\biblio_style plainnat \use_bibtopic false \use_indices false \paperorientation portrait \suppress_date false +\justification true \use_refstyle 0 \index Index \shortcut idx @@ -261,13 +267,11 @@ status collapsed \end_layout \begin_layout Author affiliation -1 -\begin_inset ERT -status collapsed +\begin_inset Argument 1 +status open \begin_layout Plain Layout - -}{ +1 \end_layout \end_inset @@ -277,13 +281,11 @@ Department of Hydrology and Water Resources, University of Arizona, Tucson, \end_layout \begin_layout Author affiliation -2 -\begin_inset ERT -status collapsed +\begin_inset Argument 1 +status open \begin_layout Plain Layout - -}{ +2 \end_layout \end_inset @@ -292,13 +294,11 @@ Department of Geography, Ohio State University, Columbus, Ohio, USA. \end_layout \begin_layout Author affiliation -3 -\begin_inset ERT -status collapsed +\begin_inset Argument 1 +status open \begin_layout Plain Layout - -}{ +3 \end_layout \end_inset @@ -308,13 +308,11 @@ Department of Space Sciences, University of Michigan, Ann Arbor, Michigan, \end_layout \begin_layout Author affiliation -4 -\begin_inset ERT -status collapsed +\begin_inset Argument 1 +status open \begin_layout Plain Layout - -}{ +4 \end_layout \end_inset @@ -695,7 +693,7 @@ above \align center \begin_inset Tabular - + -- 2.39.2