Win installer: fix installation of Arabic dictionaries.nsh

- correct name of Arabic spell checker (fixes bug #11036)
- add Arabic thesaurus
- update sourceforge's mirror list
- update some dictionaries
This commit is contained in:
Uwe Stöhr 2018-02-17 06:05:13 +01:00
parent 20d1b9d226
commit ac1d6af008
6 changed files with 57 additions and 40 deletions

View File

@ -1,5 +1,15 @@
Changelog for LyX-230-RC2:
Changelog for LyX-230-1:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
Changelog for LyX-230-RC2:
- installs LyX 2.3.0 RC2
- updated to Qt 5.9.4
- updated to ImageMagick 7.0.7-22
Changelog for LyX-230-RC1:

View File

@ -1,29 +1,22 @@
dfn
astuteinternet
ayera
cfhcable
cytranet
excellmedia
freefr
cznic
garr
optimate
kaz
kent
heanet
hivelocity
ignum
internode
iweb
jaist
netcologne
switch
kent
liquidtelecom
nchc
ncu
skylink
tcpdiag
tenet
ufpr
waia
colocrossing
citylan
aarnet
netcologne
netix
netcologne
newcontinuum
phoenixnap
razaoinfo
superb-dca2
superb-dca3
softlayer-ams
softlayer-dal
superb-sea2
ufpr
versaweb
vorboss

View File

@ -1,7 +1,7 @@
af_ZA.aff
af_ZA.dic
ar_DZ.aff
ar_DZ.dic
ar_SA.aff
ar_SA.dic
be_BY.aff
be_BY.dic
bg_BG.aff

View File

@ -1,3 +1,5 @@
th_ar_SA_v2.dat
th_ar_SA_v2.idx
th_bg_BG_v2.dat
th_bg_BG_v2.idx
th_ca_ES_v2.dat

View File

@ -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 27
# the file has 54 lines, but we only need to check for one of the 2 thesaurus files per language
${for} $5 1 28
# the file has 56 lines, but we only need to check for one of the 2 thesaurus 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
@ -77,11 +77,11 @@ Function DownloadHunspellDictionaries
# if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
${For} $4 1 29 # there are 29 mirrors in the file
${For} $4 1 22 # there are 22 mirrors in the file
FileRead $R4 $Search # $Search is now the mirror
StrCpy $Search $Search -2 # delete the linebreak characters at the end
Push $R0
inetc::get /TIMEOUT=5000 "http://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
Pop $R0
${if} $R0 == "OK"
${ExitFor}
@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
# read out the locations from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
${For} $5 1 54 # the file has 52 lines
${For} $5 1 56 # the file has 56 lines
FileRead $R5 $String # $String is now the thesaurus name
StrCpy $R3 $String 5 3 # $R3 is now the thesaurus language code
@ -123,11 +123,11 @@ Function DownloadThesaurusDictionaries
# if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
${For} $4 1 29 # there are 29 mirrors in the file
${For} $4 1 22 # there are 22 mirrors in the file
FileRead $R4 $Search # $Search is now the mirror
StrCpy $Search $Search -2 # delete the linebreak characters at the end
Push $R0
inetc::get /TIMEOUT=5000 "http://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
Pop $R0
${if} $R0 == "OK"
${ExitFor}

View File

@ -73,8 +73,8 @@ Section /o "Afrikaans" SecDAfrikaans
SectionEnd
Section /o "العربية" SecDArabic
StrCpy $DictCodes "ar_DZ,$DictCodes"
AddSize 2500
StrCpy $DictCodes "ar_SA,$DictCodes"
AddSize 7304
SectionEnd
Section /o "հայերեն" SecDArmenian
@ -99,7 +99,7 @@ SectionEnd
Section /o "Brezhoneg" SecDBreton
StrCpy $DictCodes "br_FR,$DictCodes"
AddSize 5510
AddSize 5556
SectionEnd
Section /o "български" SecDBulgarian
@ -426,7 +426,7 @@ SectionEnd
Section /o "Українська" SecDUkrainian
StrCpy $DictCodes "uk_UA,$DictCodes"
AddSize 5555
AddSize 6375
SectionEnd
Section /o "اردو" SecDUrdu
@ -444,6 +444,11 @@ SectionGroupEnd
SectionGroup "$(SecThesaurus)" SecThesaurus
Section /o "العربية" SecTArabic
StrCpy $ThesCodes "ar_SA,$ThesCodes"
AddSize 799
SectionEnd
Section /o "български" SecTBulgarian
StrCpy $ThesCodes "bg_BG,$ThesCodes"
AddSize 3020
@ -726,7 +731,7 @@ Function .onInit
SectionSetFlags ${SecDAfrikaans} $0
SectionSetSize ${SecDAfrikaans} 0
${endif}
StrCpy $Search "ar_DZ"
StrCpy $Search "ar_SA"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
@ -1228,8 +1233,15 @@ Function .onInit
# select sections of already installed thesaurus dictionaries, make them read-only
# and set the necessary size to 0 bytes
StrCpy $String $FoundThes
StrCpy $Search "bg_BG"
StrCpy $Search "ar_SA"
Call StrPoint # function from LyXUtils.nsh
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
SectionSetFlags ${SecTArabic} $0
SectionSetSize ${SecTArabic} 0
${endif}
StrCpy $Search "bg_BG"
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
SectionSetFlags ${SecTBulgarian} $0