installer: fix converter for HTML

- fix bug reported on the lyx-devel list that eLyXer could not be invoked if Python is not installed

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 4e4fb5c1a8de8d3b695cfde20bc6492b1d187940..53444ef23a882dd2456f67ffb62583e476248f4b 100644 (file)
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,9 @@
-Changelog for LyX-206-1:
+Changelog for LyX-206-2:
+- fix bug that View/Export a file as HTML did not work.
+
+
+Changelog for LyX-206-1:
+- installs LyX 2.0.6

 - support for Vietnamese, Thai, Serbian Cyrillic and Mongolian will now
   automatically be installed to MiKTeX
 - language support files for Belarusian and Hungarian are now included
 - support for Vietnamese, Thai, Serbian Cyrillic and Mongolian will now
   automatically be installed to MiKTeX
 - language support files for Belarusian and Hungarian are now included


@@ -11,11 +16,12 @@
   Slovakian and Swedish
   (To benefit from them you must uninstall an already installed LyX 2.0.x and
    then use this installer.)
   Slovakian and Swedish
   (To benefit from them you must uninstall an already installed LyX 2.0.x and
    then use this installer.)

-- updated thesaurus for Italian, Norwegian (Bokmal), Portuguese, Romanian,
+- updated thesaurus for Italian, Norwegian(Bokmal), Portuguese, Romanian,

   Slovakian and Slovenian
   (need to reinstall LyX to benefit from this)
 - updated to Python 2.7.4
 
   Slovakian and Slovenian
   (need to reinstall LyX to benefit from this)
 - updated to Python 2.7.4
 

+

 Changelog for LyX-2051-5:
 - Fix broken importing of TeX files to LyX
 - If a 64bit version of MiKTeX is installed it is now recognized by LyX
 Changelog for LyX-2051-5:
 - Fix broken importing of TeX files to LyX
 - If a 64bit version of MiKTeX is installed it is now recognized by LyX

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 6037ee2c033e938e1357a33bb4e6140067d914a0..ac329522d19d09566c13960d4c39e395c8769cbe 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -146,6 +146,10 @@ Section -Configure
    FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
   ${endif}
   
    FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
   ${endif}
   

+  # set path to eLyXer
+  FileWrite $R1 '\converter "lyx" "html" "python -tt \"$INSTDIR\Python\Lib\elyxer.py\" --directory $$$$r $$$$i $$$$o" ""$\r$\n\
+                 \converter "lyx" "wordhtml" "python -tt \"$INSTDIR\Python\Lib\elyxer.py\" --html --directory $$$$r $$$$i $$$$o" ""'
+  

   # use pdfview for all types of PDF files
   FileWrite $R1 '\format "pdf5" "pdf" "PDF (LuaTeX)" "u" "pdfview" "" "document,vector,menu=export"$\r$\n\
                 \format "pdf4" "pdf" "PDF (XeTeX)" "X" "pdfview" "" "document,vector,menu=export"$\r$\n\
   # use pdfview for all types of PDF files
   FileWrite $R1 '\format "pdf5" "pdf" "PDF (LuaTeX)" "u" "pdfview" "" "document,vector,menu=export"$\r$\n\
                 \format "pdf4" "pdf" "PDF (XeTeX)" "X" "pdfview" "" "document,vector,menu=export"$\r$\n\