elsarticle.lyx: don't use the geometry package because this leads to option clashes when global document class options are used, see this thread: http://www.mail-archive.com/lyx-users@lists.lyx.org/msg79184.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33320 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/AltInstaller/Updated.nsh

@@ -72,6 +72,7 @@ Function UpdateModifiedFiles
  #File "${PRODUCT_SOURCEDIR}\Resources\scripts\layout2layout.py"
  SetOutPath "$INSTDIR\Resources\templates"
  File "${PRODUCT_SOURCEDIR}\Resources\templates\dinbrief.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\templates\elsarticle.lyx"
  SetOutPath "$INSTDIR\Resources\ui"
  #File "${PRODUCT_SOURCEDIR}\Resources\ui\stdcontext.inc"
  File "${PRODUCT_SOURCEDIR}\Resources\ui\stdmenus.inc"

lib/templates/elsarticle.lyx

@@ -1,4 +1,4 @@
-#LyX 1.6.5svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.6svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -27,10 +27,10 @@ theorems-std
 \spacing single
 \use_hyperref false
 \papersize default
-\use_geometry true
+\use_geometry false
 \use_amsmath 0
 \use_esint 1
-\cite_engine basic
+\cite_engine natbib_authoryear
 \use_bibtopic false
 \paperorientation portrait
 \secnumdepth 3

status.16x

@@ -115,6 +115,9 @@ What's new
 - Quit LyX when shutting down Windows in order to not interrupt the
   shutdown sequence (bug 5525).
 
+- Fix the elsarticle template file. It is now possible to use custom
+  document class options.
+
 
 * USER INTERFACE