IEEEtran.layout: support for conference articles

- IEEEtran-Conference.lyx: new template for conference articles of the IEEE

lib/Makefile.am

@@ -2074,6 +2074,7 @@ dist_templates_DATA = \
 	templates/hollywood.lyx \
 	templates/IEEEtran.lyx \
 	templates/IEEEtran-CompSoc.lyx \
+	templates/IEEEtran-Conference.lyx \
 	templates/IJMPC.lyx \
 	templates/IJMPD.lyx \
 	templates/IOP-article.lyx \

lib/layouts/IEEEtran.layout

@@ -86,6 +86,7 @@ End
 InsetLayout Flex:IEEE_membership
   LyxType	custom
   LatexType	command
+  ForcePlain	1
   LatexName	IEEEmembership
   LabelString	"IEEE membership"
   Font
@@ -136,6 +137,60 @@ Style Author
 End
 
 
+InsetLayout Flex:Author_Name
+  LyxType	custom
+  LatexType	command
+  Decoration	Classic
+  ForcePlain	1
+  LaTeXName	IEEEauthorblockN
+  LabelString	"Author name"
+  Font
+    Size	Large
+  EndFont
+  LabelFont
+    Color	blue
+    Size	Small
+  EndFont
+End
+
+
+InsetLayout Flex:Author_Affiliation
+  CopyStyle	Flex:Author_Name
+  LaTeXName	IEEEauthorblockA
+  LabelString	"Author affiliation"
+  Font
+    Size	Normal
+  EndFont
+  LabelFont
+    Color	blue
+    Size	Small
+  EndFont
+End
+
+
+InsetLayout Flex:Author_Mark
+	LyxType		custom
+	LatexType	command
+	ForcePlain	1
+	LatexName	IEEEauthorrefmark
+	LabelString	"Author mark"
+	Font
+	  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
+	EndFont
+End
+
+
 Style Special_Paper_Notice
   CopyStyle	Title
   LatexName	IEEEspecialpapernotice
@@ -259,6 +314,16 @@ Style Appendices
   EndFont
 End
 
+
+Style Peer_Review_Title
+  CopyStyle	Appendices
+  LatexName	IEEEpeerreviewmaketitle
+  Category	FrontMatter
+  TopSep	1
+  LabelString	"PeerReviewTitle"
+End
+
+
 Style Appendix
   CopyStyle	Appendices
   LatexName	appendix

lib/lyx2lyx/lyx_2_1.py

@@ -3494,6 +3494,40 @@ def revert_newframes(document):
         i = j
 
 
+def revert_IEEEtran_3(document):
+  '''
+  Reverts Flex Insets to TeX-code
+  '''
+  if document.textclass == "IEEEtran":
+    h = 0
+    i = 0
+    j = 0
+    while True:
+      if h != -1:
+        h = find_token(document.body, "\\begin_inset Flex Author Mark", h)
+      if h != -1:
+        endh = find_end_of_inset(document.body, h)
+        document.body[endh - 2 : endh + 1] = put_cmd_in_ert("}")
+        document.body[h : h + 4] = put_cmd_in_ert("\\IEEEauthorrefmark{")
+        h = h + 5
+      if i != -1:
+        i = find_token(document.body, "\\begin_inset Flex Author Name", i)
+      if i != -1:
+        endi = find_end_of_inset(document.body, i)
+        document.body[endi - 2 : endi + 1] = put_cmd_in_ert("}")
+        document.body[i : i + 4] = put_cmd_in_ert("\\IEEEauthorblockN{")
+        i = i + 5
+      if j != -1:
+        j = find_token(document.body, "\\begin_inset Flex Author Affiliation", j)
+      if j != -1:
+        endj = find_end_of_inset(document.body, j)
+        document.body[endj - 2 : endj + 1] = put_cmd_in_ert("}")
+        document.body[j : j + 4] = put_cmd_in_ert("\\IEEEauthorblockA{")
+        j = j + 5
+      if i == -1 and j == -1 and h == -1:
+        return
+
+
 ##
 # Conversion hub
 #
@@ -3545,10 +3579,12 @@ convert = [
            [456, [convert_epigraph]],
            [457, [convert_use_stackrel]],
            [458, [convert_captioninsets, convert_captionlayouts]],
-           [459, []]
+           [459, []],
+           [460, []]
           ]
 
 revert =  [
+           [459, [revert_IEEEtran_3]],
            [458, [revert_fragileframe, revert_newframes]],
            [457, [revert_captioninsets, revert_captionlayouts]],
            [456, [revert_use_stackrel]],

lib/templates/IEEEtran-CompSoc.lyx

@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 459
+\lyxformat 460
 \begin_document
 \begin_header
 \textclass IEEEtran-CompSoc

lib/templates/IEEEtran-Conference.lyx

@@ -0,0 +1,854 @@
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 460
+\begin_document
+\begin_header
+\textclass IEEEtran
+\begin_preamble
+% for subfigures/subtables
+\ifCLASSOPTIONcompsoc
+\usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig}
+\else
+\usepackage[caption=false,font=footnotesize]{subfig}
+\fi
+\end_preamble
+\options conference
+\use_default_options false
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding default
+\fontencoding global
+\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
+\bibtex_command default
+\index_command default
+\float_placement tbh
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_title "Your Title"
+\pdf_author "Your Name"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\cite_engine basic
+\cite_engine_type numerical
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\quotes_language english
+\papercolumns 2
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+This is a template LyX file for conference articles of conferences organized
+ by the Institute of Electrical and Electronics Engineers (IEEE).
+ For IEEE journal articles, see the template file 
+\emph on
+IEEEtran.lyx
+\emph default
+.
+ For general info see 
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://wiki.lyx.org/Examples/IEEE
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Title
+Your Title
+\end_layout
+
+\begin_layout Author
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+the standard way: 
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Name
+status collapsed
+
+\begin_layout Plain Layout
+Your
+\begin_inset space ~
+\end_inset
+
+Name
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+School of Electrical and
+\begin_inset Newline newline
+\end_inset
+
+Computer Engineering
+\begin_inset Newline newline
+\end_inset
+
+Institute of Technology
+\begin_inset Newline newline
+\end_inset
+
+99999 Testcity
+\begin_inset Newline newline
+\end_inset
+
+Email: test@test.tes
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+and 
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Name
+status collapsed
+
+\begin_layout Plain Layout
+Second
+\begin_inset space ~
+\end_inset
+
+Name
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+Ecole Superieure
+\begin_inset Newline newline
+\end_inset
+
+Nantes, France
+\begin_inset Newline newline
+\end_inset
+
+Email: second@second.fr
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+and 
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Name
+status collapsed
+
+\begin_layout Plain Layout
+Third
+\begin_inset space ~
+\end_inset
+
+Name
+\begin_inset Newline newline
+\end_inset
+
+and Fourth
+\begin_inset space ~
+\end_inset
+
+Name
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+Star Academy
+\begin_inset Newline newline
+\end_inset
+
+San Francisco, California 99999-9999
+\begin_inset Newline newline
+\end_inset
+
+Telephone: (800) 555--5555
+\begin_inset Newline newline
+\end_inset
+
+Fax: (888) 555--5555
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Author
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+for more than 3
+\begin_inset space ~
+\end_inset
+
+affiliations use this way: 
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Name
+status collapsed
+
+\begin_layout Plain Layout
+Your
+\begin_inset space ~
+\end_inset
+
+Name
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+, Second
+\begin_inset space ~
+\end_inset
+
+Name
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+2
+\end_layout
+
+\end_inset
+
+, Third
+\begin_inset space ~
+\end_inset
+
+Name
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+3
+\end_layout
+
+\end_inset
+
+, Fourth
+\begin_inset space ~
+\end_inset
+
+Name
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+3
+\end_layout
+
+\end_inset
+
+ and Fifth
+\begin_inset space ~
+\end_inset
+
+Name
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+4
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+School of Electrical and
+\begin_inset Newline newline
+\end_inset
+
+Computer Engineering
+\begin_inset Newline newline
+\end_inset
+
+Institute of Technology
+\begin_inset Newline newline
+\end_inset
+
+99999 Testcity
+\begin_inset Newline newline
+\end_inset
+
+Email: test@test.tes
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+2
+\end_layout
+
+\end_inset
+
+Ecole Superieure
+\begin_inset Newline newline
+\end_inset
+
+Nantes, France
+\begin_inset Newline newline
+\end_inset
+
+Email: second@second.fr
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+3
+\end_layout
+
+\end_inset
+
+Star Academy
+\begin_inset Newline newline
+\end_inset
+
+San Francisco, California 99999-9999
+\begin_inset Newline newline
+\end_inset
+
+Telephone: (800) 555--5555
+\begin_inset Newline newline
+\end_inset
+
+Fax: (888) 555--5555
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Author Affiliation
+status collapsed
+
+\begin_layout Plain Layout
+\begin_inset Flex Author Mark
+status open
+
+\begin_layout Plain Layout
+4
+\end_layout
+
+\end_inset
+
+Rückwärts GmbH
+\begin_inset Newline newline
+\end_inset
+
+Niemandsweg 73
+\begin_inset Newline newline
+\end_inset
+
+99999 Musterstadt, Germany
+\end_layout
+
+\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
+This is the abstract text.
+\end_layout
+
+\begin_layout Peer Review Title
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Don't add text here!
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+optional, only useful for peer review papers
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+Introduction
+\end_layout
+
+\begin_layout Standard
+Here is the text text text text text text text text text text text text
+ text text text text.
+\end_layout
+
+\begin_layout Section
+Previous Work
+\end_layout
+
+\begin_layout Standard
+text text text text text text text text text text text text text text text
+\end_layout
+
+\begin_layout Subsection
+subsection
+\end_layout
+
+\begin_layout Subsection
+another subsection
+\end_layout
+
+\begin_layout Section
+Methodology
+\end_layout
+
+\begin_layout Theorem
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Theorem name
+\end_layout
+
+\end_inset
+
+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
+If you don't want a theorem or lemma name don't add one.
+\end_layout
+
+\begin_layout Proof
+And here's the proof!
+\end_layout
+
+\begin_layout Section
+Results
+\end_layout
+
+\begin_layout Standard
+\begin_inset Float figure
+placement htbp
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\align center
+
+\family sans
+A single column figure goes here
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+Captions go 
+\emph on
+under
+\emph default
+ the figure
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset Float table
+placement htbp
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset Caption Standard
+
+\begin_layout Plain Layout
+Table captions go 
+\emph on
+above
+\emph default
+ the table
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\align center
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="2">
+<features rotate="0" tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0pt">
+<column alignment="center" valignment="top" width="0pt">
+<row>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+delete
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+this
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+example
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+table
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+Conclusions
+\end_layout
+
+\begin_layout Standard
+bla bla
+\end_layout
+
+\begin_layout Appendices
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Don't add text here!
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+First appendix
+\end_layout
+
+\begin_layout Standard
+Citation: 
+\begin_inset CommandInset citation
+LatexCommand citet
+key "IEEEexample:beebe_archive"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+Second appendix
+\end_layout
+
+\begin_layout Section*
+Acknowlegment
+\end_layout
+
+\begin_layout Standard
+bla bla
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Remember though that your final submission is supposed to have all the bibliogra
+phy entries embedded in the LaTeX-file.
+ This means you eventually have to copy the .bbl file into the latex file
+ and remove the bibtex lines.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset bibtex
+LatexCommand bibtex
+bibfiles "IEEEabrv,IEEEexample"
+options "IEEEtran"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Biography
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+	filename ../examples/CV-image.png
+	width 1in
+	height 1.25in
+	keepAspectRatio
+	clip
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset Argument 2
+status open
+
+\begin_layout Plain Layout
+Your Name
+\end_layout
+
+\end_inset
+
+ All about you and the what your interests are.
+\end_layout
+
+\begin_layout --Separator--
+
+\end_layout
+
+\begin_layout Biography without photo
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Coauthor
+\end_layout
+
+\end_inset
+
+Same again for the co-author, but without photo
+\end_layout
+
+\end_body
+\end_document

lib/templates/IEEEtran.lyx

@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 459
+\lyxformat 460
 \begin_document
 \begin_header
 \textclass IEEEtran
@@ -96,6 +96,11 @@ status open
 \begin_layout Plain Layout
 This is a template LyX file for articles to be submitted to journals of
  the Institute of Electrical and Electronics Engineers (IEEE).
+ For IEEE conference articles, see the template file 
+\emph on
+IEEEtran-Conference.lyx
+\emph default
+.
  For general info see 
 \begin_inset Flex URL
 status open

src/version.h

@@ -30,8 +30,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 459 // spitz: new beamer frame layouts
-#define LYX_FORMAT_TEX2LYX 459 // spitz: new beamer frame layouts
+#define LYX_FORMAT_LYX 460 // uwestoehr: new IEEE layouts
+#define LYX_FORMAT_TEX2LYX 460 // uwestoehr: new IEEE layouts
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER