From 458b9ad6cdae7ae3c176357cb97186a8b91868e0 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 22 May 2001 13:10:12 +0000 Subject: [PATCH] update to the aa class git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2017 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 9 + lib/examples/aa_head.lyx | 6 +- lib/examples/aa_paper.lyx | 198 ++++++++++++---------- lib/layouts/{aapaper.layout => aa.layout} | 165 ++++++++++++++++-- lib/layouts/aapaper.inc | 131 -------------- lib/templates/{aapaper.lyx => aa.lyx} | 6 +- 6 files changed, 275 insertions(+), 240 deletions(-) rename lib/layouts/{aapaper.layout => aa.layout} (51%) delete mode 100644 lib/layouts/aapaper.inc rename lib/templates/{aapaper.lyx => aa.lyx} (95%) diff --git a/lib/ChangeLog b/lib/ChangeLog index 212a0134b6..a1de6ecdf4 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,12 @@ +2001-05-22 Peter Suetterlin + + * templates/aa.lyx: rename from aapaper.lyx + + * layouts/aa.layout: rename from aapaper.layout + + * examples/aa_head.lyx: + * examples/aa_head.lyx: update + 2001-05-18 Jean-Marc Lasgouttes * languages: change GUI name of portugues and brazil diff --git a/lib/examples/aa_head.lyx b/lib/examples/aa_head.lyx index 91cf39704e..fd4b0bb8d5 100644 --- a/lib/examples/aa_head.lyx +++ b/lib/examples/aa_head.lyx @@ -1,7 +1,7 @@ #This file was created by Tue Nov 25 23:06:48 1997 #LyX 0.11 (C) 1995-1997 Matthias Ettrich and the LyX Team \lyxformat 2.15 -\textclass aapaper +\textclass aa \language english \inputencoding latin1 \fontscheme times @@ -19,8 +19,8 @@ \defskip medskip \quotes_language english \quotes_times 2 -\papercolumns 1 -\papersides 1 +\papercolumns 2 +\papersides 2 \paperpagestyle default \layout Thesaurus diff --git a/lib/examples/aa_paper.lyx b/lib/examples/aa_paper.lyx index 956d68b7ff..fc9a688033 100644 --- a/lib/examples/aa_paper.lyx +++ b/lib/examples/aa_paper.lyx @@ -1,7 +1,6 @@ -#This file was created by Mon Nov 24 22:57:48 1997 -#LyX 0.11 (C) 1995-1997 Matthias Ettrich and the LyX Team -\lyxformat 2.15 -\textclass aapaper +#LyX 1.1 created this file. For more info see http://www.lyx.org/ +\lyxformat 218 +\textclass aa \language english \inputencoding latin1 \fontscheme default @@ -19,8 +18,8 @@ \defskip medskip \quotes_language english \quotes_times 2 -\papercolumns 1 -\papersides 1 +\papercolumns 2 +\papersides 2 \paperpagestyle default \layout Thesaurus @@ -298,8 +297,7 @@ energy transport by grey radiation diffusion. \layout Standard For the one-zone-model Baker obtains necessary conditions for dynamical, - secular and vibrational (or pulsational) stability [Eqs. -\protected_separator + secular and vibrational (or pulsational) stability [Eqs.\SpecialChar ~ (34a, \latex latex @@ -319,8 +317,7 @@ c) in Baker ]. Using Baker's notation: -\begin_inset Formula -\begin{eqnarray*} +\begin_inset Formula \begin{eqnarray*} M_{\mathrm{r}} & & \mathrm{mass}\, \mathrm{internal}\, \mathrm{to}\, \mathrm{the}\, \mathrm{radius}\, r\\ m & & \mathrm{mass}\, \mathrm{of}\, \mathrm{the}\, \mathrm{zone}\\ r_{0} & & \mathrm{unperturbed}\, \mathrm{zone}\, \mathrm{radius}\\ @@ -336,8 +333,7 @@ and with the definitions of the \emph on local cooling time \emph default - (see Fig. -\protected_separator + (see Fig.\SpecialChar ~ \begin_inset LatexCommand \ref{FigGam} @@ -347,9 +343,7 @@ local cooling time \layout Standard -\begin_inset Formula -\begin{equation} -\label{} +\begin_inset Formula \begin{equation} \tau _{\mathrm{co}}=\frac{E_{\mathrm{th}}}{L_{r0}}\, , \end{equation} @@ -361,9 +355,7 @@ local free-fall time \layout Standard -\begin_inset Formula -\begin{equation} -\label{} +\begin_inset Formula \begin{equation} \tau _{\mathrm{ff}}=\sqrt{\frac{3\pi }{32G}\frac{4\pi r_{0}^{3}}{3M_{\mathrm{r}}}\, ,} \end{equation} @@ -378,8 +370,7 @@ Baker's \end_inset have the following form: -\begin_inset Formula -\begin{eqnarray} +\begin_inset Formula \begin{eqnarray} \sigma _{0} & = & \frac{\pi }{\sqrt{8}}\frac{1}{\tau _{\mathrm{ff}}}\\ K & = & \frac{\sqrt{32}}{\pi }\frac{1}{\delta }\frac{\tau _{\mathrm{ff}}}{\tau _{\mathrm{co}}}\, ; \end{eqnarray} @@ -394,9 +385,7 @@ where \layout Standard -\begin_inset Formula -\begin{equation} -\label{} +\begin_inset Formula \begin{equation} \begin{array}{l} \delta =-\left( \frac{\partial \ln \rho }{\partial \ln T}\right) _{P}\\ e=mc^{2} @@ -435,8 +424,7 @@ is a thermodynamical quantity which is of order is proportional to the ratio of the free-fall time and the cooling time. Substituting into Baker's criteria, using thermodynamic identities and definitions of thermodynamic quantities, -\begin_inset Formula -\[ +\begin_inset Formula \[ \Gamma _{1}=\left( \frac{\partial \ln P}{\partial \ln \rho }\right) _{S}\, ,\: \chi _{\rho }=\left( \frac{\partial \ln P}{\partial \ln \rho }\right) _{T}\, ,\: \kappa _{P}=\left( \frac{\partial \ln \kappa }{\partial \ln P}\right) _{T}\] \end_inset @@ -445,8 +433,7 @@ is a thermodynamical quantity which is of order \layout Standard -\begin_inset Formula -\[ +\begin_inset Formula \[ \nabla _{\mathrm{ad}}=\left( \frac{\partial \ln T}{\partial \ln P}\right) _{S}\, ,\: \chi _{T}=\left( \frac{\partial \ln P}{\partial \ln T}\right) _{\rho }\, ,\: \kappa _{T}=\left( \frac{\partial \ln \kappa }{\partial \ln P}\right) _{T}\] \end_inset @@ -459,8 +446,7 @@ stability \layout Standard -\begin_inset Formula -\begin{eqnarray} +\begin_inset Formula \begin{eqnarray} \frac{\pi ^{2}}{8}\frac{1}{\tau _{\mathrm{ff}}^{2}}(3\Gamma _{1}-4) & > & 0\label{ZSDynSta} \\ \frac{\pi ^{2}}{\tau _{\mathrm{co}}\tau _{\mathrm{ff}}^{2}}\Gamma _{1}\nabla _{\mathrm{ad}}\left[ \frac{1-3/4\chi _{\rho }}{\chi _{T}}(\kappa _{T}-4)+\kappa _{P}+1\right] & > & 0\label{ZSSecSta} \\ \frac{\pi ^{2}}{4}\frac{3}{\tau _{\mathrm{co}}\tau _{\mathrm{ff}}^{2}}\Gamma _{1}^{2}\nabla _{\mathrm{ad}}\left[ 4\nabla _{\mathrm{ad}}-(\nabla _{\mathrm{ad}}\kappa _{T}+\kappa _{P})-\frac{4}{3\Gamma _{1}}\right] & > & 0\label{ZSVibSta} @@ -492,8 +478,7 @@ a factor containing only constitutive relations and their derivatives. \layout Standard The first factors, depending on only timescales, are positive by definition. - The signs of the left hand sides of the inequalities -\protected_separator + The signs of the left hand sides of the inequalities\SpecialChar ~ ( \begin_inset LatexCommand \ref{ZSDynSta} @@ -520,8 +505,7 @@ functions of the thermodynamic state in the local zone The one-zone stability can therefore be determined from a simple equation of state, given for example, as a function of density and temperature. Once the microphysics, i.e. - the thermodynamics and opacities (see Table -\protected_separator + the thermodynamics and opacities (see Table\SpecialChar ~ \begin_inset LatexCommand \ref{KapSou} @@ -546,55 +530,106 @@ Opacity sources \layout Standard -\align center \LyXTable -multicol4 -4 2 0 0 -1 -1 -1 -1 -1 0 0 0 -1 0 0 0 -0 0 0 0 -0 1 0 0 -2 0 0 -2 0 0 -0 2 1 0 0 0 0 -0 2 1 0 0 0 0 -0 8 1 0 0 0 0 -0 8 1 0 0 0 0 -0 2 1 0 0 0 0 -0 8 1 0 0 0 0 -0 8 1 0 0 0 0 -0 8 1 0 0 0 0 + + +\begin_inset Tabular + + + + + + +\begin_inset Text + +\layout Standard Source -\newline +\end_inset + + +\begin_inset Text + +\layout Standard + T/[K] -\newline +\end_inset + + + + +\begin_inset Text + +\layout Standard + Yorke 1979, Yorke 1980a -\newline +\end_inset + + +\begin_inset Text + +\layout Standard + \begin_inset Formula \( \leq 1700^{\mathrm{a}} \) \end_inset -\newline +\end_inset + + + + +\begin_inset Text + +\layout Standard + Krügel 1971 -\newline +\end_inset + + +\begin_inset Text + +\layout Standard + \begin_inset Formula \( 1700\leq T\leq 5000 \) \end_inset -\newline +\end_inset + + + + +\begin_inset Text + +\layout Standard + Cox & Stewart 1969 -\newline +\end_inset + + +\begin_inset Text + +\layout Standard + \begin_inset Formula \( 5000\leq \) \end_inset -\layout Standard +\end_inset + + + +\end_inset + + +\layout Standard +\added_space_top medskip* -\begin_inset Formula \( \mathrm{a} \) +\begin_inset Formula \( ^{\textrm{a}} \) \end_inset This is footnote a @@ -639,8 +674,7 @@ stability equations of state . \layout Standard -The sign determining part of inequality -\protected_separator +The sign determining part of inequality\SpecialChar ~ ( \begin_inset LatexCommand \ref{ZSDynSta} @@ -654,18 +688,14 @@ The sign determining part of inequality \layout Standard -\begin_inset Formula -\begin{equation} -\label{} +\begin_inset Formula \begin{equation} \Gamma _{1}>\frac{4}{3} \end{equation} \end_inset Stability of the thermodynamical equilibrium demands -\begin_inset Formula -\begin{equation} -\label{} +\begin_inset Formula \begin{equation} \chi _{\rho }>0,\: \: c_{v}>0\, , \end{equation} @@ -675,9 +705,7 @@ and \layout Standard -\begin_inset Formula -\begin{equation} -\label{} +\begin_inset Formula \begin{equation} \chi _{T}>0 \end{equation} @@ -688,8 +716,7 @@ holds for a wide range of physical situations. \layout Standard -\begin_inset Formula -\begin{eqnarray} +\begin_inset Formula \begin{eqnarray} \Gamma _{3}-1=\frac{P}{\rho T}\frac{\chi _{T}}{c_{v}} & > & 0\\ \Gamma _{1}=\chi _{\rho }+\chi _{T}(\Gamma _{3}-1) & > & 0\\ \nabla _{\mathrm{ad}}=\frac{\Gamma _{3}-1}{\Gamma _{1}} & > & 0 @@ -697,8 +724,7 @@ holds for a wide range of physical situations. \end_inset -we find the sign determining terms in inequalities -\protected_separator +we find the sign determining terms in inequalities\SpecialChar ~ ( \begin_inset LatexCommand \ref{ZSSecSta} @@ -718,8 +744,7 @@ stability \layout Standard -\begin_inset Formula -\begin{eqnarray} +\begin_inset Formula \begin{eqnarray} 3\Gamma _{1}-4=:\, S_{\mathrm{dyn}}> & 0 & \label{DynSta} \\ \frac{1-3/4\chi _{\rho }}{\chi _{T}}(\kappa _{T}-4)+\kappa _{P}+1=:\, S_{\mathrm{sec}}> & 0 & \label{SecSta} \\ 4\nabla _{\mathrm{ad}}-(\nabla _{\mathrm{ad}}\kappa _{T}+\kappa _{P}-\frac{4}{3\Gamma _{1}}=:\, S_{\mathrm{vib}}> & 0 & \label{VibSta} @@ -762,8 +787,7 @@ e relations \end_inset . - See Fig. -\protected_separator + See Fig.\SpecialChar ~ \begin_inset LatexCommand \ref{FigVibStab} @@ -774,8 +798,7 @@ e relations \end_inset . - Regions of secular instability are listed in Table -\protected_separator + Regions of secular instability are listed in Table\SpecialChar ~ \begin_inset LatexCommand \ref{TabSecInst} @@ -855,21 +878,18 @@ ge\SpecialChar \- mein\SpecialChar \- schaft, DFG \emph default - project number Ts -\protected_separator + project number Ts\SpecialChar ~ 17/2--1. \layout Bibliography \bibitem [1966]{baker} -Baker N., 1966, in: Stellar Evolution, eds. -\protected_separator +Baker N., 1966, in: Stellar Evolution, eds.\SpecialChar ~ R. F. Stein, A. G. W. - Cameron, Plenum, New York, p. -\protected_separator + Cameron, Plenum, New York, p.\SpecialChar ~ 333 \layout Bibliography \bibitem [1988]{balluch} @@ -880,8 +900,7 @@ Balluch M., 1988, A&A 200, 58 Cox J. P., 1980, Theory of Stellar Pulsation, Princeton University Press, Princeton, - p. -\protected_separator + p.\SpecialChar ~ 165 \layout Bibliography \bibitem [1969]{cox69} @@ -893,8 +912,7 @@ Cox A. \bibitem [1971]{kruegel} Krügel E., 1971, Der Rosselandsche Mittelwert bei tiefen Temperaturen, Diplom--Th -esis, Univ. -\protected_separator +esis, Univ.\SpecialChar ~ Göttingen \layout Bibliography \bibitem [1980]{mizuno} diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aa.layout similarity index 51% rename from lib/layouts/aapaper.layout rename to lib/layouts/aa.layout index b350d0be2c..622cd34e17 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aa.layout @@ -2,6 +2,9 @@ # \DeclareLaTeXClass[aa]{article (A&A)} # # Author: Peter Sütterlin +# +# 2001-05-17 take out include of stdlayouts; merge aapaper.inc +# remove LaTeX style, rename to aa # General textclass parameters Columns 2 @@ -34,6 +37,12 @@ End # I want to keep the entries in a logical order. # Therefore I'll define the entries first, then fill them +Style Section + End +Style Subsection + End +Style Subsubsection + End Style Itemize End Style Enumerate @@ -44,14 +53,6 @@ Style List End Style Caption End -Style LaTeX - End -Style Section - End -Style Subsection - End -Style Subsubsection - End Style Title End Style Subtitle @@ -80,23 +81,161 @@ Style Bibliography # First, the standard includes Input stdlists.inc -Input stdlayouts.inc Input stdsections.inc Input stdtitle.inc Input stdstruct.inc # Remove unwanted Styles -NoStyle Quotation -NoStyle Quote -NoStyle Verse NoStyle Chapter NoStyle Paragraph NoStyle Subparagraph NoStyle Part # Definitions only valid for A&A style -Input aapaper.inc + +# Subitle style definition +Style Subtitle + Margin Static + LatexType Command + InTitle 1 + LatexName subtitle + NextNoIndent 1 + ParSkip 0.4 + ItemSep 0 + TopSep 1.3 + BottomSep 1.3 + ParSep 1 + Align Left + AlignPossible Left + LabelType No_Label + + # standard font definition + Font + Size Normal + Series Bold + EndFont +End + +# Address style definition +Style Address + Margin Static + LatexType Command + InTitle 1 + LatexName institute + ParSkip 0.4 + BottomSep 0.4 + Align Left + AlignPossible Block, Left, Right, Center + LabelType No_Label + + Font + Family Sans + Size Small + EndFont +End + +# Email address style definition +Style Email + Margin Static + LatexType Command + InTitle 1 + LatexName mail + Align Left + AlignPossible Left + LeftMargin email:M + LabelType Static + LabelString email: + LabelSep M + + Font + Family Sans + Size Small + EndFont +End + +# Address for Offprints style definition +Style Offprint + Margin Static + LatexType Command + InTitle 1 + LatexName offprints + Align Left + AlignPossible Left + LeftMargin "Offprint Requests to:MN" + LabelType Static + LabelString "Offprint Requests to:" + LabelSep M + + Font + Family Sans + Size Small + EndFont +End + +# Acnowledgement style definition +Style Acknowledgement + Margin Static + LatexType Environment + LatexName acknowledgements + NextNoIndent 1 + ItemSep 0 + TopSep 0.2 + BottomSep 0 + ParSep 0 + Align Block + AlignPossible Block + LabelType Top_Environment + LabelString Acknowledgements + LabelSep M + # standard font definition + Font + Size Small + EndFont + + # label font definition + LabelFont + Size Small + Shape Italic + EndFont +End + +Style Thesaurus + LabelType Static + LatexType Command + InTitle 1 + LatexName thesaurus + NextNoIndent 1 + TopSep 0 + BottomSep 1 + LeftMargin Thesaurus:M + LabelSep M + LabelType Static + LabelString Thesaurus: + Font + Size Small + EndFont +End + +# Caption style definition +Style Caption + Margin First_Dynamic + LatexType Command + LatexName caption + NeedProtect 1 + LabelSep xx + ParSkip 0.4 + TopSep 0.5 + Align Center + AlignPossible Center + LabelType Sensitive + LabelString Caption + + # label font definition + LabelFont + Series Bold + EndFont +End # Redefine some things diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc deleted file mode 100644 index 35d0a1ff3c..0000000000 --- a/lib/layouts/aapaper.inc +++ /dev/null @@ -1,131 +0,0 @@ -# This file contains additional style definitions for the -# A&A paper style not found in the standard include files. -# It is Input by aapaper.layout -# -# Author: Peter Sütterlin - -# Subitle style definition -Style Subtitle - Margin Static - LatexType Command - InTitle 1 - LatexName subtitle - NextNoIndent 1 - ParSkip 0.4 - ItemSep 0 - TopSep 1.3 - BottomSep 1.3 - ParSep 1 - Align Left - AlignPossible Left - LabelType No_Label - - # standard font definition - Font - Size Normal - Series Bold - EndFont -End - -# Address style definition -Style Address - Margin Static - LatexType Command - InTitle 1 - LatexName institute - ParSkip 0.4 - BottomSep 0.4 - Align Left - AlignPossible Block, Left, Right, Center - LabelType No_Label - - Font - Family Sans - Size Small - EndFont -End - -# Email address style definition -Style Email - Margin Static - LatexType Command - InTitle 1 - LatexName mail - Align Left - AlignPossible Left - LeftMargin email:M - LabelType Static - LabelString email: - LabelSep M - - Font - Family Sans - Size Small - EndFont -End - -# Address for Offprints style definition -Style Offprint - Margin Static - LatexType Command - InTitle 1 - LatexName offprints - Align Left - AlignPossible Left - LeftMargin "Offprint Requests to:M" - LabelType Static - LabelString "Offprint Requests to:" - LabelSep M - - Font - Family Sans - Size Small - EndFont -End - -# Acnowledgement style definition -Style Acknowledgement - Margin Static - LatexType Environment - LatexName acknowledgements - NextNoIndent 1 - ItemSep 0 - TopSep 0.2 - BottomSep 0 - ParSep 0 - Align Block - AlignPossible Block - LabelType Top_Environment - LabelString Acknowledgements - LabelSep M - # standard font definition - Font - Size Small - EndFont - - # label font definition - LabelFont - Size Small - Shape Italic - EndFont -End - -Style Thesaurus - LabelType Static - LatexType Command - InTitle 1 - LatexName thesaurus - NextNoIndent 1 - TopSep 0 - BottomSep 1 - LeftMargin Thesaurus:M - LabelSep M - LabelType Static - LabelString Thesaurus: - Font - Size Small - EndFont -End - - - diff --git a/lib/templates/aapaper.lyx b/lib/templates/aa.lyx similarity index 95% rename from lib/templates/aapaper.lyx rename to lib/templates/aa.lyx index d638a08bc3..1645897db3 100644 --- a/lib/templates/aapaper.lyx +++ b/lib/templates/aa.lyx @@ -1,7 +1,7 @@ #This file was created by Mon Nov 24 23:26:21 1997 #LyX 0.11 (C) 1995-1997 Matthias Ettrich and the LyX Team \lyxformat 2.15 -\textclass aapaper +\textclass aa \language english \fontscheme times \graphics default @@ -15,8 +15,8 @@ \tocdepth 3 \paragraph_separation indent \defskip medskip -\papercolumns 1 -\papersides 1 +\papercolumns 2 +\papersides 2 \paperpagestyle default \layout Thesaurus -- 2.39.2