The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 6c922c80297c75464e74c3bdc1d45decf928606d
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Feb 9 18:08:12 2013 +0100
IEEEtran templates: some preamble simplifications and fixes
diff --git a/lib/templates/IEEEtran-CompSoc.lyx
b/lib/templates/IEEEtran-CompSoc.lyx
index 0c10316..dc780e9 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 c5aa973..bc77368 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 2f22894..c4b554d 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
-----------------------------------------------------------------------
Summary of changes:
lib/templates/IEEEtran-CompSoc.lyx | 7 +------
lib/templates/IEEEtran-Conference.lyx | 4 ----
lib/templates/IEEEtran-Journal.lyx | 4 ----
3 files changed, 1 insertions(+), 14 deletions(-)
hooks/post-receive
--
The LyX Source Repository
