IEEEtran templates: some preamble simplifications and fixes

diff --git a/lib/templates/IEEEtran-CompSoc.lyx b/lib/templates/IEEEtran-CompSoc.lyx
index 0c103163618ea859b5cbe86385d66ab13e2a7495..dc780e95eec27f76fd6f1250364b687255362cbc 100644 (file)
--- 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 c5aa973074bfaaee82ac8600dcfdf70aafc14197..bc7736875e45cc4a9b295719dd58ff16bdac4812 100644 (file)
--- 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 2f228941e0c6237f7218205250bfed45991393ca..c4b554d71064e2439d91e845e8b0088b8803f4f2 100644 (file)
--- 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