installer: updated for dictionaries

- support thesaurus for Icelandic and Ukrainian
- update for other dictionaries

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 5aea69c93f6309b5b2f8fa4049217768562649c6..4e4fb5c1a8de8d3b695cfde20bc6492b1d187940 100644 (file)
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -4,9 +4,11 @@
 - language support files for Belarusian and Hungarian are now included
 - spell-checker dictionaries for Serbian(Latin) and French(Canada) are now available
   (for French(Canada) see also http://wiki.lyx.org/Windows/FrenchCanadian)
+- thesaurus dictionaries for Icelandic and Ukrainian are now available
 - updated to eLyXer 1.2.5
-- updated spell-checker dictionaries for Belarusian, Breton, Italian, Korean,
-  Latin, Norwegian, Portuguese, Romanian, Serbian(Cyrillic), Slovakian and Swedish 
+- updated spell-checker dictionaries for Belarusian, Breton, Gaelic, Interlingua,
+  Italian, Korean, Latin, Latvian, Norwegian, Portuguese, Romanian, Serbian(Cyrillic),
+  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,

diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 52b154b06ba9b9ddf082fad334a97bd9c5730ec7..b8683d5572a1ad6780ba0e98eb0899a72b1df683 100644 (file)
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -24,6 +24,8 @@ th_ga_IE_v2.dat
 th_ga_IE_v2.idx
 th_hu_HU_v2.dat
 th_hu_HU_v2.idx
+th_is_IS_v2.dat
+th_is_IS_v2.idx
 th_it_IT_v2.dat
 th_it_IT_v2.idx
 th_nb_NO_v2.dat
@@ -42,3 +44,5 @@ th_sl_SI_v2.dat
 th_sl_SI_v2.idx
 th_sv_SE_v2.dat
 th_sv_SE_v2.idx
+th_uk_UA_v2.dat
+th_uk_UA_v2.idx

diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh
index d93232d18f3ff67da422a82405e315c4953adab7..565bc3953ae475c4fc7351c78a523857eb9cfba5 100644 (file)
--- 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 22
-   # the file has 44 lines, but we only need to check for one of the 2 dictionary files per language
+  ${for} $5 1 24
+   # the file has 48 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 44          # the file has 44 lines
+ ${For} $5 1 48          # the file has 48 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 c28b07e871ca628b035ca6ff32b85254dcabce17..ef98cdac625162eec0bb0ddb78577347ad43ad67 100644 (file)
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -240,7 +240,7 @@ SectionEnd
 
 Section /o "Gàidhlig" SecDScottish
  StrCpy $DictCodes "gd_GB,$DictCodes"
- AddSize 1660
+ AddSize 1819
 SectionEnd
 
 Section /o "Galego" SecDGalician
@@ -271,7 +271,7 @@ SectionEnd
 
 Section /o "Interlingua" SecDInterlingua
  StrCpy $DictCodes "ia_IA,$DictCodes"
- AddSize 649
+ AddSize 556
 SectionEnd
 
 Section /o "Íslenska" SecDIcelandic
@@ -306,7 +306,7 @@ SectionEnd
 
 Section /o "Latvie\9au" SecDLatvian
  StrCpy $DictCodes "lv_LV,$DictCodes"
- AddSize 2140
+ AddSize 2243
 SectionEnd
 
 # enable this for LyX 2.1!
@@ -322,12 +322,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecDNorwegianNB
  StrCpy $DictCodes "nb_NO,$DictCodes"
- AddSize 5000
+ AddSize 3992
 SectionEnd
 
 Section /o "Norsk (Nynorsk)" SecDNorwegianNN
  StrCpy $DictCodes "nn_NO,$DictCodes"
- AddSize 2970
+ AddSize 2982
 SectionEnd
 
 # enable this for LyX 2.1!
@@ -499,6 +499,11 @@ Section /o "Greek" SecTGreek
  AddSize 903
 SectionEnd
 
+Section /o "Íslenska" SecTIcelandic
+ StrCpy $ThesCodes "is_IS,$ThesCodes"
+ AddSize 63
+SectionEnd
+
 Section /o "Italiano" SecTItalian
  StrCpy $ThesCodes "it_IT,$ThesCodes"
  AddSize 2520
@@ -511,7 +516,7 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecTNorwegianNB
  StrCpy $ThesCodes "nb_NO,$ThesCodes"
- AddSize 2540
+ AddSize 2535
 SectionEnd
 
 Section /o "Polski" SecTPolish
@@ -549,6 +554,11 @@ Section /o "Svenska" SecTSwedish
  AddSize 720
 SectionEnd
 
+Section /o "Ukrainian" SecTUkrainian
+ StrCpy $ThesCodes "uk_UA,$ThesCodes"
+ AddSize 1309
+SectionEnd
+
 SectionGroupEnd
 
 # Section descriptions
@@ -1248,6 +1258,13 @@ Function .onInit
    SectionSetFlags ${SecTGreek} $0
    SectionSetSize ${SecTGreek} 0
   ${endif}
+  StrCpy $Search "is_IS"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecTIcelandic} $0
+   SectionSetSize ${SecTIcelandic} 0
+  ${endif}
   StrCpy $Search "it_IT"
   Call StrPoint
   ${if} $Pointer != "-1"
@@ -1317,7 +1334,14 @@ Function .onInit
    IntOp $0 ${SF_SELECTED} | ${SF_RO}
    SectionSetFlags ${SecTSwedish} $0
    SectionSetSize ${SecTSwedish} 0
-  ${endif}*/
+  ${endif}
+  StrCpy $Search "uk_UA"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecTUkrainian} $0
+   SectionSetSize ${SecTUkrainian} 0
+  ${endif}
   
   ${IfNot} ${Silent}
     Banner::destroy