new Update installer: now hopefully close to be released

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17823 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt

@@ -1,4 +1,23 @@
-Version LyX 1.5svn-09-04-2007
+Version LyX 1.5svn-15-04-2007
+
+- LyX 1.5svn from 15-04-2007
+  - reworked paragraph dialog
+  - more cleanups of the math delimiter and the document settings dialogs
+
+- fix bug that configure-script was not run after the installer told
+  you that the configuration will now start
+- fix bug in uninstalling Arabic Aspell dictionary
+- fix bug that PDFViewWin7.exe failed to start
+- add missing math fonts
+- name desktop icon according to the version to avoid interferences
+  with other installed LyX-versions
+
+- New installer Version "Update" available. With this you don't need to
+  reinstall LyX when you have the previous version "LyX 1.5svn-09-04-2007"
+  installed.
+
+
+Version LyX 1.5svn-09-04-2007
 
 - LyX 1.5svn from 09-04-2007
   - CJK fixes

development/Win32/packaging/installer/LyXWinInstaller/InstallActions-complete.nsh

@@ -298,7 +298,7 @@ Section "-Installation actions" SecInstallation
   ; create desktop icon
   ${if} $CreateDesktopIcon == "true"
    SetOutPath "$INSTDIR\bin"
-   CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
+   CreateShortCut "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
   ${endif}
 
   ; register the extension .lyx

development/Win32/packaging/installer/LyXWinInstaller/InstallActions-small.nsh

@@ -232,7 +232,7 @@ Section "-Installation actions" SecInstallation
   ; create desktop icon
   ${if} $CreateDesktopIcon == "true"
    SetOutPath "$INSTDIR\bin"
-   CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
+   CreateShortCut "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
   ${endif}
 
   ; register the extension .lyx

development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Complete.nsi

@@ -26,7 +26,7 @@ CRCCheck force
 
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5svn-xx-04-2007"
+!define PRODUCT_VERSION "1.5svn-15-04-2007"
 !define PRODUCT_VERSION_SHORT "150svn"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@@ -78,6 +78,7 @@ BrandingText "LyXWinInstaller v3.12 - Complete"
 !define MiKTeXConfigFolder "MiKTeX\2.5\miktex\config"
 !define MiKTeXDeliveredVersion "MiKTeX 2.5"
 !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.5.2580.exe"
+!define PRODUCT_VERSION_OLD "none" ; to avoid warning message because this variable is only used for the Update installer version
 
 ;--------------------------------
 ; Make some of the information above available to NSIS.

development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Small.nsi

@@ -26,7 +26,7 @@ CRCCheck force
 
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5svn-xx-04-2007"
+!define PRODUCT_VERSION "1.5svn-15-04-2007"
 !define PRODUCT_VERSION_SHORT "150svn"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@@ -73,6 +73,7 @@ BrandingText "LyXWinInstaller v3.12 - Small"
 !define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 !define MiKTeXConfigFolder "MiKTeX\2.5\miktex\config"
 !define MiKTeXDeliveredVersion "MiKTeX not included"
+!define PRODUCT_VERSION_OLD "none" ; to avoid warning message because this variable is only used for the Update installer version
 
 ;--------------------------------
 ; Make some of the information above available to NSIS.

development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Update.nsi

@@ -26,7 +26,7 @@ CRCCheck force
 
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5svn-xx-04-2007"
+!define PRODUCT_VERSION "1.5svn-15-04-2007"
 !define PRODUCT_VERSION_SHORT "150svn"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
@@ -51,7 +51,6 @@ BrandingText "LyXWinInstaller v3.12 - Update"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT}"
 !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX150svn"
 !define PRODUCT_VERSION_OLD "LyX 1.5svn-09-04-2007"
-!define PRODUCT_UPDATE_ALLOWED "LyX 1.5.0svn"
 
 !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
 
@@ -73,7 +72,6 @@ Var PathPrefix
 Var Answer
 Var UserName
 Var CreateDesktopIcon
-Var FileAssociation
 Var StartmenuFolder
 Var ProductRootKey
 Var AppPre
@@ -84,6 +82,8 @@ Var Search
 Var Pointer
 Var UserList
 Var INSTDIR_NEW
+Var OldString
+Var NewString
 
 ;--------------------------------
 ; load some NSIS libraries
@@ -242,46 +242,39 @@ Function .onInit
   
   ; Check where LyX is installed
   ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY_OLD}" "DisplayIcon"
+  ${if} $0 != ""
+    SetShellVarContext all
+    StrCpy $ProductRootKey "HKLM"
+  ${endif}
   ${if} $0 == ""
    ReadRegStr $0 HKCU "${PRODUCT_UNINST_KEY_OLD}" "DisplayIcon"
+   ${if} $0 != ""
+    SetShellVarContext current
+    StrCpy $ProductRootKey "HKCU"
+   ${endif}
    ${if} $0 == ""
     MessageBox MB_OK|MB_ICONSTOP "$(UpdateNotAllowed)"
     Abort
    ${endif}
-  ${else}
+  ${endif} ; end if $0 == 0
+  ${if} $0 != "" ; if it is found
    StrCpy $INSTDIR $0
    StrCpy $INSTDIR $INSTDIR -12 ; delete the string "\bin\lyx.exe" or "\bin\lyx.bat"
   ${endif}
   
-  ; ascertain the registry root key of the LyX installation
-  ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY_OLD}" "RootKey"
-  ${if} $0 != ""
-   SetShellVarContext all
-   StrCpy $ProductRootKey "HKLM"
-  ${else}
-   ReadRegStr $0 HKCU "${PRODUCT_UNINST_KEY_OLD}" "RootKey"
-   ${if} $0 == ""
-     MessageBox MB_OK|MB_ICONSTOP "$(UnNotInRegistryLabel)"
-     Abort
-   ${else}
-    SetShellVarContext current
-    StrCpy $ProductRootKey "HKCU"
-   ${endif}
-  ${endif}
-  
-  ; This can be reset to "true" in section SecDesktop.
-  StrCpy $CreateDesktopIcon "false"
-
   ; If the user does *not* have administrator privileges, abort
   StrCpy $Answer ""
   StrCpy $UserName ""
   !insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh
   ${if} $Answer != "yes"
-
+  ${andif} $ProductRootKey == "HKLM"
     MessageBox MB_OK|MB_ICONSTOP "$(NotAdmin)"
     Abort
   ${endif}
   
+  ; This can be reset to "true" in section SecDesktop.
+  StrCpy $CreateDesktopIcon "false"
+  
   ClearErrors
 FunctionEnd
 
@@ -293,22 +286,33 @@ FunctionEnd
 
 ;--------------------------------
 
+; The '-' makes the section invisible.
+; Sections are entered in order, so the settings above are all
+; available to SecInstallation
+; this section is only needed because a macro cannot be called twice within one section
+Section "-PreInstallation actions" SecPreInstallation
+
+SectionEnd
+
+;--------------------------------
+
 ; The '-' makes the section invisible.
 ; Sections are entered in order, so the settings above are all
 ; available to SecInstallation
 Section "-Installation actions" SecInstallation
 
   ; extract modified files
-  Call UpdateModifiedFiles
+  Call UpdateModifiedFiles ; macro from Updated.nsh
   
   ; delete files
-  Call DeleteFiles
+  Call DeleteFiles ; macro from Deleted.nsh
 
   ; delete old start menu folder
   ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY_OLD}" "StartMenu"
   RMDir /r $0
   ; delete desktop icon
-  Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
+  Delete "$DESKTOP\${PRODUCT_NAME}.lnk" ; remove this for the next version!
+  ; Delete "$DESKTOP\${PRODUCT_VERSION_OLD}.lnk" ; for the next version
   
   ; delete old registry entries
   DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY_OLD}"
@@ -323,7 +327,7 @@ Section "-Installation actions" SecInstallation
   StrCpy $String $INSTDIR
   StrCpy $Search "${PRODUCT_VERSION_OLD}"
   StrLen $3 $String
-  Call StrPoint ; search the LaTeXPath for the phrase "${PRODUCT_VERSION_OLD}" (function from LyXUtils.nsh)
+  Call StrPoint ; search the $INSTDIR for the phrase in ${PRODUCT_VERSION_OLD} ; function from LyXUtils.nsh
   ${if} $Pointer != "-1" ; if something was found
   
    IntOp $Pointer $Pointer - 1 ; jump before the first "\" of "\${PRODUCT_VERSION_OLD}"
@@ -345,7 +349,19 @@ Section "-Installation actions" SecInstallation
    FileClose $R1
    
    ; set the new path to the preferences files for all users
-   Call CheckAppPathPreferences ; Function from LyXUtils.nsh
+   StrCpy $OldString "${PRODUCT_VERSION_OLD}"
+   StrCpy $NewString "LyX ${PRODUCT_VERSION}"
+   Call CheckAppPathPreferences ; function from LyXUtils.nsh
+   
+   ; Copy the given strings to variables that the Function "ReplaceLineContent" can later access them
+   ; set new PDF-viewer settings also to the preferences file for all users
+   StrCpy $OldString "PDFViewWin7"
+   StrCpy $NewString "PDFViewWin"
+   Call CheckAppPathPreferences ; function from LyXUtils.nsh
+   ; set new PDF-viewer settings also to the preferences file in the $INSTDIR
+   ; search for "$OldString" and replace it with "$NewString"
+   ; calls function "ReplaceLineContent" from LyXUtils.nsh
+   ${LineFind} "$INSTDIR\Resources\preferences" "" "1:-1" "ReplaceLineContent" ; macro from TextFunc.nsh
    
    ; set new path to ImageMagick
    ReadRegStr $ImageMagickPath SHCTX "SOFTWARE\Classes\Applications" "AutoRun"
@@ -372,7 +388,6 @@ Section "-Installation actions" SecInstallation
   WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001
  
   ; create start menu entry
-  MessageBox MB_OK "$SMPROGRAMS\$StartmenuFolder"
   SetOutPath "$INSTDIR\bin"
   CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
@@ -382,15 +397,12 @@ Section "-Installation actions" SecInstallation
   ; create desktop icon
   ${if} $CreateDesktopIcon == "true"
    SetOutPath "$INSTDIR\bin"
-   CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
+   CreateShortCut "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}"
   ${endif}
   
   ; register the extension .lyx
-  ReadRegStr $FileAssociation HKCR "LyX\shell\open\command" ""
-  ${if} $CreateFileAssociations != ""
   ${CreateApplicationAssociation} "${PRODUCT_NAME}" "${PRODUCT_NAME}" "$(FileTypeTitle)" "${PRODUCT_EXE}" "${PRODUCT_BAT}"
   ${CreateFileAssociation} "${PRODUCT_EXT}" "${PRODUCT_NAME}" "${PRODUCT_MIME_TYPE}"
-  ${endif}
 
   ; test if Python is installed
   ; only use an existing python when it is version 2.5 because many Compaq and Dell PC are delivered

development/Win32/packaging/installer/LyXWinInstaller/LyXUtils.nsh

@@ -359,9 +359,9 @@ FunctionEnd
 ;--------------------------------
 
 Function ReplaceLineContent
- ; replaces "${PRODUCT_VERSION_OLD}" with "LyX ${PRODUCT_VERSION}"
+ ; replaces "$OldString" with "LyX $NewString"
 
- ${WordReplace} '$R9' "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" '$R9' ; macro from WordFunc.nsh
+ ${WordReplace} '$R9' "$OldString" "$NewString" "+" '$R9' ; macro from WordFunc.nsh
  Push $0
  
 FunctionEnd
@@ -387,7 +387,7 @@ Function CheckAppPathPreferences
   Pop $R0
   
   ; the usernames in the list of all users is separated by "|"
-  loop:
+  loopPrefs:
    StrCpy $String "$UserList"
    StrCpy $Search "|"
    Call StrPoint ; search for the "|"
@@ -402,10 +402,10 @@ Function CheckAppPathPreferences
    FileOpen $R1 "$AppPath\preferences" r
    IfErrors doneA
    FileClose $R1
-   ; search for "${PRODUCT_VERSION_OLD}" and replace it with "LyX ${PRODUCT_VERSION}"
+   ; search for "$OldString" and replace it with "$NewString"
    ${LineFind} "$AppPath\preferences" "" "1:-1" "ReplaceLineContent" ; macro from TextFunc.nsh
    doneA:
-  Goto loop
+  Goto loopPrefs
   ready:
   ; now do the same for the last user name
   StrCpy $0 $UserList

development/Win32/packaging/installer/LyXWinInstaller/MissingPrograms.nsh

@@ -141,7 +141,7 @@ Function MissingPrograms
   ; with outdated Python interpreters
   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
   ${if} $PythonPath != ""
-   StrCpy $PythonPath $PythonPath "" -1 ; remove the "\" at the end
+   StrCpy $PythonPath $PythonPath -1 ; remove the "\" at the end
    StrCpy $DelPythonFiles "True"
   ${endif}
 

development/Win32/packaging/installer/LyXWinInstaller/Uninstall.nsh

@@ -29,7 +29,7 @@ Section "un.LyX" un.SecUnProgramFiles
   ReadRegStr $0 ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "StartMenu"
   RMDir /r "$0"
   ; delete desktop icon
-  Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
+  Delete "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk"
   ; delete registry entries
   DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
   DeleteRegKey ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh

@@ -6,10 +6,10 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe"
  File "${PRODUCT_SOURCEDIR}\bin\pdfclose.exe"
  File "${PRODUCT_SOURCEDIR}\bin\pdfopen.exe"
- File "${PRODUCT_SOURCEDIR}\bin\PDFView.cmd"
+ File "${PRODUCT_SOURCEDIR}\bin\PDFViewWin.exe"
  SetOutPath "$INSTDIR\Resources"
  File /r "${PRODUCT_SOURCEDIR}\Resources\fonts"
- File "${PRODUCT_SOURCEDIR}\Resources\preferences7"
+ File /r "${PRODUCT_SOURCEDIR}\Resources\locale"
  File "${PRODUCT_SOURCEDIR}\Resources\CREDITS"
  SetOutPath "$INSTDIR\Resources\bind"
  File "${PRODUCT_SOURCEDIR}\Resources\bind\aqua.bind"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/danish.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'LaTeX-distributionen "MiKTeX" vil blive bru
                                     før LyX startes for første gang.$\r$\n\
                                     Vil du tjekke om der findes MiKTeX opdateringer?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Forsoget på at indstille 'path_prefix' i konfigurationen mislykkedes"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Kunne ikke oprette lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Mislykket forsog på at afvikle konfigurations-scriptet"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/dutch.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'LyX gebruikt de LaTeX softare "MiKTeX".$\r$
 				     voordat u LyX voor de eerste keer gebruikt.$\r$\n\
 				     Wilt u controleren of er updates voor MiKTeX beschikbaar zijn?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Mislukte poging om 'path_prefix' te registreren tijdens de configuratie"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "lyx.bat kon niet worden aangemaakt"
 LangString RunConfigureFailed "${LYX_LANG}" "Mislukte configuratie poging"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/english.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be use
 				     before you use LyX for the first time.$\r$\n\
 				     Would you now check for MiKTeX updates?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Could not set 'path_prefix' in the configure script"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Could not create lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Could not execute the configure script"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/french.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'La distribution LaTeX "MiKTeX" sera utilis
 				     avant d$\'utiliser LyX pour la première fois.$\r$\n\
 				     Voulez-vous vérifier maintenant les mises à jour de MiKTeX ?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Échec de l'allocation 'path_prefix' lors de la configuration."
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Création de lyx.bat impossible."
 LangString RunConfigureFailed "${LYX_LANG}" "Échec de la tentative de configuration initiale de LyX."

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/galician.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'Xunto co LyX vai-se empregar a distribuci
 				     do MiKTeX co instalador "MiKTeX Update Wizard"$\r$\n\
 				     Desexa comprovar agora se ha actualizacións do MiKTeX?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Non se puido engadir o 'path_prefix' no script de configuración"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Non se deu criado o lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Non se deu executado o script de configuración"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/german.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'Die LaTeX-Distribution "MiKTeX" wird zusamm
 				     installieren, bevor sie LyX das erste Mal benutzen.$\r$\n\
 				     Möchten Sie jetzt nach Updates für MiKTeX suchen?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "Dieses Update-Paket kann nur LyX ${PRODUCT_UPDATE_ALLOWED} updaten!"
+LangString UpdateNotAllowed "${LYX_LANG}" "Dieses Update-Paket kann nur ${PRODUCT_VERSION_OLD} updaten!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" 'Der "PATH_präfix" (Liste mit Programmpfaden) konnte nicht im Konfigurationsskript gesetzt werden.'
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Konnte die Datei lyx.bat nicht erzeugen."
 LangString RunConfigureFailed "${LYX_LANG}" "Konnte das Konfigurationsskript nicht ausführen."

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/hungarian.nsh

@@ -112,7 +112,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'A "MiKTeX" LaTeX-disztib
 				     a LyX elsõ indítása elõtt.$\r$\n\
 				     Szeretné egy ilyen frissítést most?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Nem tudom beállítani a 'path_prefix'-et a configure parancsfájlban!"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Nem tudom letrehozni a lyx.bat fájlt."
 LangString RunConfigureFailed "${LYX_LANG}" "Nem tudom végrehajtani a configure parancsfájlt!"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/italian.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'La distribuzione di LaTeX "MiKTeX" verr
 				     prima di usare LyX per la prima volta.$\r$\n\
 				     Vuoi controllare ora la presenza di aggiornamenti per MiKTeX?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Fallito tentativo di aggiornare 'path_prefix' nello script di configurazione"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Non è possibile creare lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Fallito tentativo di eseguire lo script di configurazione"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/norwegian.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be use
 				     before you use LyX for the first time.$\r$\n\
 				     Would you now check for MiKTeX updates?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"				     
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_VERSION_OLD}!"				     
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Forsøket på å stille inn 'path_prefix' i konfigurasjonsscriptet mislyktes"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Fikk ikke opprettet lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Fikk ikke kjørt konfigurasjonsscriptet"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/polish.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be use
 				     before you use LyX for the first time.$\r$\n\
 				     Would you now check for MiKTeX updates?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Nieudana próba ustawienia zmiennej 'path_prefix' w pliku skryptu konfigracyjnego"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Niedana próba utworzenia plików lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Niedana próba wykonania skryptu konfiguracyjnego"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/portuguese.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'Junto com o LyX vai-se utilizar a distribui
 				     do MiKTeX com o instalador "MiKTeX Update Wizard"$\r$\n\
 				     Deseja comprovar agora se há actualizações do MiKTeX?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Não conseguimos establecer o 'path_prefix' no script de configuração"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Não foi possível criar o lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Não foi possível executar o script de configuração"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/slovak.nsh

@@ -114,7 +114,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'LaTeX distrib
 				     pred prvým používaním LyXu.$\r$\n\
 				     Chcete teraz testova<EFBFBD> MiKTeX aktualizácie?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Nemohol uvies<65> v platnost 'path_prefix' (zoznam s cestami programu) v konfiguraènom skripte"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Nemohol prípravi<76> lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Nemohol vykona<6E> konfiguraèný skript"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/spanish.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'Junto con LyX se va usar la distribuci
 				     de MiKTeX con el instalador "MiKTeX Update Wizard"$\r$\n\
 				     ¿Desea comprobar ahora si hay actualizaciones de MiKTeX?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Error al intentar añadir 'path_prefix' durante la ejecución del programa de configuración"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "No se pudo crear lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Error al intentar ejecutar el programa de configuración"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/swedish.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'LaTeX-distributionen "MiKTeX" kommer att an
 				     innan du använder LyX för första gången.$\r$\n\
 				     Vill du kontrollera om det finns uppdateringar tillgängliga för MiKTeX nu?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Misslyckades med att sätta  'path_prefix' i konfigurationsskriptet"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Kunde inte skapa filen (kommandoskriptet) lyx.bat"
 LangString RunConfigureFailed "${LYX_LANG}" "Misslyckades med att köra konfigurationsskriptet"

development/Win32/packaging/installer/LyXWinInstaller/lyx_languages/turkish.nsh

@@ -113,7 +113,7 @@ LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be use
 				     before you use LyX for the first time.$\r$\n\
 				     Would you now check for MiKTeX updates?'
 
-LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_UPDATE_ALLOWED}!"
+LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!"
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Yapýlandýrma programýnda 'path_prefix' ayarlanamadý"
 LangString CreateCmdFilesFailed "${LYX_LANG}" "lyx.bat oluþturulamadý"
 LangString RunConfigureFailed "${LYX_LANG}" "Yapýlandýrma programý çalýþtýrýlamadý"

development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin.cfg

@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST

development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin.dof

@@ -0,0 +1,136 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1031
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=

development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin.dpr

@@ -0,0 +1,77 @@
+program PDFViewWin;
+
+{$APPTYPE CONSOLE}
+
+uses
+  Windows,SysUtils,ShellApi,Forms;
+
+var Input,InputNew : string;
+    FileTest : boolean;
+
+    
+function ExecWait(const CommandLine: string;
+                 const Visible: boolean = false;
+                 const MaxSeconds: integer = 60): boolean;
+//Executes programs and waits until they are terminated
+var
+SI: TStartupInfo;
+PI: TProcessInformation;
+ExitCode: DWORD;
+begin
+ result := false;
+ GetStartupInfo(SI);
+ if not Visible then
+ begin
+  SI.dwFlags := STARTF_USESHOWWINDOW;
+  SI.wShowWindow := SW_HIDE;
+ end;
+ if (CreateProcess(nil, pchar(CommandLine), nil, nil, False, 0, nil, nil, SI, PI)) then
+ begin
+  case WaitForSingleObject(PI.hProcess, MaxSeconds * 1000) of
+       WAIT_OBJECT_0: GetExitCodeProcess(PI.hProcess, ExitCode);
+       WAIT_ABANDONED: TerminateProcess(PI.hProcess, ExitCode);
+       WAIT_TIMEOUT: TerminateProcess(PI.hProcess, ExitCode);
+  end;
+  result := ExitCode = 0;
+  CloseHandle(PI.hProcess);
+  CloseHandle(PI.hThread);
+ end;
+end; // end function
+
+
+function RenameFile(const OldName, NewName: string): boolean;
+//renames files
+var
+  sh: TSHFileOpStruct;
+begin
+  sh.Wnd := Application.Handle;
+  sh.wFunc := fo_Rename;
+  //terminate with null byte to set list ending
+  sh.pFrom := PChar(OldName + #0);
+  sh.pTo := PChar(NewName + #0);
+  sh.fFlags := fof_Silent or fof_MultiDestFiles;
+  Result:=ShFileOperation(sh)=0;
+end; //end function
+
+
+begin //begin program 
+
+ //Read given filename
+ Input:= ParamStr(1);
+ //InputNew = original filename with ending "-preview" (e.g. test-preview.pdf)
+ InputNew:= copy(Input,1,Length(Input)-4); //remove ".pdf"
+ InputNew:= InputNew+'-preview.pdf';
+ //check if renamed file exists
+ FileTest:= FileExists(InputNew);
+ if FileTest = true then
+ begin
+  //close old file
+  ExecWait('pdfclose --file "'+InputNew+'"');
+  //delete old file
+  DeleteFile(InputNew);
+ end;
+ //rename file
+ RenameFile(Input,InputNew);
+ ExecWait('pdfopen --file "'+InputNew+'"');
+
+end. //end program 

development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFview.cmd

@@ -1,7 +0,0 @@
-if not exist "%~dpn1~%~x1" goto :go
-pdfclose --file  "%~dpn1~%~x1"
-del "%~dpn1~%~x1"
-:go
-copy %1 "%~dpn1~%~x1"
-pdfopen --file "%~dpn1~%~x1"
-exit

development/Win32/packaging/installer/LyXWinInstaller/specials/preferences7

@@ -72,9 +72,9 @@
 # FORMATS SECTION ##########################
 #
 
-\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "PDFView" "" "document,vector"
+\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "PDFViewWin" "" "document,vector"
-\format "pdf2" "pdf" "PDF (pdflatex)" "F" "PDFView" "" "document,vector"
+\format "pdf2" "pdf" "PDF (pdflatex)" "F" "PDFViewWin" "" "document,vector"
-\format "pdf" "pdf" "PDF (ps2pdf)" "P" "PDFView" "" "document,vector"
+\format "pdf" "pdf" "PDF (ps2pdf)" "P" "PDFViewWin" "" "document,vector"
 
 #
 # CONVERTERS SECTION ##########################

development/Win32/packaging/installer/LyXWinInstaller/specials/stdtoolbars.inc

@@ -16,7 +16,7 @@
 #
 # Toolbar "name" "GUI Name"
 #
-# Only four commands are allowed inside the begin_toolbar and end_toolbar
+# Only four commands are allowed inside the Toolbar and End
 # directives:
 #   Item "The tooltip" "<action> [<parameter>]" adds an icon to the toolbar performing
 #          "<action> <parameter>"
@@ -30,7 +30,7 @@
 #
 #   Minibuffer adds the command buffer (Qt only, only one may exist)
 #
-# The icons are found in the lib/image direcory under the name
+# The icons are found in the lib/images/ direcory under the name
 # action.xpm or action_parameter.xpm, except for math-insert, which
 # is e.g. lib/image/math/sum.xpm. Note that some characters are
 # replaced (e.g. ')' -> rbracket).
@@ -122,20 +122,22 @@ End
 Toolbar "math" "Math"
 	Item "Show math panel" "dialog-show mathpanel"
 	Item "Set display mode" "math-display"
+	Separator
 	Item "Subscript" "math-subscript"
 	Item "Superscript" "math-superscript"
-	Item "Insert root" "math-insert \root"
 	Item "Insert square root" "math-insert \sqrt"
+	Item "Insert root" "math-insert \root"
+	Item "Insert standard fraction" "math-insert \frac"
 	Item "Insert sum" "math-insert \sum"
 	Item "Insert integral" "math-insert \int"
 	Item "Insert product" "math-insert \prod"
 	Separator
-	Item "Insert standard fraction" "math-insert \frac"
 	Item "Insert ( )" "math-delim ( )"
 	Item "Insert [ ]" "math-delim [ ]"
 	Item "Insert { }" "math-delim { }"
+	Item "Insert delimiters" "dialog-show mathdelimiter"
 	Separator
-	Item "Insert matrix" "math-matrix 2 2"
+	Item "Insert matrix" "dialog-show mathmatrix"
 	Item "Insert cases environment" "math-insert \cases"
 	Item "Add row" "tabular-feature append-row"
 	Item "Add column" "tabular-feature append-column"