From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 9 Feb 2013 17:08:12 +0000 (+0100)
Subject: IEEEtran templates: some preamble simplifications and fixes
X-Git-Tag: 2.1.0beta1~767
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6c922c80297c75464e74c3bdc1d45decf928606d;p=lyx.git

IEEEtran templates: some preamble simplifications and fixes
---

diff --git a/lib/templates/IEEEtran-CompSoc.lyx b/lib/templates/IEEEtran-CompSoc.lyx
index 0c10316361..dc780e95ee 100644
--- a/lib/templates/IEEEtran-CompSoc.lyx
+++ b/lib/templates/IEEEtran-CompSoc.lyx
@@ -5,16 +5,11 @@
 \textclass IEEEtran-CompSoc
 \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
-\use_default_options false
+\use_default_options true
 \maintain_unincluded_children false
 \language english
 \language_package default
diff --git a/lib/templates/IEEEtran-Conference.lyx b/lib/templates/IEEEtran-Conference.lyx
index c5aa973074..bc7736875e 100644
--- a/lib/templates/IEEEtran-Conference.lyx
+++ b/lib/templates/IEEEtran-Conference.lyx
@@ -5,11 +5,7 @@
 \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
diff --git a/lib/templates/IEEEtran-Journal.lyx b/lib/templates/IEEEtran-Journal.lyx
index 2f228941e0..c4b554d710 100644
--- a/lib/templates/IEEEtran-Journal.lyx
+++ b/lib/templates/IEEEtran-Journal.lyx
@@ -5,11 +5,7 @@
 \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 journal
 \use_default_options false