mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 06:15:16 +00:00
installer: further work on dictionary handling and bugfixes
- remove the error-prone method of finding dictionaries by renaming some - add new dictionaries for future LyX 2.1 (more to come) - update and correct some dictionary sizes - fix detection of the possible 64bit programs jedit, Gimp, GhostScript and GSview - remove detection of old Vim version
This commit is contained in:
Uwe Stöhr
parent
e447cdbd6b
commit
45b4bd1f0c
@ -10,14 +10,16 @@ br_FR.aff
|
||||
br_FR.dic
|
||||
ca_ES.aff
|
||||
ca_ES.dic
|
||||
cop_EG.aff
|
||||
cop_EG.dic
|
||||
cs_CZ.aff
|
||||
cs_CZ.dic
|
||||
cy_GB.aff
|
||||
cy_GB.dic
|
||||
da_DK.aff
|
||||
da_DK.dic
|
||||
db_DE.aff
|
||||
db_DE.dic
|
||||
dsb_DE.aff
|
||||
dsb_DE.dic
|
||||
de_AT.aff
|
||||
de_AT.dic
|
||||
de_CH.aff
|
||||
@ -56,8 +58,10 @@ gd_GB.aff
|
||||
gd_GB.dic
|
||||
gl_ES.aff
|
||||
gl_ES.dic
|
||||
hb_DE.aff
|
||||
hb_DE.dic
|
||||
hi_IN.aff
|
||||
hi_IN.dic
|
||||
hsb_DE.aff
|
||||
hsb_DE.dic
|
||||
he_IL.aff
|
||||
he_IL.dic
|
||||
hr_HR.aff
|
||||
@ -92,6 +96,8 @@ nl_NL.aff
|
||||
nl_NL.dic
|
||||
nn_NO.aff
|
||||
nn_NO.dic
|
||||
oc_FR.aff
|
||||
oc_FR.dic
|
||||
pl_PL.aff
|
||||
pl_PL.dic
|
||||
pt_BR.aff
|
||||
@ -112,9 +118,15 @@ sr_RS.aff
|
||||
sr_RS.dic
|
||||
sv_SE.aff
|
||||
sv_SE.dic
|
||||
ta_IN.aff
|
||||
ta_IN.dic
|
||||
te_IN.aff
|
||||
te_IN.dic
|
||||
th_TH.aff
|
||||
th_TH.dic
|
||||
uk_UA.aff
|
||||
uk_UA.dic
|
||||
ur_PK.aff
|
||||
ur_PK.dic
|
||||
vi_VN.aff
|
||||
vi_VN.dic
|
||||
|
||||
@ -39,7 +39,15 @@ Function MissingPrograms
|
||||
# check if third-party programs are installed
|
||||
|
||||
# test if Ghostscript is installed
|
||||
# Ghostscript is a mandatory program for LyX thus check all cases:
|
||||
# 1. 32bit Windows
|
||||
# 2. 64bit Windows but 32bit Ghostscript
|
||||
# 3. 64bit Windows and 64bit Ghostscript
|
||||
StrCpy $3 0
|
||||
${if} ${RunningX64}
|
||||
SetRegView 64
|
||||
${endif}
|
||||
# case 1. and 3.
|
||||
GSloop:
|
||||
EnumRegKey $1 HKLM "Software\GPL Ghostscript" $3
|
||||
${if} $1 != ""
|
||||
@ -61,6 +69,13 @@ Function MissingPrograms
|
||||
goto GSloop
|
||||
${endif} # if $2
|
||||
${endif}
|
||||
SetRegView 32
|
||||
# repeat for case 2.
|
||||
${if} ${RunningX64}
|
||||
${andif} $GhostscriptPath == ""
|
||||
StrCpy $3 0
|
||||
goto GSloop
|
||||
${endif}
|
||||
|
||||
# test if Python is installed
|
||||
# only use an existing python when it is version 2.5 or newer because some
|
||||
@ -87,19 +102,37 @@ Function MissingPrograms
|
||||
StrCpy $Acrobat "Yes"
|
||||
${endif}
|
||||
|
||||
# test if a PostScript-viewer is installed, only check for GSview32
|
||||
StrCpy $PSVPath ""
|
||||
ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path"
|
||||
# test if a PostScript-viewer is installed, only check for GSview
|
||||
# check all cases:
|
||||
# 1. 32bit Windows
|
||||
# 2. 64bit Windows but 32bit GSview
|
||||
# 3. 64bit Windows and 64bit GSview
|
||||
${if} ${RunningX64}
|
||||
SetRegView 64
|
||||
StrCpy $PSVPath ""
|
||||
ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview64.exe" "Path"
|
||||
SetRegView 32
|
||||
${endif}
|
||||
# repeat for case 2. and 3.
|
||||
${if} $PSVPath == ""
|
||||
ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path"
|
||||
${endif}
|
||||
|
||||
# test if an editor with syntax-highlighting for LaTeX-files is installed
|
||||
Call EditorCheck
|
||||
|
||||
# test if an image editor is installed
|
||||
StrCpy $ImageEditorPath ""
|
||||
ReadRegStr $ImageEditorPath HKLM "Software\Classes\GIMP-2.8-xcf\shell\open\command" ""
|
||||
# first check for Gimp which is a 64bit application on x64 Windows
|
||||
${if} ${RunningX64}
|
||||
SetRegView 64
|
||||
${endif}
|
||||
ReadRegStr $ImageEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1" "InstallLocation"
|
||||
${if} $ImageEditorPath != ""
|
||||
StrCpy $ImageEditorPath "$ImageEditorPath" -19 # delete '\gimp-2.x.exe" "%1"'
|
||||
StrCpy $ImageEditorPath $ImageEditorPath "" 1 # remove the leading quote
|
||||
StrCpy $ImageEditorPath "$ImageEditorPathbin" # add the bin folder
|
||||
${endif}
|
||||
${if} ${RunningX64}
|
||||
SetRegView 32
|
||||
${endif}
|
||||
# check for Photoshop
|
||||
ReadRegStr $0 HKLM "Software\Classes\Applications\Photoshop.exe\shell\open\command" ""
|
||||
@ -156,20 +189,13 @@ Function FindDictionaries
|
||||
|
||||
# read out the possible spell-checker filenames from the file
|
||||
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
|
||||
${for} $5 1 60
|
||||
# the file has 120 lines, but we only need to check for one of the 2 dictionary files per language
|
||||
${for} $5 1 66
|
||||
# the file has 132 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
|
||||
FileRead $R5 $String # skip the .aff file
|
||||
FileRead $R5 $String # $String is now the .dic filename
|
||||
StrCpy $String $String -2 # remove the linebreak characters
|
||||
StrCpy $R3 $String -4 # $R3 is now the dictionary language code
|
||||
# we have 2 cases where we renamed the file to a 3 letter code, see thesaurus.nsh
|
||||
${if} $String == "db_DE.dic"
|
||||
StrCpy $String "dsb_DE.dic"
|
||||
${endif}
|
||||
${if} $String == "hb_DE.dic"
|
||||
StrCpy $String "hsb_DE.dic"
|
||||
${endif}
|
||||
!insertmacro FileCheck $4 $String "$INSTDIR\Resources\dicts" # macro from LyXUtils.nsh
|
||||
${if} $4 == "True"
|
||||
StrCpy $FoundDict "$R3 $FoundDict"
|
||||
@ -203,11 +229,17 @@ Function EditorCheck
|
||||
# (check for jEdit, PSPad, WinShell, ConTEXT, Crimson Editor, Vim, TeXnicCenter, LaTeXEditor, WinEdt, LEd, WinTeX)
|
||||
StrCpy $EditorPath ""
|
||||
StrCpy $0 ""
|
||||
# check for jEdit
|
||||
# check for jEdit which is a 64bit application on x64 Windows
|
||||
${if} ${RunningX64}
|
||||
SetRegView 64
|
||||
${endif}
|
||||
ReadRegStr $EditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jEdit_is1" "InstallLocation"
|
||||
${if} $EditorPath != ""
|
||||
StrCpy $EditorPath $EditorPath -1 # remove "\" from the end of the string
|
||||
${endif}
|
||||
${if} ${RunningX64}
|
||||
SetRegView 32
|
||||
${endif}
|
||||
# check for PSPad
|
||||
StrCpy $0 ""
|
||||
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PSPad editor_is1" "InstallLocation"
|
||||
@ -236,13 +268,6 @@ Function EditorCheck
|
||||
StrCpy $0 $0 -14 # remove "\uninstall.exe"
|
||||
StrCpy $EditorPath "$EditorPath;$0"
|
||||
${endif}
|
||||
# check for Vim 6.x
|
||||
StrCpy $0 ""
|
||||
ReadRegStr $0 HKLM "Software\Classes\Applications\gvim.exe\shell\edit\command" ""
|
||||
${if} $0 != ""
|
||||
StrCpy $0 $0 -13 # remove "gvim.exe "%1""
|
||||
StrCpy $EditorPath "$EditorPath;$0"
|
||||
${endif}
|
||||
# check for Vim 7.0
|
||||
StrCpy $0 ""
|
||||
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0" "UninstallString"
|
||||
|
||||
@ -66,286 +66,292 @@ SectionEnd
|
||||
SectionGroup "Dictionaries" SecDictionaries
|
||||
|
||||
Section /o "Afrikaans" SecDAfrikaans
|
||||
StrCpy $DictCodes "af_ZA$DictCodes"
|
||||
StrCpy $DictCodes "af_ZA,$DictCodes"
|
||||
AddSize 1440
|
||||
SectionEnd
|
||||
|
||||
Section /o "Arabic" SecDArabic
|
||||
StrCpy $DictCodes "ar_DZ$DictCodes"
|
||||
StrCpy $DictCodes "ar_DZ,$DictCodes"
|
||||
AddSize 2500
|
||||
SectionEnd
|
||||
|
||||
Section /o "Armenian" SecDArmenian
|
||||
StrCpy $DictCodes "hy_AM$DictCodes"
|
||||
StrCpy $DictCodes "hy_AM,$DictCodes"
|
||||
AddSize 2000
|
||||
SectionEnd
|
||||
|
||||
Section /o "Bahasa Indonesia" SecDIndonesian
|
||||
StrCpy $DictCodes "id_ID$DictCodes"
|
||||
StrCpy $DictCodes "id_ID,$DictCodes"
|
||||
AddSize 217
|
||||
SectionEnd
|
||||
|
||||
Section /o "Bahasa Melayu" SecDMalayan
|
||||
StrCpy $DictCodes "ms_MY$DictCodes"
|
||||
StrCpy $DictCodes "ms_MY,$DictCodes"
|
||||
AddSize 227
|
||||
SectionEnd
|
||||
|
||||
Section /o "Belarusian" SecDBelarusian
|
||||
StrCpy $DictCodes "be_BY$DictCodes"
|
||||
AddSize 1040
|
||||
StrCpy $DictCodes "be_BY,$DictCodes"
|
||||
AddSize 1730
|
||||
SectionEnd
|
||||
|
||||
Section /o "Brezhoneg" SecDBreton
|
||||
StrCpy $DictCodes "br_FR$DictCodes"
|
||||
StrCpy $DictCodes "br_FR,$DictCodes"
|
||||
AddSize 11000
|
||||
SectionEnd
|
||||
|
||||
Section /o "Bulgarian" SecDBulgarian
|
||||
StrCpy $DictCodes "bg_BG$DictCodes"
|
||||
StrCpy $DictCodes "bg_BG,$DictCodes"
|
||||
AddSize 985
|
||||
SectionEnd
|
||||
|
||||
Section /o "Català" SecDCatalanian
|
||||
StrCpy $DictCodes "ca_ES$DictCodes"
|
||||
StrCpy $DictCodes "ca_ES,$DictCodes"
|
||||
AddSize 1210
|
||||
SectionEnd
|
||||
|
||||
Section /o "Ceština" SecDCzech
|
||||
StrCpy $DictCodes "cs_CZ$DictCodes"
|
||||
StrCpy $DictCodes "cs_CZ,$DictCodes"
|
||||
AddSize 2190
|
||||
SectionEnd
|
||||
|
||||
# enable this for LyX 2.1!
|
||||
#Section /o "Coptic" SecDCoptic
|
||||
# StrCpy $DictCodes "cop_EG,$DictCodes"
|
||||
# AddSize 151
|
||||
#SectionEnd
|
||||
|
||||
Section /o "Cymraeg" SecDWelsh
|
||||
StrCpy $DictCodes "cy_GB$DictCodes"
|
||||
StrCpy $DictCodes "cy_GB,$DictCodes"
|
||||
AddSize 1540
|
||||
SectionEnd
|
||||
|
||||
Section /o "Dansk" SecDDanish
|
||||
StrCpy $DictCodes "da_DK$DictCodes"
|
||||
StrCpy $DictCodes "da_DK,$DictCodes"
|
||||
AddSize 2470
|
||||
SectionEnd
|
||||
|
||||
Section /o "German (A)" SecDGermanAT
|
||||
StrCpy $DictCodes "de_AT$DictCodes"
|
||||
AddSize 1000
|
||||
StrCpy $DictCodes "de_AT,$DictCodes"
|
||||
AddSize 3620
|
||||
SectionEnd
|
||||
|
||||
Section /o "German (CH)" SecDGermanCH
|
||||
StrCpy $DictCodes "de_CH$DictCodes"
|
||||
AddSize 1000
|
||||
StrCpy $DictCodes "de_CH,$DictCodes"
|
||||
AddSize 3620
|
||||
SectionEnd
|
||||
|
||||
Section "German (D)" SecDGermanD
|
||||
# already installed by default
|
||||
SectionIn RO
|
||||
#StrCpy $DictCodes "de_DE$DictCodes"
|
||||
AddSize 2650
|
||||
#StrCpy $DictCodes "de_DE,$DictCodes"
|
||||
AddSize 3620
|
||||
SectionEnd
|
||||
|
||||
Section /o "Greek" SecDGreek
|
||||
StrCpy $DictCodes "el_GR$DictCodes"
|
||||
StrCpy $DictCodes "el_GR,$DictCodes"
|
||||
AddSize 6550
|
||||
SectionEnd
|
||||
|
||||
Section /o "Eesti" SecDEstonian
|
||||
StrCpy $DictCodes "et_EE$DictCodes"
|
||||
StrCpy $DictCodes "et_EE,$DictCodes"
|
||||
AddSize 4400
|
||||
SectionEnd
|
||||
|
||||
# enable this for LyX 2.1!
|
||||
#Section /o "English (AU)" SecDEnglishAU
|
||||
# StrCpy $DictCodes "en_AU$DictCodes"
|
||||
# StrCpy $DictCodes "en_AU,$DictCodes"
|
||||
# AddSize 587
|
||||
#SectionEnd
|
||||
|
||||
Section /o "English (CA)" SecDEnglishCA
|
||||
StrCpy $DictCodes "en_CA$DictCodes"
|
||||
StrCpy $DictCodes "en_CA,$DictCodes"
|
||||
AddSize 690
|
||||
SectionEnd
|
||||
|
||||
Section "English (GB)" SecDEnglishGB
|
||||
# already installed by default
|
||||
SectionIn RO
|
||||
#StrCpy $DictCodes "en_GB$DictCodes"
|
||||
#StrCpy $DictCodes "en_GB,$DictCodes"
|
||||
AddSize 757
|
||||
SectionEnd
|
||||
|
||||
# enable this for LyX 2.1!
|
||||
#Section /o "English (NZ)" SecDEnglishNZ
|
||||
# StrCpy $DictCodes "en_NZ$DictCodes"
|
||||
# StrCpy $DictCodes "en_NZ,$DictCodes"
|
||||
# AddSize 551
|
||||
#SectionEnd
|
||||
|
||||
Section "English (US)" SecDEnglishUS
|
||||
# already installed by default
|
||||
SectionIn RO
|
||||
#StrCpy $DictCodes "en_US$DictCodes"
|
||||
#StrCpy $DictCodes "en_US,$DictCodes"
|
||||
AddSize 688
|
||||
SectionEnd
|
||||
|
||||
Section "Español (ES)" SecDSpanishES
|
||||
# already installed by default
|
||||
SectionIn RO
|
||||
#StrCpy $DictCodes "es_ES$DictCodes"
|
||||
#StrCpy $DictCodes "es_ES,$DictCodes"
|
||||
AddSize 974
|
||||
SectionEnd
|
||||
|
||||
Section "Español (MX)" SecDSpanishMX
|
||||
# already installed by default
|
||||
SectionIn RO
|
||||
#StrCpy $DictCodes "es_MX$DictCodes"
|
||||
#StrCpy $DictCodes "es_MX,$DictCodes"
|
||||
AddSize 924
|
||||
SectionEnd
|
||||
|
||||
Section /o "Esperanto" SecDEsperanto
|
||||
StrCpy $DictCodes "eo_EO$DictCodes"
|
||||
StrCpy $DictCodes "eo_EO,$DictCodes"
|
||||
AddSize 389
|
||||
SectionEnd
|
||||
|
||||
Section /o "Euskara" SecDBasque
|
||||
StrCpy $DictCodes "eu_ES$DictCodes"
|
||||
StrCpy $DictCodes "eu_ES,$DictCodes"
|
||||
AddSize 4850
|
||||
SectionEnd
|
||||
|
||||
Section /o "Farsi" SecDFarsi
|
||||
StrCpy $DictCodes "fa_IR$DictCodes"
|
||||
StrCpy $DictCodes "fa_IR,$DictCodes"
|
||||
AddSize 6710
|
||||
SectionEnd
|
||||
|
||||
Section "Français" SecDFrench
|
||||
# already installed by default
|
||||
SectionIn RO
|
||||
#StrCpy $DictCodes "fr_FR$DictCodes"
|
||||
#StrCpy $DictCodes "fr_FR,$DictCodes"
|
||||
AddSize 1200
|
||||
SectionEnd
|
||||
|
||||
Section /o "Gaeilge" SecDGaelic
|
||||
StrCpy $DictCodes "ga_IR$DictCodes"
|
||||
StrCpy $DictCodes "ga_IR,$DictCodes"
|
||||
AddSize 1090
|
||||
SectionEnd
|
||||
|
||||
Section /o "Gàidhlig" SecDScottish
|
||||
StrCpy $DictCodes "gd_GB$DictCodes"
|
||||
StrCpy $DictCodes "gd_GB,$DictCodes"
|
||||
AddSize 2460
|
||||
SectionEnd
|
||||
|
||||
Section /o "Galego" SecDGalician
|
||||
StrCpy $DictCodes "gl_ES$DictCodes"
|
||||
StrCpy $DictCodes "gl_ES,$DictCodes"
|
||||
AddSize 916
|
||||
SectionEnd
|
||||
|
||||
Section /o "Hebrew" SecDHebrew
|
||||
StrCpy $DictCodes "he_IL$DictCodes"
|
||||
StrCpy $DictCodes "he_IL,$DictCodes"
|
||||
AddSize 3120
|
||||
SectionEnd
|
||||
|
||||
Section /o "Hrvatski" SecDCroatian
|
||||
StrCpy $DictCodes "hr_HR$DictCodes"
|
||||
StrCpy $DictCodes "hr_HR,$DictCodes"
|
||||
AddSize 2240
|
||||
SectionEnd
|
||||
|
||||
Section /o "Magyar" SecDHungarian
|
||||
StrCpy $DictCodes "hu_HU$DictCodes"
|
||||
StrCpy $DictCodes "hu_HU,$DictCodes"
|
||||
AddSize 3380
|
||||
SectionEnd
|
||||
|
||||
Section /o "Interlingua" SecDInterlingua
|
||||
StrCpy $DictCodes "ia_IA$DictCodes"
|
||||
StrCpy $DictCodes "ia_IA,$DictCodes"
|
||||
AddSize 649
|
||||
SectionEnd
|
||||
|
||||
Section /o "Íslenska" SecDIcelandic
|
||||
StrCpy $DictCodes "is_IS$DictCodes"
|
||||
StrCpy $DictCodes "is_IS,$DictCodes"
|
||||
AddSize 2320
|
||||
SectionEnd
|
||||
|
||||
Section /o "Italiano" SecDItalian
|
||||
StrCpy $DictCodes "it_IT$DictCodes"
|
||||
StrCpy $DictCodes "it_IT,$DictCodes"
|
||||
AddSize 1300
|
||||
SectionEnd
|
||||
|
||||
Section /o "Kazakh" SecDKazakh
|
||||
StrCpy $DictCodes "kk_KZ$DictCodes"
|
||||
StrCpy $DictCodes "kk_KZ,$DictCodes"
|
||||
AddSize 2120
|
||||
SectionEnd
|
||||
|
||||
Section /o "Korean" SecDKorean
|
||||
StrCpy $DictCodes "ko_KR$DictCodes"
|
||||
StrCpy $DictCodes "ko_KR,$DictCodes"
|
||||
AddSize 15200
|
||||
SectionEnd
|
||||
|
||||
Section /o "Latina" SecDLatin
|
||||
StrCpy $DictCodes "la_LA$DictCodes"
|
||||
StrCpy $DictCodes "la_LA,$DictCodes"
|
||||
AddSize 1250
|
||||
SectionEnd
|
||||
|
||||
Section /o "Lietuviu" SecDLithuanian
|
||||
StrCpy $DictCodes "lt_LT$DictCodes"
|
||||
StrCpy $DictCodes "lt_LT,$DictCodes"
|
||||
AddSize 1320
|
||||
SectionEnd
|
||||
|
||||
Section /o "Latviešu" SecDLatvian
|
||||
StrCpy $DictCodes "lv_LV$DictCodes"
|
||||
StrCpy $DictCodes "lv_LV,$DictCodes"
|
||||
AddSize 2140
|
||||
SectionEnd
|
||||
|
||||
Section /o "Nederlands" SecDDutch
|
||||
StrCpy $DictCodes "nl_NL$DictCodes"
|
||||
StrCpy $DictCodes "nl_NL,$DictCodes"
|
||||
AddSize 1820
|
||||
SectionEnd
|
||||
|
||||
Section /o "Norsk (Bokmål)" SecDNorwegianNB
|
||||
StrCpy $DictCodes "nb_NO$DictCodes"
|
||||
StrCpy $DictCodes "nb_NO,$DictCodes"
|
||||
AddSize 4890
|
||||
SectionEnd
|
||||
|
||||
Section /o "Norsk (Nynorsk)" SecDNorwegianNN
|
||||
StrCpy $DictCodes "nn_NO$DictCodes"
|
||||
StrCpy $DictCodes "nn_NO,$DictCodes"
|
||||
AddSize 2890
|
||||
SectionEnd
|
||||
|
||||
Section /o "Polski" SecDPolish
|
||||
StrCpy $DictCodes "pl_PL$DictCodes"
|
||||
StrCpy $DictCodes "pl_PL,$DictCodes"
|
||||
AddSize 4540
|
||||
SectionEnd
|
||||
|
||||
Section /o "Português (BR)" SecDPortugueseBR
|
||||
StrCpy $DictCodes "pt_BR$DictCodes"
|
||||
StrCpy $DictCodes "pt_BR,$DictCodes"
|
||||
AddSize 5280
|
||||
SectionEnd
|
||||
|
||||
Section /o "Português (PT)" SecDPortuguesePT
|
||||
StrCpy $DictCodes "pt_PT$DictCodes"
|
||||
StrCpy $DictCodes "pt_PT,$DictCodes"
|
||||
AddSize 1460
|
||||
SectionEnd
|
||||
|
||||
Section /o "Româna" SecDRomanian
|
||||
StrCpy $DictCodes "ro_RO$DictCodes"
|
||||
StrCpy $DictCodes "ro_RO,$DictCodes"
|
||||
AddSize 1930
|
||||
SectionEnd
|
||||
|
||||
Section /o "Russian" SecDRussian
|
||||
StrCpy $DictCodes "ru_RU$DictCodes"
|
||||
StrCpy $DictCodes "ru_RU,$DictCodes"
|
||||
AddSize 1920
|
||||
SectionEnd
|
||||
|
||||
Section /o "Serbšcina (Dolno)" SecDSorbianD
|
||||
StrCpy $DictCodes "db_DE$DictCodes"
|
||||
StrCpy $DictCodes "dsb_DE,$DictCodes"
|
||||
AddSize 904
|
||||
SectionEnd
|
||||
|
||||
Section /o "Serbšcina (Horno)" SecDSorbianH
|
||||
StrCpy $DictCodes "hb_DE$DictCodes"
|
||||
StrCpy $DictCodes "hsb_DE,$DictCodes"
|
||||
AddSize 740
|
||||
SectionEnd
|
||||
|
||||
Section /o "Shqipe" SecDAlbanian
|
||||
StrCpy $DictCodes "sq_AL$DictCodes"
|
||||
StrCpy $DictCodes "sq_AL,$DictCodes"
|
||||
AddSize 2400
|
||||
SectionEnd
|
||||
|
||||
Section /o "Slovenšcina" SecDSlowenian
|
||||
StrCpy $DictCodes "sl_SI$DictCodes"
|
||||
StrCpy $DictCodes "sl_SI,$DictCodes"
|
||||
AddSize 2840
|
||||
SectionEnd
|
||||
|
||||
@ -355,28 +361,28 @@ Section /o "Slovensk
|
||||
SectionEnd
|
||||
|
||||
Section /o "Srpski" SecDSerbian
|
||||
StrCpy $DictCodes "sr_RS$DictCodes"
|
||||
StrCpy $DictCodes "sr_RS,$DictCodes"
|
||||
AddSize 3460
|
||||
SectionEnd
|
||||
|
||||
Section /o "Svenska" SecDSwedish
|
||||
StrCpy $DictCodes "sv_SE$DictCodes"
|
||||
StrCpy $DictCodes "sv_SE,$DictCodes"
|
||||
AddSize 1030
|
||||
SectionEnd
|
||||
|
||||
Section /o "Thai" SecDThai
|
||||
StrCpy $DictCodes "th_TH$DictCodes"
|
||||
StrCpy $DictCodes "th_TH,$DictCodes"
|
||||
AddSize 351
|
||||
SectionEnd
|
||||
|
||||
Section /o "Ukrainian" SecDUkrainian
|
||||
StrCpy $DictCodes "uk_UA$DictCodes"
|
||||
StrCpy $DictCodes "uk_UA,$DictCodes"
|
||||
AddSize 2620
|
||||
SectionEnd
|
||||
|
||||
Section /o "Vietnamese" SecDVietnamese
|
||||
StrCpy $DictCodes "vi_VN$DictCodes"
|
||||
AddSize 39600
|
||||
StrCpy $DictCodes "vi_VN,$DictCodes"
|
||||
AddSize 40
|
||||
SectionEnd
|
||||
|
||||
SectionGroupEnd
|
||||
@ -654,6 +660,15 @@ Function .onInit
|
||||
SectionSetFlags ${SecDCzech} $0
|
||||
SectionSetSize ${SecDCzech} 0
|
||||
${endif}
|
||||
|
||||
StrCpy $Search "cop_EG"
|
||||
Call StrPoint
|
||||
${if} $Pointer != "-1"
|
||||
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
||||
# enable this for LyX 2.1!
|
||||
# SectionSetFlags ${SecDCoptic} $0
|
||||
# SectionSetSize ${SecDCoptic} 0
|
||||
${endif}
|
||||
StrCpy $Search "cy_GB"
|
||||
Call StrPoint
|
||||
${if} $Pointer != "-1"
|
||||
@ -936,14 +951,14 @@ Function .onInit
|
||||
SectionSetFlags ${SecDRussian} $0
|
||||
SectionSetSize ${SecDRussian} 0
|
||||
${endif}
|
||||
StrCpy $Search "db_DE"
|
||||
StrCpy $Search "dsb_DE"
|
||||
Call StrPoint
|
||||
${if} $Pointer != "-1"
|
||||
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
||||
SectionSetFlags ${SecDSorbianD} $0
|
||||
SectionSetSize ${SecDSorbianD} 0
|
||||
${endif}
|
||||
StrCpy $Search "hb_DE"
|
||||
StrCpy $Search "hsb_DE"
|
||||
Call StrPoint
|
||||
${if} $Pointer != "-1"
|
||||
IntOp $0 ${SF_SELECTED} | ${SF_RO}
|
||||
|
||||
@ -35,6 +35,7 @@ Configuration of standard NSIS header files
|
||||
!include MultiUser.nsh
|
||||
!include nsDialogs.nsh
|
||||
!include InstallOptions.nsh
|
||||
!include x64.nsh
|
||||
|
||||
# Set of various macros and functions
|
||||
!include include\LyXUtils.nsh
|
||||
|
||||
@ -6,10 +6,10 @@ Function DownloadHunspellDictionary
|
||||
|
||||
# read out the locations from the file
|
||||
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
|
||||
${For} $5 1 120 # the file has 120 lines
|
||||
${For} $5 1 132 # the file has 132 lines
|
||||
|
||||
FileRead $R5 $String # $String is now the dictionary name
|
||||
StrCpy $R3 $String 5 # $R3 is now the dictionary language code
|
||||
StrCpy $R3 $String -6 # $R3 is now the dictionary language code
|
||||
|
||||
${if} $DictCode == $R3
|
||||
StrCpy $String $String -2 # delete the linebreak characters at the end
|
||||
@ -97,8 +97,16 @@ Function InstallHunspellDictionary
|
||||
|
||||
# download the dictionaries
|
||||
${Do}
|
||||
StrCpy $DictCode $DictCodes 5
|
||||
StrCpy $DictCodes $DictCodes "" 5
|
||||
# take the first code
|
||||
StrCpy $Search ","
|
||||
StrCpy $String $DictCodes
|
||||
Call StrPoint
|
||||
${if} $Pointer != "-1"
|
||||
StrCpy $DictCode $DictCodes $Pointer
|
||||
# remove the taken code from the list
|
||||
IntOp $Pointer $Pointer + 1
|
||||
StrCpy $DictCodes $DictCodes "" $Pointer
|
||||
${endif}
|
||||
# don't dowload existing ones thus check if $DictCode is in $FoundDict
|
||||
StrCpy $String $FoundDict
|
||||
StrCpy $Search $DictCode
|
||||
@ -108,16 +116,6 @@ Function InstallHunspellDictionary
|
||||
${endif}
|
||||
${LoopUntil} $DictCodes == ""
|
||||
|
||||
# some dictionaries need to be renamed to have a 2 letter code
|
||||
${if} ${FileExists} "$INSTDIR\Resources\dicts\db_DE.aff"
|
||||
Rename "$INSTDIR\Resources\dicts\db_DE.aff" "$INSTDIR\Resources\dicts\dsb_DE.aff"
|
||||
Rename "$INSTDIR\Resources\dicts\db_DE.dic" "$INSTDIR\Resources\dicts\dsb_DE.dic"
|
||||
${endif}
|
||||
${if} ${FileExists} "$INSTDIR\Resources\dicts\hb_DE.aff"
|
||||
Rename "$INSTDIR\Resources\dicts\hb_DE.aff" "$INSTDIR\Resources\dicts\hsb_DE.aff"
|
||||
Rename "$INSTDIR\Resources\dicts\hb_DE.dic" "$INSTDIR\Resources\dicts\hsb_DE.dic"
|
||||
${endif}
|
||||
|
||||
FunctionEnd
|
||||
|
||||
#--------------------------------
|
||||
@ -127,8 +125,9 @@ Function InstallThesaurusDictionary
|
||||
|
||||
# download the dictionaries
|
||||
${Do}
|
||||
StrCpy $ThesCode $ThesCodes 5
|
||||
StrCpy $ThesCodes $ThesCodes "" 5
|
||||
# all codes have 5 characters
|
||||
StrCpy $ThesCode $ThesCodes 5 # take the first code
|
||||
StrCpy $ThesCodes $ThesCodes "" 5 # remove the taken code from the list
|
||||
# don't dowload existing ones thus check if $ThesCode is in $FoundThes
|
||||
StrCpy $String $FoundThes
|
||||
StrCpy $Search $ThesCode
|
||||
|
||||
@ -111,7 +111,7 @@ Section -Configure
|
||||
${if} $ImageEditorPath != ""
|
||||
StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath"
|
||||
${endif}
|
||||
${if} $GhostscriptPath != ""
|
||||
${if} $GhostscriptPath != ""
|
||||
StrCpy $PathPrefix "$PathPrefix;$GhostscriptPath"
|
||||
${endif}
|
||||
${if} $SVGPath != ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user