From 0f3dbc472f7e18f73ab67f9b63157a20c7102236 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Thu, 19 May 2016 03:28:31 +0200
Subject: [PATCH] Win installer: update thesaurus and dictionaries

- also use a better default MiKTeX repository
---
 .../Win32/packaging/installer/ChangeLog.txt   |  5 ++++
 .../installer/ThesaurusDictionaryNames.txt    |  2 ++
 .../installer/include/dictionaries.nsh        |  6 ++--
 .../packaging/installer/include/init.nsh      | 28 +++++++++++++------
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 90f738c947..aa6d835051 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -4,6 +4,11 @@ Changelog for LyX.220-RC2-1:
 - installs LyX 2.2.0 RC2
 - updated to Imagemagick 6.9.4-1
 - updated to JabRef 3.3
+- new thesaurus for Norwegian (Nynorsk)
+- updated thesaurus for English (US) and Norwegian (Bokmal)
+- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmal and Nynorsk) and Scottish
+  (To benefit from it you must uninstall an already installed LyX 2.2.0 and
+   then use this installer.)
 
 
 Changelog for LyX.220-RC1-1:
diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 1bdf28eec7..1ee0090c5a 100644
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -32,6 +32,8 @@ th_it_IT_v2.dat
 th_it_IT_v2.idx
 th_nb_NO_v2.dat
 th_nb_NO_v2.idx
+th_nn_NO_v2.dat
+th_nn_NO_v2.idx
 th_pl_PL_v2.dat
 th_pl_PL_v2.idx
 th_pt_PT_v2.dat
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh
index d66c984766..efac5c1fcc 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -43,8 +43,8 @@ Function FindDictionaries
   
   # read out the possible thesaurus filenames from the file	
   FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
-  ${for} $5 1 25
-   # the file has 50 lines, but we only need to check for one of the 2 dictionary files per language
+  ${for} $5 1 26
+   # the file has 52 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   # $String is now the dictionary name
    FileRead $R5 $String   # $String is now the dictionary name
@@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
  
  # read out the locations from the file	
  FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${For} $5 1 50          # the file has 50 lines
+ ${For} $5 1 52          # the file has 52 lines
  
   FileRead $R5 $String   # $String is now the dictionary name
   StrCpy $R3 $String 5 3 # $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 a76f4008af..9076a004c6 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -162,7 +162,7 @@ SectionEnd
 
 Section /o "English (AU)" SecDEnglishAU
  StrCpy $DictCodes "en_AU,$DictCodes"
- AddSize 587
+ AddSize 651
 SectionEnd
 
 Section /o "English (CA)" SecDEnglishCA
@@ -174,7 +174,7 @@ Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 652
+ AddSize 760
 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 530
+ AddSize 547
 SectionEnd
 
 Section "Español (ES)" SecDSpanishES
@@ -237,7 +237,7 @@ SectionEnd
 
 Section /o "Gàidhlig" SecDScottish
  StrCpy $DictCodes "gd_GB,$DictCodes"
- AddSize 3090
+ AddSize 4161
 SectionEnd
 
 Section /o "Galego" SecDGalician
@@ -317,12 +317,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecDNorwegianNB
  StrCpy $DictCodes "nb_NO,$DictCodes"
- AddSize 3992
+ AddSize 5291
 SectionEnd
 
 Section /o "Norsk (Nynorsk)" SecDNorwegianNN
  StrCpy $DictCodes "nn_NO,$DictCodes"
- AddSize 1540
+ AddSize 3292
 SectionEnd
 
 Section /o "Occitan" SecDOccitan
@@ -477,7 +477,7 @@ SectionEnd
 
 Section /o "English (US/AU)" SecTEnglishUSAU
  StrCpy $ThesCodes "en_US,$ThesCodes"
- AddSize 21600
+ AddSize 22095
 SectionEnd
 
 Section /o "Español" SecTSpanish
@@ -522,7 +522,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecTNorwegianNB
  StrCpy $ThesCodes "nb_NO,$ThesCodes"
- AddSize 2535
+ AddSize 2595
+SectionEnd
+
+Section /o "Norsk (Nynorsk)" SecTNorwegianNN
+ StrCpy $ThesCodes "nn_NO,$ThesCodes"
+ AddSize 2
 SectionEnd
 
 Section /o "Polski" SecTPolish
@@ -1328,6 +1333,13 @@ Function .onInit
    SectionSetFlags ${SecTNorwegianNB} $0
    SectionSetSize ${SecTNorwegianNB} 0
   ${endif}
+  StrCpy $Search "nn_NO"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecTNorwegianNN} $0
+   SectionSetSize ${SecTNorwegianNN} 0
+  ${endif}
   StrCpy $Search "pl_PL"
   Call StrPoint
   ${if} $Pointer != "-1"
-- 
2.39.2