Win installer.fix MiKTeX handling issues

- also add missing  code that is in the installer for about a year

development/Win32/packaging/installer/ChangeLog.txt

@@ -1,4 +1,4 @@
-Changelog for LyX-214-6:
+Changelog for LyX-214-7:
 - use a new default download server for missing LaTeX packages
 - updated to MiKTeX 2.9 build 5987
 - updated to Imagemagick 6.9.4-1
@@ -13,6 +13,10 @@
 - new Brazilian translation of the installer messages
 
 
+Changelog for LyX-214-6:
+- was officially not released
+
+
 Changelog for LyX-214-5:
 - enable the usage of 'texindy' as index generation program in LyX
 - updated to JabRef 2.11

development/Win32/packaging/installer/Packages.txt

@@ -1,3 +1,4 @@
+l3experimental
 l3kernel
 l3packages
 mptopdf
@@ -18,14 +19,11 @@ babel-croatian
 babel-czech
 babel-danish
 babel-dutch
-babel-english
 babel-esperanto
 babel-estonian
 babel-finnish 	
-babel-french
 babel-galician 	
 babel-georgian
-babel-german
 babel-greek
 babel-hebrew
 babel-hungarian
@@ -48,7 +46,6 @@ babel-serbianc
 babel-slovak
 babel-slovenian
 babel-sorbian
-babel-spanish
 babel-swedish
 babel-thai
 babel-turkish
@@ -60,17 +57,20 @@ booktabs
 braille
 breakurl
 cancel
+chemgreek
 cjk
 covington
 csquotes
-cyrillic
+datetime
 endnotes
 enumitem
+environ
 esint
 eso-pic
 fancybox
 fancyhdr
 filehook
+fmtcount
 framed
 greek-inputenc
 harvard
@@ -82,12 +82,12 @@ listings
 lithuanian
 genmisc
 mhchem
+chemgreek
 mongolian-babel
 miktex-hyph-mongolian
 natbib
 units
 nomencl
-polyglossia
 pdfcomment
 pdfpages
 prettyref
@@ -105,6 +105,7 @@ splitindex
 subfig
 tcolorbox
 thailatex
+trimspaces
 turkmen
 ulem
 undertilde
@@ -137,6 +138,7 @@ garamondx
 mathpazo
 bera
 ccfonts
+classico
 cmbright
 concmath
 concrete
@@ -163,13 +165,13 @@ tipa
 txfonts
 wasy
 zhmetrics
-ascii
 bbding
 ifsym
 marvosym
 textgreek
 txfonts
 wasysym
+a0poster
 aastex
 achemso
 aguplus
@@ -178,6 +180,7 @@ apacite
 apa
 arabtex
 beamer
+beamerposter
 bigfoot
 changepage
 cite
@@ -220,6 +223,7 @@ revtex
 revtex4
 sauerj
 savesym
+sciposter
 seminar
 simplecv
 skak
@@ -232,13 +236,17 @@ tugboat
 type1cm
 ucs
 upquote
+wallpaper
 xecjk
 xifthen
+acrotex
 answers
 chicago
+ctablestack
 frankenstein
 jsclasses
 lambda-lists
 mathdesign
 mathtools
-pdfcrop
+pdfcrop
+sansmathaccent

development/Win32/packaging/installer/include/declarations.nsh

@@ -20,6 +20,7 @@ Configuration of LyX installer
 !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick"
 !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript"
 !define FILES_NETPBM "${FILES_DEPS}\bin"
+!define FILES_RSVG "${FILES_DEPS}\bin"
 !define FILES_DTL "${FILES_DEPS}\bin"
 !define FILES_DVIPOST "${FILES_DEPS}\bin"
 !define FILES_DVIPOST_PKG "${FILES_DEPS}\tex"
@@ -43,7 +44,7 @@ Configuration of LyX installer
 
 !define APP_NAME "LyX"
 !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
-# for the proposed install folder we use the scheme "LyX 2.0" while we need for the registry the scheme "LyX 2.0.4"
+# for the proposed install folder we use the scheme "LyX 2.1" while we need for the registry the scheme "LyX 2.1.4"
 # to check if it is exactly this version (to support side by side installations)
 !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
 !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}"
@@ -56,12 +57,12 @@ Configuration of LyX installer
 !define APP_WEBPAGE_INFO "${APP_NAME} Website"
 !define APP_WIKI "http://wiki.lyx.org"
 !define APP_WIKI_INFO "${APP_NAME} Wiki"
-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2014 by the LyX Team"
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2016 by the LyX Team"
 
 !define APP_RUN "bin\lyx.exe"
 !define BIN_LYX "lyx.exe"
 
-!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX200"
+!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX210"
 !define APP_REGKEY_SETUP "${APP_REGKEY}\Setup"
 !define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings"
 

development/Win32/packaging/installer/include/filelist.nsh

@@ -19,6 +19,7 @@ Lists of files to include in the installer
 
   ${FILE}QtCore4.dll"
   ${FILE}QtGui4.dll"
+  ${FILE}QtSvg4.dll"
 
 !macroend
 
@@ -65,6 +66,12 @@ Lists of files to include in the installer
   
 !macroend
 
+!macro FileListRsvg COMMAND DIRECTORY
+
+  ${FILE}rsvg-convert.exe"
+  
+!macroend
+
 !macro FileListDvipostBin COMMAND DIRECTORY
 
   ${FILE}pplatex.exe"

development/Win32/packaging/installer/include/init.nsh

@@ -14,7 +14,7 @@ Var LyXLangName
 !macro EXTERNAL_INIT COMPONENT
 
   # APP_REGKEY_SETUP = "Software\${APP_NAME}${APP_SERIES_KEY}\Setup"
-  # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX16
+  # where ${APP_NAME}${APP_SERIES_KEY} is something like LyX21
   ReadRegStr $ComponentPath SHELL_CONTEXT "${APP_REGKEY_SETUP}" "${COMPONENT} Path"
   
   # BIN_LATEX etc are defined in settings.nsh

development/Win32/packaging/installer/settings.nsh

@@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_REVISION 4
 !define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
 !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
-!define APP_VERSION_BUILD 6 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 7 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display