diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt index a3437afc10..04e23dfc6a 100644 --- a/development/Win32/packaging/AltInstaller/ChangeLog.txt +++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt @@ -1,9 +1,10 @@ Version 4.26 - LyX 1.6.8 - updated to eLyXer 1.0.4 -- updated to ImageMagick 6.6.x-y +- updated to ImageMagick 6.6.5-8 - updated to Python 2.6.6 -- updated to MiKTeX 2.9 (build 3927) +- updated to MiKTeX 2.9 (build 3972) +- support to set Serbian (Latin) as LyX menu language (new feature in LyX 1.6.8) Version 4.25 diff --git a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh index 527583175d..6c4a536c18 100644 --- a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh +++ b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh @@ -399,8 +399,9 @@ ${endif} ${if} ${LangISOCode} = 2074 + StrCpy ${LangNme} "Srpski (Latinica)" StrCpy ${LangCdeSys} "sr" - StrCpy ${LangNmeSys} "Srpski" + StrCpy ${LangNmeSys} "Srpski (Latinica)" StrCpy ${LangSysEnc} "1250" ${endif} @@ -680,6 +681,12 @@ StrCpy ${LangEnc} "cp-1251" ${endif} + ${if} ${Name} == "Srpski (Latinica)" + StrCpy ${LangCde} "sr_RS" + StrCpy ${LangNmeLyX} "serbian-latin" + StrCpy ${LangEnc} "cp-1250" + ${endif} + ${if} ${Name} == "Slovenskı" StrCpy ${LangCde} "sk_SK" StrCpy ${LangNmeLyX} "slovak" diff --git a/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt b/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt index c6943bf59f..dadcea1ad4 100644 --- a/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt +++ b/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt @@ -47,7 +47,7 @@ ImageMagick License: ImageMagick license -The folder ~\LyX\etc\ImageMagick contains all used files from ImageMagick 6.5.3 +The folder ~\LyX\etc\ImageMagick contains all used files from ImageMagick 6.5.5 --- Ghostscript diff --git a/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt b/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt index f3e4d592cf..686f3f12f2 100644 --- a/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt +++ b/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt @@ -3,7 +3,7 @@ Description This is the readme of the variant "update" of the LyXWinInstaller. Please read this file carefully to prevent troubles with the installer. The LyXWinInstaller installs the wordprocessor "LyX" (www.lyx.org) and some -needed programs on Windows 2000/XP/XPx64/Vista. +needed programs on Windows 2000/XP/XPx64/Vista/7. ! Win95, Win98, and WinME are NOT supported. ! --- diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh index d554f39e64..e70b2109da 100644 --- a/development/Win32/packaging/AltInstaller/Settings.nsh +++ b/development/Win32/packaging/AltInstaller/Settings.nsh @@ -59,14 +59,14 @@ BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}" !if ${INSTALLER_VERSION} == "Complete" !define GSviewInstall "external\gsv49w32.exe" !define JabRefInstall "external\JabRef-2.6-setup.exe" - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.3927.exe" + !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.3972.exe" !define JabRefVersion "2.6" !define MiKTeXDeliveredVersion "2.9" !endif !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex" -!define ImageMagickVersion "6.6.3" +!define ImageMagickVersion "6.6.5" # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin! !define ImageMagickDir "$INSTDIR\etc\ImageMagick" !define GhostscriptDir "$INSTDIR\etc\Ghostscript" diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh index 9392a6bbdb..0910a72d20 100644 --- a/development/Win32/packaging/AltInstaller/Updated.nsh +++ b/development/Win32/packaging/AltInstaller/Updated.nsh @@ -1,6 +1,6 @@ Function UpdateModifiedFiles - # list with modified files for LyX 1.6.8 + # list with modified files for LyX 1.6.9 SetOutPath "$INSTDIR\bin" # always here File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here @@ -9,101 +9,27 @@ Function UpdateModifiedFiles File "${PRODUCT_SOURCEDIR}\bin\setup.py" # always here SetOutPath "$INSTDIR\Resources" # always here File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here - File "${PRODUCT_SOURCEDIR}\Resources\chkconfig.ltx" - File "${PRODUCT_SOURCEDIR}\Resources\configure.py" - File "${PRODUCT_SOURCEDIR}\Resources\CREDITS" - File "${PRODUCT_SOURCEDIR}\Resources\symbols" - File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols" - SetOutPath "$INSTDIR\Resources\doc" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\ca" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\da" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\el" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\hu" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\id" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\nb" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\nl" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\pt" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\ro" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\ru" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\sl" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\sv" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\uk" - File /r "${PRODUCT_SOURCEDIR}\Resources\doc\zh_CN" - File "${PRODUCT_SOURCEDIR}\Resources\doc\Customization.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\DummyDocument1.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\DummyDocument2.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\DummyTextDocument.txt" - File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\Extended.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\LaTeXConfig.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\Math.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\doc\de" - File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Customization.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\de\EmbeddedObjects.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Math.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\de\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\doc\es" - File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Customization.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Math.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\es\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\doc\eu" - File "${PRODUCT_SOURCEDIR}\Resources\doc\eu\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\eu\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\eu\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\doc\fr" - File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Customization.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\EmbeddedObjects.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Math.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\doc\gl" - File "${PRODUCT_SOURCEDIR}\Resources\doc\gl\Intro.lyx" - SetOutPath "$INSTDIR\Resources\doc\it" - File "${PRODUCT_SOURCEDIR}\Resources\doc\it\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\it\Tutorial.lyx" - SetOutPath "$INSTDIR\Resources\doc\ja" - File "${PRODUCT_SOURCEDIR}\Resources\doc\ja\Customization.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\ja\EmbeddedObjects.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\ja\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\ja\Math.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\ja\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\ja\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\doc\pl" - File "${PRODUCT_SOURCEDIR}\Resources\doc\pl\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\pl\Tutorial.lyx" - SetOutPath "$INSTDIR\Resources\doc\sk" - File "${PRODUCT_SOURCEDIR}\Resources\doc\sk\Intro.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\sk\Tutorial.lyx" - File "${PRODUCT_SOURCEDIR}\Resources\doc\sk\UserGuide.lyx" - SetOutPath "$INSTDIR\Resources\examples" - File "${PRODUCT_SOURCEDIR}\Resources\examples\linguistics.lyx" - SetOutPath "$INSTDIR\Resources\examples\de" - File "${PRODUCT_SOURCEDIR}\Resources\examples\de\linguistics.lyx" - SetOutPath "$INSTDIR\Resources\images\math" - File "${PRODUCT_SOURCEDIR}\Resources\images\math\dddot.png" - File "${PRODUCT_SOURCEDIR}\Resources\images\math\ddddot.png" - SetOutPath "$INSTDIR\Resources\layouts" - File "${PRODUCT_SOURCEDIR}\Resources\layouts\agutex.layout" - File "${PRODUCT_SOURCEDIR}\Resources\layouts\g-brief2.layout" - File "${PRODUCT_SOURCEDIR}\Resources\layouts\memoir.layout" - File "${PRODUCT_SOURCEDIR}\Resources\layouts\scrclass.inc" + #File "${PRODUCT_SOURCEDIR}\Resources\chkconfig.ltx" + #File "${PRODUCT_SOURCEDIR}\Resources\configure.py" + #File "${PRODUCT_SOURCEDIR}\Resources\CREDITS" + #File "${PRODUCT_SOURCEDIR}\Resources\symbols" + #File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols" + #SetOutPath "$INSTDIR\Resources\doc" + #File "${PRODUCT_SOURCEDIR}\Resources\doc\Customization.lyx" + #File "${PRODUCT_SOURCEDIR}\Resources\doc\Math.lyx" + #File "${PRODUCT_SOURCEDIR}\Resources\doc\UserGuide.lyx" + #SetOutPath "$INSTDIR\Resources\examples" + #File "${PRODUCT_SOURCEDIR}\Resources\examples\linguistics.lyx" + SetOutPath "$INSTDIR\Resources\examples\sr" + File "${PRODUCT_SOURCEDIR}\Resources\examples\sr\splash.lyx" + #SetOutPath "$INSTDIR\Resources\layouts" + #File "${PRODUCT_SOURCEDIR}\Resources\layouts\agutex.layout" SetOutPath "$INSTDIR\Resources\lyx2lyx" # always here File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx2lyx_version.py" # always here - SetOutPath "$INSTDIR\Resources\man\man1" - File "${PRODUCT_SOURCEDIR}\Resources\man\man1\lyx.1" - SetOutPath "$INSTDIR\Resources\templates" - File "${PRODUCT_SOURCEDIR}\Resources\templates\agutex.lyx" - SetOutPath "$INSTDIR\Resources\ui" - File "${PRODUCT_SOURCEDIR}\Resources\ui\stdtoolbars.inc" + #SetOutPath "$INSTDIR\Resources\templates" + #File "${PRODUCT_SOURCEDIR}\Resources\templates\agutex.lyx" + #SetOutPath "$INSTDIR\Resources\ui" + #File "${PRODUCT_SOURCEDIR}\Resources\ui\stdtoolbars.inc" FunctionEnd diff --git a/development/Win32/packaging/AltInstaller/io_ui_language.ini b/development/Win32/packaging/AltInstaller/io_ui_language.ini index d9f17f0a35..548b6b239f 100644 --- a/development/Win32/packaging/AltInstaller/io_ui_language.ini +++ b/development/Win32/packaging/AltInstaller/io_ui_language.ini @@ -11,7 +11,7 @@ Text=" Available Languages " [Field 2] Type=Droplist -ListItems=Arabic|Bahasa Indonesia|Català|Ceština|Chinese (China)|Chinese (Taiwan)|Dansk|Deutsch|English|Español|Euskara|Français|Galego|Greek|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Português|Româna|Russian|Slovenskı|Slovenšcina|Suomi|Türkçe|Ukrainian +ListItems=Arabic|Bahasa Indonesia|Català|Ceština|Chinese (China)|Chinese (Taiwan)|Dansk|Deutsch|English|Español|Euskara|Français|Galego|Greek|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Português|Româna|Russian|Slovenskı|Slovenšcina|Srpski (Latinica)|Suomi|Türkçe|Ukrainian Left=20 Right=130 Top=15