Windows installer: fix problem with installation of babel Packages

- the installer now re-synchronize MiKTeX's package database before installing or updating LaTeX-packages. This assures that new packages and renamed packages can automatically be installed when they are missing (fixes bug #9370)
- update the list of LaTeX packages that have to be installed when LyX is installed via the bundle installer for the first time on a PC
- add support for Turkish spell-checking

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 29ece140a1a32f91f98772f2f3fdb5b1d2d4d057..56d64250a427d23a904d2e664e20811680203b27 100644 (file)
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,21 @@
-Changelog for LyX-211-2:
+Changelog for LyX-212-2:
+- fix problem that some LaTeX language packages were not installed automatically
+  leading to LaTeX errors when compiling LyX documents 
+- new spell checker for Turkish
+- updated spell-checker dictionaries for English, Norwegian(Bokmal), Portuguese
+  and Scottish
+  (To benefit from them you must uninstall an already installed LyX 2.1.x and
+   then use this installer.)
+- updated thesaurus for Slovenian
+  (you need to reinstall LyX to benefit from this)
+- updated to Python 2.7.9
+
+
+Changelog for LyX-212-1:
+- installs LyX 2.1.2
+
+
+Changelog for LyX-211-2:
 - updated to Python 2.7.8
 
 

diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index dd4b08f5d9ec8c5dca1f29da6c88cf5c0c90e431..aba877cc7ed1d90dcdbbd89727284994ad8dde3e 100644 (file)
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -132,6 +132,8 @@ th_TH.aff
 th_TH.dic
 tk_TM.aff
 tk_TM.dic
+tr_TR.aff
+tr_TR.dic
 uk_UA.aff
 uk_UA.dic
 ur_PK.aff

diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt
index 166ba62bc7ee2ed44ce4005e02bdb4df3adf8669..70af0bb6e2ecfea9d6e8430e3df1643fea17694a 100644 (file)
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -8,9 +8,54 @@ apacite
 apalike
 arabi
 authordate
-babel
+babel-albanian
+babel-bahasa
+babel-basque
+babel-breton
+babel-bulgarian
+babel-catalan
+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
+babel-icelandic
+babel-interlingua
+babel-irish
+babel-italian
+babel-kurmanji
+babel-latin
+babel-latvian
+babel-norsk
+babel-polish
+babel-portuges
+babel-romanian
+babel-russian
+babel-samin
+babel-scottish
+babel-serbian  
+babel-serbianc
+babel-slovak
+babel-slovenian
+babel-sorbian
+babel-spanish
+babel-swedish
+babel-thai
+babel-turkish
+babel-ukrainian
+babel-vietnamese
+babel-welsh
 bibtopic
-bidi
 booktabs
 braille
 breakurl
@@ -23,44 +68,42 @@ endnotes
 enumitem
 esint
 eso-pic
-fontspec
 fancybox
 fancyhdr
 filehook
-float
 framed
-geometry
 greek-inputenc
 harvard
-hyperref
 hyphenat
 iftex
 jurabib
 lettrine
 listings
 lithuanian
-luainputenc
 genmisc
 mhchem
 mongolian-babel
 miktex-hyph-mongolian
-multirow
 natbib
 units
 nomencl
 polyglossia
+pdfcomment
 pdfpages
 prettyref
 preview
 refstyle
 rotating
 rotfloat
+sectionbox
 serbianc
 miktex-hyph-serbian
 setspace
+shapepar
 soul
 splitindex
 subfig
+tcolorbox
 thailatex
 turkmen
 ulem
@@ -73,7 +116,6 @@ wrapfig
 xargs
 xcolor
 xetex-def
-xkeyval
 arydshln
 binhex
 braket
@@ -82,7 +124,6 @@ caption
 colortbl
 diagbox
 etoolbox
-eurosym
 fp
 koma-script
 makecmds
@@ -92,14 +133,9 @@ pict2e
 sidecap
 was
 charter
-courier
 garamondx
-helvet
 mathpazo
-utopia
-ae
 bera
-cbgreek
 ccfonts
 cmbright
 concmath
@@ -110,14 +146,19 @@ eulervm
 feyn
 fontaxes
 fourier
+iwona
+kurier
 lh
-lmodern
+libertine
 lm-math
 luxi
-mdput
+minion2newtx
 mslapa
+newtx
 stmaryrd
 symbol
+tex-gyre
+tfrupee
 tipa
 txfonts
 wasy
@@ -145,6 +186,7 @@ ctex
 dinbrief
 dtk
 elsarticle
+elsevier
 endfloat
 epsf
 europecv
@@ -174,6 +216,7 @@ placeins
 powerdot
 pst-grad
 pst-node
+revtex
 revtex4
 sauerj
 savesym
@@ -191,4 +234,11 @@ ucs
 upquote
 xecjk
 xifthen
+answers
+chicago
+frankenstein
+jsclasses
+lambda-lists
+mathdesign
+mathtools
 pdfcrop
\ No newline at end of file

diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh
index ddef3c781161d1a124057a0a848e8085a24aaa66..d66c98476696190cac4203d3cc81e4caceb6fcee 100644 (file)
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -28,8 +28,8 @@ Function FindDictionaries
   
   # read out the possible spell-checker filenames from the file        
   FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
-  ${for} $5 1 70
-   # the file has 140 lines, but we only need to check for one of the 2 dictionary files per language
+  ${for} $5 1 71
+   # the file has 142 lines, but we only need to check for one of the 2 dictionary files per language
    # therefore check only for every second line
    FileRead $R5 $String   # skip the .aff file
    FileRead $R5 $String   # $String is now the .dic filename
@@ -66,7 +66,7 @@ Function DownloadHunspellDictionaries
  
  # read out the locations from the file        
  FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${For} $5 1 140       # the file has 140 lines
+ ${For} $5 1 142       # the file has 142 lines
  
   FileRead $R5 $String # $String is now the dictionary name
   StrCpy $R3 $String -6 # $R3 is now the dictionary language code

diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index feade0dfd64fd58c0483b1a4b9c505ac4cf7b0f8..d01ec8d66aed26e4d5eac3e734524c7025c83a83 100644 (file)
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -167,14 +167,14 @@ SectionEnd
 
 Section /o "English (CA)" SecDEnglishCA
  StrCpy $DictCodes "en_CA,$DictCodes"
- AddSize 690
+ AddSize 531
 SectionEnd
 
 Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 757
+ AddSize 652
 SectionEnd
 
 Section /o "English (NZ)" SecDEnglishNZ
@@ -186,7 +186,7 @@ Section "English (US)" SecDEnglishUS
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 688
+ AddSize 530
 SectionEnd
 
 Section "Español (ES)" SecDSpanishES
@@ -237,7 +237,7 @@ SectionEnd
 
 Section /o "Gàidhlig" SecDScottish
  StrCpy $DictCodes "gd_GB,$DictCodes"
- AddSize 2504
+ AddSize 3090
 SectionEnd
 
 Section /o "Galego" SecDGalician
@@ -322,7 +322,7 @@ SectionEnd
 
 Section /o "Norsk (Nynorsk)" SecDNorwegianNN
  StrCpy $DictCodes "nn_NO,$DictCodes"
- AddSize 1515
+ AddSize 1540
 SectionEnd
 
 Section /o "Occitan" SecDOccitan
@@ -342,7 +342,7 @@ SectionEnd
 
 Section /o "Português (PT)" SecDPortuguesePT
  StrCpy $DictCodes "pt_PT,$DictCodes"
- AddSize 1595
+ AddSize 1490
 SectionEnd
 
 Section /o "Româna" SecDRomanian
@@ -415,6 +415,11 @@ Section /o "T
  AddSize 950
 SectionEnd
 
+Section /o "Türkçe" SecDTurkish
+ StrCpy $DictCodes "tr_TR,$DictCodes"
+ AddSize 8870
+SectionEnd
+
 Section /o "Ukrainian" SecDUkrainian
  StrCpy $DictCodes "uk_UA,$DictCodes"
  AddSize 3077
@@ -542,7 +547,7 @@ SectionEnd
 
 Section /o "Sloven\9acina" SecTSlovenian
  StrCpy $ThesCodes "sl_SI,$ThesCodes"
- AddSize 1121
+ AddSize 1110
 SectionEnd
 
 Section /o "Slovenský" SecTSlovakian
@@ -1180,6 +1185,13 @@ Function .onInit
    SectionSetFlags ${SecDTurkmen} $0
    SectionSetSize ${SecDTurkmen} 0
   ${endif}
+  StrCpy $Search "tr_TR"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecDTurkish} $0
+   SectionSetSize ${SecDTurkish} 0
+  ${endif}
   StrCpy $Search "uk_UA"
   Call StrPoint
   ${if} $Pointer != "-1"

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index cc52db455bd2cc3384cdfb03faface1fa0ee867f..56b2b7bb378f92eedd213672fb13bfe8d9972d7e 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 1
-!define APP_VERSION_REVISION 0
+!define APP_VERSION_REVISION 2
 !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 1 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 2 # 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
 

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 639bfd5ccf3d59118611ad259851d043a5c3ec5f..a26bcbef9808f26aac79c8842f15b851beba974b 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -215,17 +215,26 @@ Section -ConfigureScript
   # ask to update MiKTeX
   ${if} $LaTeXInstalled == "MiKTeX"
    Call UpdateMiKTeX # function from latex.nsh
-   # install all necessary packages at once
+   # install all necessary packages at once because this is much faster then to install the packages one by one
+   # NOTE: the babelpackages-txt list is only necessary for LyX 2.1.2 ans 2.1.3 because of the restructuration
+   # of babel in MiKTeX. This can be removed for LyX 2.1.4
    DetailPrint $(TEXT_CONFIGURE_LYX)
    ${if} $MultiUser.Privileges != "Admin"
    ${andif} $MultiUser.Privileges != "Power"
     # call the non-admin version
+    # at first we need to synchronize the package database
+    nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"'
+    nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\babel-Packages.txt"'
    ${else}
     ${if} $MiKTeXUser != "HKCU" # call the admin version
+     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--update-db"'
      nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"'
+     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--install-some=$INSTDIR\Resources\babel-Packages.txt"'
     ${else}
+     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
      nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"'
+     nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\babel-Packages.txt"'
     ${endif}
    ${endif}
   ${endif}