mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-30 13:20:58 +00:00
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:
parent
a049bfef7a
commit
21586c196a
@ -1,6 +1,10 @@
|
|||||||
Changelog for LyX-224-1:
|
Changelog for LyX-224-1:
|
||||||
- installs LyX 2.2.4
|
- installs LyX 2.2.4
|
||||||
- new Russian translation of the installer messages
|
- new Russian translation of the installer messages
|
||||||
|
- 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-223-2:
|
Changelog for LyX-223-2:
|
||||||
|
@ -1,29 +1,22 @@
|
|||||||
dfn
|
astuteinternet
|
||||||
|
ayera
|
||||||
|
cfhcable
|
||||||
|
cytranet
|
||||||
|
excellmedia
|
||||||
freefr
|
freefr
|
||||||
cznic
|
|
||||||
garr
|
|
||||||
optimate
|
|
||||||
kaz
|
|
||||||
kent
|
|
||||||
heanet
|
|
||||||
hivelocity
|
|
||||||
ignum
|
|
||||||
internode
|
|
||||||
iweb
|
iweb
|
||||||
jaist
|
jaist
|
||||||
netcologne
|
kent
|
||||||
switch
|
liquidtelecom
|
||||||
nchc
|
nchc
|
||||||
ncu
|
netcologne
|
||||||
skylink
|
netix
|
||||||
tcpdiag
|
netcologne
|
||||||
tenet
|
newcontinuum
|
||||||
ufpr
|
phoenixnap
|
||||||
waia
|
razaoinfo
|
||||||
colocrossing
|
|
||||||
citylan
|
|
||||||
aarnet
|
|
||||||
superb-dca2
|
superb-dca2
|
||||||
superb-dca3
|
superb-sea2
|
||||||
softlayer-ams
|
ufpr
|
||||||
softlayer-dal
|
versaweb
|
||||||
|
vorboss
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
af_ZA.aff
|
af_ZA.aff
|
||||||
af_ZA.dic
|
af_ZA.dic
|
||||||
ar_DZ.aff
|
ar_SA.aff
|
||||||
ar_DZ.dic
|
ar_SA.dic
|
||||||
be_BY.aff
|
be_BY.aff
|
||||||
be_BY.dic
|
be_BY.dic
|
||||||
bg_BG.aff
|
bg_BG.aff
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
th_ar_SA_v2.dat
|
||||||
|
th_ar_SA_v2.idx
|
||||||
th_bg_BG_v2.dat
|
th_bg_BG_v2.dat
|
||||||
th_bg_BG_v2.idx
|
th_bg_BG_v2.idx
|
||||||
th_ca_ES_v2.dat
|
th_ca_ES_v2.dat
|
||||||
|
@ -43,8 +43,8 @@ Function FindDictionaries
|
|||||||
|
|
||||||
# read out the possible thesaurus filenames from the file
|
# read out the possible thesaurus filenames from the file
|
||||||
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
|
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
|
||||||
${for} $5 1 27
|
${for} $5 1 28
|
||||||
# the file has 54 lines, but we only need to check for one of the 2 thesaurus files per language
|
# 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
|
# 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
|
||||||
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"
|
# if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
|
||||||
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
|
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
|
FileRead $R4 $Search # $Search is now the mirror
|
||||||
StrCpy $Search $Search -2 # delete the linebreak characters at the end
|
StrCpy $Search $Search -2 # delete the linebreak characters at the end
|
||||||
Push $R0
|
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
|
Pop $R0
|
||||||
${if} $R0 == "OK"
|
${if} $R0 == "OK"
|
||||||
${ExitFor}
|
${ExitFor}
|
||||||
@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
|
|||||||
|
|
||||||
# read out the locations from the file
|
# read out the locations from the file
|
||||||
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
|
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
|
FileRead $R5 $String # $String is now the thesaurus name
|
||||||
StrCpy $R3 $String 5 3 # $R3 is now the thesaurus language code
|
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"
|
# if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
|
||||||
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
|
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
|
FileRead $R4 $Search # $Search is now the mirror
|
||||||
StrCpy $Search $Search -2 # delete the linebreak characters at the end
|
StrCpy $Search $Search -2 # delete the linebreak characters at the end
|
||||||
Push $R0
|
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
|
Pop $R0
|
||||||
${if} $R0 == "OK"
|
${if} $R0 == "OK"
|
||||||
${ExitFor}
|
${ExitFor}
|
||||||
|
@ -73,8 +73,8 @@ Section /o "Afrikaans" SecDAfrikaans
|
|||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section /o "العربية" SecDArabic
|
Section /o "العربية" SecDArabic
|
||||||
StrCpy $DictCodes "ar_DZ,$DictCodes"
|
StrCpy $DictCodes "ar_SA,$DictCodes"
|
||||||
AddSize 2500
|
AddSize 7304
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section /o "հայերեն" SecDArmenian
|
Section /o "հայերեն" SecDArmenian
|
||||||
@ -99,7 +99,7 @@ SectionEnd
|
|||||||
|
|
||||||
Section /o "Brezhoneg" SecDBreton
|
Section /o "Brezhoneg" SecDBreton
|
||||||
StrCpy $DictCodes "br_FR,$DictCodes"
|
StrCpy $DictCodes "br_FR,$DictCodes"
|
||||||
AddSize 5510
|
AddSize 5556
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section /o "български" SecDBulgarian
|
Section /o "български" SecDBulgarian
|
||||||
@ -426,7 +426,7 @@ SectionEnd
|
|||||||
|
|
||||||
Section /o "Українська" SecDUkrainian
|
Section /o "Українська" SecDUkrainian
|
||||||
StrCpy $DictCodes "uk_UA,$DictCodes"
|
StrCpy $DictCodes "uk_UA,$DictCodes"
|
||||||
AddSize 5555
|
AddSize 6375
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section /o "اردو" SecDUrdu
|
Section /o "اردو" SecDUrdu
|
||||||
@ -444,6 +444,11 @@ SectionGroupEnd
|
|||||||
|
|
||||||
SectionGroup "$(SecThesaurus)" SecThesaurus
|
SectionGroup "$(SecThesaurus)" SecThesaurus
|
||||||
|
|
||||||
|
Section /o "العربية" SecTArabic
|
||||||
|
StrCpy $ThesCodes "ar_SA,$ThesCodes"
|
||||||
|
AddSize 799
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
Section /o "български" SecTBulgarian
|
Section /o "български" SecTBulgarian
|
||||||
StrCpy $ThesCodes "bg_BG,$ThesCodes"
|
StrCpy $ThesCodes "bg_BG,$ThesCodes"
|
||||||
AddSize 3020
|
AddSize 3020
|
||||||
@ -599,7 +604,8 @@ Function .onInit
|
|||||||
${if} $R0 == "5.0" # 2000
|
${if} $R0 == "5.0" # 2000
|
||||||
${orif} $R0 == "5.1" # XP
|
${orif} $R0 == "5.1" # XP
|
||||||
${orif} $R0 == "5.2" # 2003
|
${orif} $R0 == "5.2" # 2003
|
||||||
MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows Vista or newer." /SD IDOK
|
${orif} $R0 == "6.0" # Vista
|
||||||
|
MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows 7 or newer." /SD IDOK
|
||||||
Quit
|
Quit
|
||||||
${endif}
|
${endif}
|
||||||
|
|
||||||
@ -725,7 +731,7 @@ Function .onInit
|
|||||||
SectionSetFlags ${SecDAfrikaans} $0
|
SectionSetFlags ${SecDAfrikaans} $0
|
||||||
SectionSetSize ${SecDAfrikaans} 0
|
SectionSetSize ${SecDAfrikaans} 0
|
||||||
${endif}
|
${endif}
|
||||||
StrCpy $Search "ar_DZ"
|
StrCpy $Search "ar_SA"
|
||||||
Call StrPoint
|
Call StrPoint
|
||||||
${if} $Pointer != "-1"
|
${if} $Pointer != "-1"
|
||||||
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
||||||
@ -1227,8 +1233,15 @@ Function .onInit
|
|||||||
# select sections of already installed thesaurus dictionaries, make them read-only
|
# select sections of already installed thesaurus dictionaries, make them read-only
|
||||||
# and set the necessary size to 0 bytes
|
# and set the necessary size to 0 bytes
|
||||||
StrCpy $String $FoundThes
|
StrCpy $String $FoundThes
|
||||||
StrCpy $Search "bg_BG"
|
StrCpy $Search "ar_SA"
|
||||||
Call StrPoint # function from LyXUtils.nsh
|
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"
|
${if} $Pointer != "-1"
|
||||||
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
||||||
SectionSetFlags ${SecTBulgarian} $0
|
SectionSetFlags ${SecTBulgarian} $0
|
||||||
|
Loading…
Reference in New Issue
Block a user