Fix (again) IEEEtran.layout.

- Restored broken compatibility with old documents due to the renaming
  of MarkBoth.
- Restored ordering such that to follow the same order obtained in the
  typeset result.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34386 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index d7044599b787f93cbce4dd8f4a88c7488a26e07b..828bb1b6263b079818fb3f9031cc3be7afdc8839 100644 (file)
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -128,7 +128,26 @@ Style Author
 End
 
 
-Style Page_headings
+Style Special_Paper_Notice
+       CopyStyle               Title
+       LatexName               IEEEspecialpapernotice
+       InTitle                 1
+       Font
+         Size                  Large
+       EndFont
+End
+
+
+Style After_Title_Text
+       CopyStyle               Special_Paper_Notice
+       LatexName               IEEEaftertitletext
+       Font
+         Size                  Normal
+       EndFont
+End
+
+
+Style MarkBoth
        LaTeXType               Command
        LaTeXName               markboth
        Category                FrontMatter
@@ -147,33 +166,14 @@ End
 
 
 Style Publisher_ID
-       CopyStyle               Title
+       CopyStyle               Special_Paper_Notice
        LatexName               IEEEpubid
-       InTitle                 1
        Font
          Size                  Small
        EndFont
 End
 
 
-Style Special_Paper_Notice
-       CopyStyle               Publisher_ID
-       LatexName               IEEEspecialpapernotice
-       Font
-         Size                  Large
-       EndFont
-End
-
-
-Style After_Title_Text
-       CopyStyle               Special_Paper_Notice
-       LatexName               IEEEaftertitletext
-       Font
-         Size                  Normal
-       EndFont
-End
-
-
 Style Abstract
        Margin                  First_Dynamic
        LatexType               Environment

diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran.lyx
index 62e05378a16abbaae0bf0f27abfa6cfeb45511ca..b82b008f3fe270f3bce6148e245def3651067c55 100644 (file)
--- a/lib/templates/IEEEtran.lyx
+++ b/lib/templates/IEEEtran.lyx
@@ -221,7 +221,35 @@ target "xxx@xxx.xxx"
 
 \end_layout
 
-\begin_layout Page headings
+\begin_layout Special Paper Notice
+Invited Paper
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+of course optional
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout After Title Text
+after title text like dedication
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+optional
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout MarkBoth
 Journal of XXX
 \begin_inset ERT
 status collapsed
@@ -299,34 +327,6 @@ only if you have one
 \end_inset
 
 
-\end_layout
-
-\begin_layout Special Paper Notice
-Invited Paper
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-of course optional
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout After Title Text
-after title text like dedication
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-optional
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Abstract