The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 33e185e5edf8e0601a0902f0fee48574ba4db6dc Author: Uwe Stöhr <[email protected]> Date: Sat Feb 9 03:23:34 2013 +0100 IEEEtran.layout: support for conference articles - IEEEtran-Conference.lyx: new template for conference articles of the IEEE diff --git a/lib/Makefile.am b/lib/Makefile.am index 7a25325..808a0af 100644 --- a/lib/Makefile.am +++ b/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 \ diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index b0d960e..45bf24e 100644 --- a/lib/layouts/IEEEtran.layout +++ b/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 diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index d5b507a..e632c1b 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/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]], diff --git a/lib/templates/IEEEtran-CompSoc.lyx b/lib/templates/IEEEtran-CompSoc.lyx index 7dfc77d..15179d0 100644 --- a/lib/templates/IEEEtran-CompSoc.lyx +++ b/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 diff --git a/lib/templates/IEEEtran-CompSoc.lyx b/lib/templates/IEEEtran-Conference.lyx similarity index 74% copy from lib/templates/IEEEtran-CompSoc.lyx copy to lib/templates/IEEEtran-Conference.lyx index 7dfc77d..81754ac 100644 --- a/lib/templates/IEEEtran-CompSoc.lyx +++ b/lib/templates/IEEEtran-Conference.lyx @@ -1,19 +1,17 @@ #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 +\textclass IEEEtran \begin_preamble % for subfigures/subtables \ifCLASSOPTIONcompsoc \usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig} -%\usepackage[nocompress]{cite} %optional \else \usepackage[caption=false,font=footnotesize]{subfig} -%\usepackage{cite} %optional \fi \end_preamble -\options journal +\options conference \use_default_options false \maintain_unincluded_children false \language english @@ -97,15 +95,13 @@ status open \begin_layout Plain Layout -This is a template LyX file for articles to be submitted to -\begin_inset Quotes eld -\end_inset - -Computer Science -\begin_inset Quotes erd -\end_inset - - journals of the Institute of Electrical and Electronics Engineers (IEEE). +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 @@ -120,155 +116,111 @@ http://wiki.lyx.org/Examples/IEEE . \end_layout -\begin_layout Plain Layout - -\series bold -Note: -\series default - to write other IEEE documents which are not for -\begin_inset Quotes eld \end_inset -Computer Science -\begin_inset Quotes erd -\end_inset - journals use the -\emph on -IEEEtran.lyx -\emph default -template file instead of this one! \end_layout -\end_inset - - +\begin_layout Title +Your Title \end_layout -\begin_layout Standard +\begin_layout Author \begin_inset Note Note status open \begin_layout Plain Layout -It is important that you use the correct document class options for your - document.. - These are explained in the IEEEtran document class documentation: -\begin_inset Flex URL -status open - -\begin_layout Plain Layout - -http://mirror.ctan.org/macros/latex/contrib/IEEEtran/IEEEtran_HOWTO.pdf +the standard way: \end_layout \end_inset -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Title -Your Title -\end_layout +\begin_inset Flex Author Name +status collapsed -\begin_layout Author +\begin_layout Plain Layout Your \begin_inset space ~ \end_inset -Name, -\begin_inset space ~ +Name +\end_layout + \end_inset -\begin_inset Flex IEEE membership -status open +\begin_inset Flex Author Affiliation +status collapsed \begin_layout Plain Layout -Member, -\begin_inset space ~ +School of Electrical and +\begin_inset Newline newline \end_inset -IEEE, -\end_layout +Computer Engineering +\begin_inset Newline newline +\end_inset +Institute of Technology +\begin_inset Newline newline \end_inset - Second -\begin_inset space ~ +99999 Testcity +\begin_inset Newline newline \end_inset -Name, -\begin_inset space ~ +Email: [email protected] +\end_layout + \end_inset -\begin_inset Flex IEEE membership -status open +\begin_inset ERT +status collapsed \begin_layout Plain Layout -Fellow,OSA, -\end_layout -\end_inset - and -\begin_inset space ~ -\end_inset - -Third -\begin_inset space ~ -\end_inset +\backslash +and +\end_layout -Name, -\begin_inset space ~ \end_inset -\begin_inset Flex IEEE membership -status open +\begin_inset Flex Author Name +status collapsed \begin_layout Plain Layout -Life -\begin_inset space ~ -\end_inset - -Fellow, +Second \begin_inset space ~ \end_inset -IEEE +Name \end_layout \end_inset -\begin_inset Flex Author Footnote -status open - -\begin_layout Plain Layout -\begin_inset ERT -status open +\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 -\backslash -IEEEcompsocthanksitem +Email: [email protected] \end_layout \end_inset -Your -\begin_inset space ~ -\end_inset -Name is with the Department of ..., ... - Institute of ..., City, Country \begin_inset ERT status collapsed @@ -276,273 +228,268 @@ status collapsed \backslash -protect +and \end_layout \end_inset -\begin_inset Newline newline -\end_inset - -E-mail: -\begin_inset CommandInset href -LatexCommand href -target "[email protected]" - -\end_inset - -. -\begin_inset Note Note +\begin_inset Flex Author Name status collapsed \begin_layout Plain Layout +Third +\begin_inset space ~ +\end_inset -\series bold +Name +\begin_inset Newline newline +\end_inset -\backslash -IEEEcompsocthanksitem -\series default - is required for each item in the -\family sans -Author +and Fourth \begin_inset space ~ \end_inset -foot -\family default - list. - Line breaks must have a -\series bold - -\backslash -protect -\series default - in front +Name \end_layout \end_inset -\end_layout - -\begin_layout Plain Layout -\begin_inset ERT -status open +\begin_inset Flex Author Affiliation +status collapsed \begin_layout Plain Layout - - -\backslash -IEEEcompsocthanksitem -\end_layout - +Star Academy +\begin_inset Newline newline \end_inset -Second -\begin_inset space ~ +San Francisco, California 99999-9999 +\begin_inset Newline newline \end_inset -Name and Third -\begin_inset space ~ +Telephone: (800) 555--5555 +\begin_inset Newline newline \end_inset -Name is with the Department of ..., ... - Institute of ..., City, Country, e-mail: -\begin_inset CommandInset href -LatexCommand href -target "[email protected]" +Fax: (888) 555--5555 +\end_layout \end_inset -. + \end_layout -\begin_layout Plain Layout +\begin_layout Author \begin_inset Note Note status open \begin_layout Plain Layout - -\series bold -Note: -\series default - Each author must be mentioned at least once. -\end_layout - +for more than 3 +\begin_inset space ~ \end_inset - +affiliations use this way: \end_layout \end_inset -\begin_inset Foot +\begin_inset Flex Author Name status collapsed \begin_layout Plain Layout -Manuscript received April 19, 2005; revised December 27, 2012. -\end_layout - +Your +\begin_inset space ~ \end_inset - -\begin_inset Note Note +Name +\begin_inset Flex Author Mark status open \begin_layout Plain Layout -optional +1 \end_layout \end_inset +, Second +\begin_inset space ~ +\end_inset -\end_layout - -\begin_layout Special Paper Notice -Invited Paper -\begin_inset Note Note +Name +\begin_inset Flex Author Mark status open \begin_layout Plain Layout -of course optional +2 \end_layout \end_inset +, Third +\begin_inset space ~ +\end_inset -\end_layout - -\begin_layout After Title Text -after title text like dedication -\begin_inset Note Note +Name +\begin_inset Flex Author Mark status open \begin_layout Plain Layout -optional +3 \end_layout \end_inset +, Fourth +\begin_inset space ~ +\end_inset -\end_layout - -\begin_layout Page headings -\begin_inset Argument 1 +Name +\begin_inset Flex Author Mark status open \begin_layout Plain Layout -Journal of XXX +3 \end_layout \end_inset -Your Name -\begin_inset Flex Lowercase + and Fifth +\begin_inset space ~ +\end_inset + +Name +\begin_inset Flex Author Mark status open \begin_layout Plain Layout - -\emph on -et al. +4 \end_layout \end_inset -: Your Title + \end_layout -\begin_layout Publication ID -0000--0000/00$00.00 -\begin_inset space ~ \end_inset -\begin_inset ERT +\begin_inset Flex Author Affiliation status collapsed \begin_layout Plain Layout +\begin_inset Flex Author Mark +status open - -\backslash -copyright +\begin_layout Plain Layout +1 \end_layout \end_inset +School of Electrical and +\begin_inset Newline newline +\end_inset -\begin_inset space ~ +Computer Engineering +\begin_inset Newline newline \end_inset -2007 IEEE -\begin_inset Note Note -status open +Institute of Technology +\begin_inset Newline newline +\end_inset -\begin_layout Plain Layout -only if you have one +99999 Testcity +\begin_inset Newline newline +\end_inset + +Email: [email protected] \end_layout \end_inset -\end_layout - -\begin_layout Standard in Title -\begin_inset ERT +\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 -\backslash -IEEEtitleabstractindextext{ +\end_inset + +Ecole Superieure +\begin_inset Newline newline +\end_inset + +Nantes, France +\begin_inset Newline newline +\end_inset + +Email: [email protected] \end_layout \end_inset -\begin_inset Note Note +\begin_inset Flex Author Affiliation +status collapsed + +\begin_layout Plain Layout +\begin_inset Flex Author Mark status open \begin_layout Plain Layout -required +3 \end_layout \end_inset +Star Academy +\begin_inset Newline newline +\end_inset + +San Francisco, California 99999-9999 +\begin_inset Newline newline +\end_inset -\end_layout +Telephone: (800) 555--5555 +\begin_inset Newline newline +\end_inset -\begin_layout Abstract -This is the abstract text. +Fax: (888) 555--5555 \end_layout -\begin_layout Keywords -simplicity, beauty, elegance -\end_layout +\end_inset -\begin_layout Standard in Title -\begin_inset ERT + +\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 -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout -end of -\series bold +Niemandsweg 73 +\begin_inset Newline newline +\end_inset -\backslash -IEEEtitleabstractindextext +99999 Musterstadt, Germany \end_layout \end_inset @@ -550,34 +497,27 @@ IEEEtitleabstractindextext \end_layout -\begin_layout Nontitle Abstract Index Text +\begin_layout Special Paper Notice +Invited Paper \begin_inset Note Note status open \begin_layout Plain Layout -Don't add text here! +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 -This style is only necessary when using the document class option -\begin_inset Quotes eld -\end_inset - - -\family sans -conference -\family default - -\begin_inset Quotes erd -\end_inset - -. +optional \end_layout \end_inset @@ -585,25 +525,16 @@ conference \end_layout -\begin_layout Section -Introduction +\begin_layout Abstract +This is the abstract text. \end_layout -\begin_layout Standard -\begin_inset Flex Paragraph Start -status open - -\begin_layout Plain Layout -\begin_inset Argument 1 +\begin_layout Peer Review Title +\begin_inset Note Note status open \begin_layout Plain Layout -H -\end_layout - -\end_inset - -ere +Don't add text here! \end_layout \end_inset @@ -613,17 +544,21 @@ ere status open \begin_layout Plain Layout - -\family sans -Paragraph Start -\family default - is needed in the first paragraph of the document. +optional, only useful for peer review papers \end_layout \end_inset - is the text text text text text text text text text text text text text - text text text. + +\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 diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran.lyx index 9de72b2..dc1f4fc 100644 --- a/lib/templates/IEEEtran.lyx +++ b/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 diff --git a/src/version.h b/src/version.h index 5d75b10..2c70752 100644 --- a/src/version.h +++ b/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 ----------------------------------------------------------------------- Summary of changes: lib/Makefile.am | 1 + lib/layouts/IEEEtran.layout | 65 +++ lib/lyx2lyx/lyx_2_1.py | 38 ++- lib/templates/IEEEtran-CompSoc.lyx | 2 +- ...EEEtran-CompSoc.lyx => IEEEtran-Conference.lyx} | 463 +++++++++----------- lib/templates/IEEEtran.lyx | 7 +- src/version.h | 4 +- 7 files changed, 311 insertions(+), 269 deletions(-) copy lib/templates/{IEEEtran-CompSoc.lyx => IEEEtran-Conference.lyx} (74%) hooks/post-receive -- The LyX Source Repository
