From: Enrico Forestieri Date: Wed, 13 Jun 2007 22:50:17 +0000 (+0000) Subject: Better fix for bug 3510 (by me, Juergen, and Jean-Marc) X-Git-Tag: 1.6.10~9395 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8561f4f2caa0d738fd87e5fc091e4a914c9205c2;p=features.git Better fix for bug 3510 (by me, Juergen, and Jean-Marc) * lib/layouts/IEEEtran.layout: Add a proper definition to the preamble when using the MarkBoth environment (fix bug 3510). Allow inserting an optional argument for theorem like environments. Remove white space from begin of line in preamble stuff. * lib/templates/IEEEtran.lyx: Reintroduce the MarkBoth environment in the document body thanks to the fix above. Use optional argument instead of ERT in Theorem environment. Use the new --Separator-- environment for splitting biography environments. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18767 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 07822c27e2..a635d1d13b 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -57,6 +57,7 @@ Style TheoremTemplate LabelFont Shape Italic EndFont + OptionalArgs 1 End @@ -73,7 +74,7 @@ Style Theorem LatexName thm LabelString "Theorem #:" Preamble - \newtheorem{thm}{Theorem} + \newtheorem{thm}{Theorem} EndPreamble End @@ -83,7 +84,7 @@ Style Lemma LatexName lemma LabelString "Lemma #:" Preamble - \newtheorem{lemma}{Lemma} + \newtheorem{lemma}{Lemma} EndPreamble End @@ -93,7 +94,7 @@ Style Corollary LatexName cor LabelString "Corollary #:" Preamble - \newtheorem{cor}{Corollary} + \newtheorem{cor}{Corollary} EndPreamble End @@ -103,7 +104,7 @@ Style Proposition LatexName prop LabelString "Proposition #:" Preamble - \newtheorem{prop}{Proposition} + \newtheorem{prop}{Proposition} EndPreamble End @@ -113,7 +114,7 @@ Style Conjecture LatexName conject LabelString "Conjecture #:" Preamble - \newtheorem{conject}{Conjecture} + \newtheorem{conject}{Conjecture} EndPreamble End @@ -123,7 +124,7 @@ Style Criterion LatexName criter LabelString "Criterion #:" Preamble - \newtheorem{criter}{Criterion} + \newtheorem{criter}{Criterion} EndPreamble End @@ -133,7 +134,7 @@ Style Fact LatexName fact LabelString "Fact #:" Preamble - \newtheorem{fact}{Fact} + \newtheorem{fact}{Fact} EndPreamble End @@ -143,7 +144,7 @@ Style Axiom LatexName axi LabelString "Axiom #:" Preamble - \newtheorem{axi}{Axiom} + \newtheorem{axi}{Axiom} EndPreamble End @@ -153,7 +154,7 @@ Style Definition LatexName definitn LabelString "Definition #:" Preamble - \newtheorem{definitn}{Definition} + \newtheorem{definitn}{Definition} EndPreamble End @@ -163,7 +164,7 @@ Style Example LatexName example LabelString "Example #:" Preamble - \newtheorem{example}{Example} + \newtheorem{example}{Example} EndPreamble End @@ -173,7 +174,7 @@ Style Condition LatexName condition LabelString "Condition #:" Preamble - \newtheorem{condition}{Condition} + \newtheorem{condition}{Condition} EndPreamble End @@ -183,7 +184,7 @@ Style Problem LatexName problem LabelString "Problem #:" Preamble - \newtheorem{problem}{Problem} + \newtheorem{problem}{Problem} EndPreamble End @@ -193,7 +194,7 @@ Style Exercise LatexName exacise LabelString "Exercise #:" Preamble - \newtheorem{exacise}{Exercise} + \newtheorem{exacise}{Exercise} EndPreamble End @@ -203,7 +204,7 @@ Style Remark LatexName remrk LabelString "Remark #:" Preamble - \newtheorem{remrk}{Remark} + \newtheorem{remrk}{Remark} EndPreamble End @@ -213,7 +214,7 @@ Style Claim LatexName claim LabelString "Claim #:" Preamble - \newtheorem{claim}{Claim} + \newtheorem{claim}{Claim} EndPreamble End @@ -223,7 +224,7 @@ Style Note LatexName note LabelString "Note #:" Preamble - \newtheorem{note}{Note} + \newtheorem{note}{Note} EndPreamble End @@ -233,7 +234,7 @@ Style Notation LatexName notation LabelString "Notation #:" Preamble - \newtheorem{notation}{Notation} + \newtheorem{notation}{Notation} EndPreamble End @@ -243,7 +244,7 @@ Style Case LatexName case LabelString "Case #:" Preamble - \newtheorem{case}{Case} + \newtheorem{case}{Case} EndPreamble End @@ -463,9 +464,13 @@ End Style MarkBoth LaTeXType Command - LaTeXName markboth + LaTeXName IEEEmarkboth Align Center AlignPossible Center + Preamble + % protect against redefinition of \markboth by babel >= 3.6 + \let\IEEEmarkboth=\markboth + EndPreamble End diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran.lyx index 298e04944f..7f7e2c3b6c 100644 --- a/lib/templates/IEEEtran.lyx +++ b/lib/templates/IEEEtran.lyx @@ -1,13 +1,8 @@ #LyX 1.5.0svn created this file. For more info see http://www.lyx.org/ -\lyxformat 271 +\lyxformat 274 \begin_document \begin_header \textclass IEEEtran -\begin_preamble -% The following definition specifies the text on the headers: -% Use this instead of the "MarkBoth" paragraph style -\markboth{This is for left pages}{and this is for right pages} -\end_preamble \language english \inputencoding default \font_roman default @@ -44,25 +39,6 @@ \begin_body -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Standard -To specify the left and right header, go to -\family sans -Document\SpecialChar \menuseparator -Settings\SpecialChar \menuseparator -Preamble -\family default - and change the definition there. -\end_layout - -\end_inset - - -\end_layout - \begin_layout Title Your Title: And maybe a bit extra \end_layout @@ -104,6 +80,21 @@ This paper presents a simple template for IEEEtran documents. simplicity, beauty, elegance \end_layout +\begin_layout MarkBoth +This is for left pages +\begin_inset ERT +status collapsed + +\begin_layout Standard + +}{ +\end_layout + +\end_inset + +and this is for right pages +\end_layout + \begin_layout Section Introduction \begin_inset Note Note @@ -164,29 +155,22 @@ Methodology \end_layout \begin_layout Theorem -\begin_inset ERT +\begin_inset OptArg status collapsed \begin_layout Standard - -[ -\end_layout - -\end_inset - Theorem name -\begin_inset ERT -status collapsed - -\begin_layout Standard - -] \end_layout \end_inset - For a named theorem or theorem-like environment you need to use a little - evil red text (LaTeX mode) around the name. +For a named theorem or theorem-like environment you need to insert the name + through +\family sans +Insert\SpecialChar \menuseparator +Short Title +\family default +, as done here. \end_layout \begin_layout Lemma @@ -396,22 +380,7 @@ status collapsed raw TeX. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Standard - -% This LaTeX comment is needed to force LyX to generate two separate environment -s -\end_layout - -\begin_layout Standard - -\end_layout - -\end_inset - +\begin_layout --Separator-- \end_layout