-Version LyX 1.5beta1-19-02-2007
+Version LyX 1.5svn-30-03-2007
+
+- LyX 1.5svn from 30-03-2007
+ - improved TOC dialog
+ - fixes for RTL languages
+ - antialiased symbols in math
+ - new chapter in EmbeddedObjects manual
+ - revised German Userguide
+ - new syntax highlighting for document(LaTeX)-preamble
+ - polished bookmark handling
+ - new window style for View -> View Source
+ - many, many bug fixes
+
+- updated to ImageMagick 6.3.3-4
+
+- add missing DLL to run Python on all Win platforms
+- add missing image files for EmbeddedObjects manual
+
+
+Version LyX 1.5beta1-19-02-2007
- LyX 1.5beta1 from 19-02-2007
- improvements for CJK languages
-# Lyx for Windows, NSIS v2 series installer script
+; Lyx for Windows, NSIS v2 series installer script
-# File LyXWinInstaller.nsi
-# This file is part of LyX, the document processor.
-# http://www.lyx.org/
-# Licence details can be found in the file COPYING or copy at
-# http://www.lyx.org/about/license.php3
+; File LyXWinInstaller.nsi
+; This file is part of LyX, the document processor.
+; http://www.lyx.org/
+; Licence details can be found in the file COPYING or copy at
+; http://www.lyx.org/about/license.php3
-# Author Uwe Stöhr based on the work of Angus Leeming and Joost Verburg
-# Full author contact details are available in file CREDITS or copy at
-# http://www.lyx.org/about/credits.php
+; Author Uwe St�hr based on the work of Angus Leeming and Joost Verburg
+; Full author contact details are available in file CREDITS or copy at
+; http://www.lyx.org/about/credits.php
-# This script requires NSIS 2.22 and newer
-# http://nsis.sourceforge.net/
-#--------------------------------
+; This script requires NSIS 2.22 and newer
+; http://nsis.sourceforge.net/
+;--------------------------------
-# Do a Cyclic Redundancy Check to make sure the installer
-# was not corrupted by the download.
+; Do a Cyclic Redundancy Check to make sure the installer
+; was not corrupted by the download.
CRCCheck force
-# Make the installer as small as possible.
-# SetCompressor lzma
+; Make the installer as small as possible.
+; SetCompressor lzma
-#--------------------------------
-# You should need to change only these macros...
+;--------------------------------
+; You should need to change only these macros...
!define PRODUCT_DIR "D:\LyXPackage1.5"
!define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5beta1-19-02-2007"
+!define PRODUCT_VERSION "1.5svn-30-03-2007"
!define PRODUCT_VERSION_SHORT "150svn"
!define PRODUCT_SUBFOLDER "lyx15"
!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
!define PRODUCT_ABOUT_URL "http://www.lyx.org/about/"
!define PRODUCT_INFO_URL "http://www.lyx.org/"
-BrandingText "LyXWinInstaller v3.09 - Complete"
+BrandingText "LyXWinInstaller v3.10 - Complete"
!define INSTALLER_VERSION "Complete"
-!define INSTALLER_EXE "LyXWin150beta1Complete-3-09.exe"
-!define INSTALLER2_EXE "LyXWin150beta1Small-3-09.exe" ; to check later if this installer version is running at the same time
+!define INSTALLER_EXE "LyXWin150beta1Complete-3-10.exe"
+!define INSTALLER2_EXE "LyXWin150beta1Small-3-10.exe" ; to check later if this installer version is running at the same time
!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
-# Replaced by HKLM or HKCU depending on SetShellVarContext.
+; Replaced by HKLM or HKCU depending on SetShellVarContext.
!define PRODUCT_ROOT_KEY "SHCTX"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\lyx.exe"
!define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
-!define ImageMagickVersion "6.3.2"
+!define ImageMagickVersion "6.3.3"
!define ImageMagickDir "$INSTDIR\etc\ImageMagick" ; for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
!define GhostscriptDir "$INSTDIR\etc\Ghostscript"
!define GhostscriptVersion "8.54"
!define JabRefInstall "external\JabRef-2.2-Setup.exe"
!define JabRefVersion "JabRef 2.2"
!define DVIPostFileDir "${PRODUCT_SOURCEDIR}\external\dvipost"
-# the following variable is needed for a possible CD-version, see InstallActions.nsh, around line 213
-#!define LaTeXPackagesDir "${PRODUCT_SOURCEDIR}\latex"
+; the following variable is needed for a possible CD-version, see InstallActions.nsh, around line 213
+;!define LaTeXPackagesDir "${PRODUCT_SOURCEDIR}\latex"
!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
!define MiKTeXConfigFolder "MiKTeX\2.5\miktex\config"
!define MiKTeXDeliveredVersion "MiKTeX 2.5"
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.5.2580.exe"
-#--------------------------------
-# Make some of the information above available to NSIS.
+;--------------------------------
+; Make some of the information above available to NSIS.
Name "${PRODUCT_NAME}"
OutFile "${INSTALLER_EXE}"
InstallDir "$PROGRAMFILES\${PRODUCT_NAME} ${PRODUCT_VERSION}"
-#--------------------------------
-# Variables
+;--------------------------------
+; Variables
Var LatexPath
Var PythonPath
Var UserList
Var RunNumber
-#--------------------------------
-# load some NSIS libraries
+;--------------------------------
+; load some NSIS libraries
!include "MUI.nsh"
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!include "StrFunc.nsh"
-#!include "TextFunc.nsh"
-#!insertmacro LineFind
+;!include "TextFunc.nsh"
+;!insertmacro LineFind
-# Set of various macros and functions
+; Set of various macros and functions
!include "LyXUtils.nsh"
-# Function to check if needed programs are missing or not
+; Function to check if needed programs are missing or not
!include "MissingPrograms.nsh"
-# Functions for page to set installer language
-# and LyX's menu language
+; Functions for page to set installer language
+; and LyX's menu language
!include "LanguageSettings.nsh"
-# Function for page to install Aspell dictionaries
+; Function for page to install Aspell dictionaries
!include "Aspell.nsh"
-# Use the Abiword macros to help set up associations with the file extension in the Registry.
-# Grabbed from
-# http://abiword.pchasm.org/source/cvs/abiword-cvs/abi/src/pkg/win/setup/NSISv2/abi_util_fileassoc.nsh
+; Use the Abiword macros to help set up associations with the file extension in the Registry.
+; Grabbed from
+; http://abiword.pchasm.org/source/cvs/abiword-cvs/abi/src/pkg/win/setup/NSISv2/abi_util_fileassoc.nsh
!include "abi_util_fileassoc.nsh"
-#--------------------------------
+;--------------------------------
-# Remember the installer language
+; Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
!define MUI_UNICON "${PRODUCT_DIR}\icons\lyx.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "${VERSION_BITMAP}"
-# Welcome page
+; Welcome page
!define MUI_WELCOMEPAGE_TEXT "$(WelcomePageText)"
!insertmacro MUI_PAGE_WELCOME
-# Show the license.
+; Show the license.
!insertmacro MUI_PAGE_LICENSE "${PRODUCT_LICENSE_FILE}"
-# Specify the installation directory.
+; Specify the installation directory.
!insertmacro MUI_PAGE_DIRECTORY
-# Specify LyX's menu language.
+; Specify LyX's menu language.
Page custom SelectMenuLanguage SelectMenuLanguage_LeaveFunction
-# Define which components to install.
+; Define which components to install.
!insertmacro MUI_PAGE_COMPONENTS
-# Specify where to install program shortcuts.
+; Specify where to install program shortcuts.
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_ROOT_KEY}"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${PRODUCT_VERSION}"
!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} $StartmenuFolder
-# Check for needed programs
+; Check for needed programs
Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
-# Watch the components being installed.
+; Watch the components being installed.
!insertmacro MUI_PAGE_INSTFILES
-# Finish page
+; Finish page
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)"
!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchProduct"
!insertmacro MUI_PAGE_FINISH
-# The uninstaller.
+; The uninstaller.
!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_INSTFILES
-#--------------------------------
-# Languages
+;--------------------------------
+; Languages
!insertmacro MUI_LANGUAGE "English" # first language is the default language
!insertmacro MUI_LANGUAGE "Danish"
LicenseData "$(LyXLicenseData)"
-#--------------------------------
-# Reserve Files
+;--------------------------------
+; Reserve Files
-# These files are inserted before other files in the data block
+; These files are inserted before other files in the data block
!insertmacro MUI_RESERVEFILE_LANGDLL
ReserveFile "io_ui_language.ini"
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-#--------------------------------
-# Installer sections
+;--------------------------------
+; Installer sections
Section "!${PRODUCT_NAME}" SecCore
SectionIn RO
StrCpy $InstallJabRef "true"
SectionEnd
-# Section descriptions
+; Section descriptions
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
!insertmacro MUI_DESCRIPTION_TEXT ${SecAllUsers} "$(SecAllUsersDescription)"
!include "InstallActions-complete.nsh"
-#--------------------------------
-# This hook function is called internally by NSIS on installer startup
+;--------------------------------
+; This hook function is called internally by NSIS on installer startup
Function .onInit
- # set the installer language to the Windows locale language
+ ; set the installer language to the Windows locale language
System::Call "kernel32::GetUserDefaultLangID()i.a"
- # Check that the installer is not currently running
+ ; Check that the installer is not currently running
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${INSTALLER_EXE}.Instance") i .r1 ?e'
Pop $R0
${if} $R0 != "0"
Abort
${endif}
- # Check if LyX is already installed
+ ; Check if LyX is already installed
ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher"
${if} $0 != ""
MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)"
Abort
${endif}
- # Default settings
- # These can be reset to "all" in section SecAllUsers.
+ ; Default settings
+ ; These can be reset to "all" in section SecAllUsers.
SetShellVarContext current
StrCpy $ProductRootKey "HKCU"
- # This can be reset to "true" in section SecDesktop.
+ ; This can be reset to "true" in section SecDesktop.
StrCpy $CreateDesktopIcon "false"
StrCpy $CreateFileAssociations "false"
- # If the user does *not* have administrator privileges, abort
+ ; If the user does *not* have administrator privileges, abort
StrCpy $Answer ""
StrCpy $UserName ""
!insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh
Abort
${endif}
- # check which programs are installed or not
+ ; check which programs are installed or not
Call MissingPrograms ; function from MissingPrograms.nsh
- # don't let the installer sections appear when the programs are already installed
+ ; don't let the installer sections appear when the programs are already installed
${if} $PSVPath != ""
SectionSetText 4 "" ; hides the corresponding uninstaller section, ${SecInstGSview}
${endif}
ClearErrors
FunctionEnd
-#--------------------------------
+;--------------------------------
Function LaunchProduct
Exec ${PRODUCT_BAT}
FunctionEnd
-#--------------------------------
+;--------------------------------
-#Function DeleteLines
-# StrCpy $0 SkipWrite
-# Push $0
-#FunctionEnd
+;Function DeleteLines
+; StrCpy $0 SkipWrite
+; Push $0
+;FunctionEnd
-#--------------------------------
-# The Uninstaller
+;--------------------------------
+; The Uninstaller
Function un.onInit
- # Check that LyX is not currently running
+ ; Check that LyX is not currently running
FindProcDLL::FindProc "lyx.exe"
${if} $R0 == "1"
MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)"
Abort
${endif}
- # Ascertain whether the user has sufficient privileges to uninstall.
+ ; Ascertain whether the user has sufficient privileges to uninstall.
SetShellVarContext current
ReadRegStr $0 HKCU "${PRODUCT_UNINST_KEY}" "RootKey"
${endif}
${endif}
- # If the user does *not* have administrator privileges, abort
+ ; If the user does *not* have administrator privileges, abort
StrCpy $Answer ""
!insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh
${if} $Answer == "yes"
Abort
${endif}
- # Macro to investigate name of LyX's preferences folders to be able remove them
+ ; Macro to investigate name of LyX's preferences folders to be able remove them
!insertmacro UnAppPreSuff $AppPre $AppSuff ; macro from LyXUtils.nsh
- # test if Aspell was installed together with LyX
+ ; test if Aspell was installed together with LyX
ReadRegStr $0 HKLM "Software\Aspell" "OnlyWithLyX" ; special entry to test if it was installed with LyX
${if} $0 == "Yes"
SectionSetText 2 "Aspell" ; names the corersponding uninstaller section (has the index "2" as it is the third section in Uninstall.nsh)
SectionSetText 2 "" ; hides the corresponding uninstaller section
${endif}
- # test if MiKTeX was installed together with LyX
+ ; test if MiKTeX was installed together with LyX
ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX"
${if} $0 == "Yes"
SectionSetText 3 "MiKTeX" ; names the corersponding uninstaller section
SectionSetText 3 "" ; hides the corresponding uninstaller section
${endif}
- # test if JabRef was installed together with LyX
+ ; test if JabRef was installed together with LyX
ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${JabRefVersion}" "OnlyWithLyX"
${if} $0 == "Yes"
SectionSetText 4 "JabRef" ; names the corersponding uninstaller section
FunctionEnd
-#----------------------
-#Installer sections
+;----------------------
+;Installer sections
!include "Uninstall.nsh"
-# eof
+; eof
-# Lyx for Windows, NSIS v2 series installer script
+; Lyx for Windows, NSIS v2 series installer script
-# File LyXWinInstaller.nsi
-# This file is part of LyX, the document processor.
-# http://www.lyx.org/
-# Licence details can be found in the file COPYING or copy at
-# http://www.lyx.org/about/license.php3
+; File LyXWinInstaller.nsi
+; This file is part of LyX, the document processor.
+; http://www.lyx.org/
+; Licence details can be found in the file COPYING or copy at
+; http://www.lyx.org/about/license.php3
-# Author Uwe Stöhr based on the work of Angus Leeming and Joost Verburg
-# Full author contact details are available in file CREDITS or copy at
-# http://www.lyx.org/about/credits.php
+; Author Uwe St�hr based on the work of Angus Leeming and Joost Verburg
+; Full author contact details are available in file CREDITS or copy at
+; http://www.lyx.org/about/credits.php
-# This script requires NSIS 2.22 and newer
-# http://nsis.sourceforge.net/
-#--------------------------------
+; This script requires NSIS 2.22 and newer
+; http://nsis.sourceforge.net/
+;--------------------------------
-# Do a Cyclic Redundancy Check to make sure the installer
-# was not corrupted by the download.
+; Do a Cyclic Redundancy Check to make sure the installer
+; was not corrupted by the download.
CRCCheck force
-# Make the installer as small as possible.
-# SetCompressor lzma
+; Make the installer as small as possible.
+; SetCompressor lzma
-#--------------------------------
-# You should need to change only these macros...
+;--------------------------------
+; You should need to change only these macros...
!define PRODUCT_DIR "D:\LyXPackage1.5"
!define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5beta1-19-02-2007"
+!define PRODUCT_VERSION "1.5svn-30-03-2007"
!define PRODUCT_VERSION_SHORT "150svn"
!define PRODUCT_SUBFOLDER "lyx15"
!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
!define PRODUCT_ABOUT_URL "http://www.lyx.org/about/"
!define PRODUCT_INFO_URL "http://www.lyx.org/"
-BrandingText "LyXWinInstaller v3.09 - Small"
+BrandingText "LyXWinInstaller v3.10 - Small"
!define INSTALLER_VERSION "Small"
-!define INSTALLER_EXE "LyXWin150beta1Small-3-09.exe"
-!define INSTALLER2_EXE "LyXWin150beta1Complete-3-09.exe" ; to check later if this installer version is running at the same time
+!define INSTALLER_EXE "LyXWin150beta1Small-3-10.exe"
+!define INSTALLER2_EXE "LyXWin150beta1Complete-3-10.exe" ; to check later if this installer version is running at the same time
!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
-# Replaced by HKLM or HKCU depending on SetShellVarContext.
+; Replaced by HKLM or HKCU depending on SetShellVarContext.
!define PRODUCT_ROOT_KEY "SHCTX"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\lyx.exe"
!define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
-!define ImageMagickVersion "6.3.2"
+!define ImageMagickVersion "6.3.3"
!define ImageMagickDir "$INSTDIR\etc\ImageMagick" ; for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
!define GhostscriptDir "$INSTDIR\etc\Ghostscript"
!define GhostscriptVersion "8.54"
!define MiKTeXConfigFolder "MiKTeX\2.5\miktex\config"
!define MiKTeXDeliveredVersion "MiKTeX not included"
-#--------------------------------
-# Make some of the information above available to NSIS.
+;--------------------------------
+; Make some of the information above available to NSIS.
Name "${PRODUCT_NAME}"
OutFile "${INSTALLER_EXE}"
InstallDir "$PROGRAMFILES\${PRODUCT_NAME} ${PRODUCT_VERSION}"
-#--------------------------------
-# Variables
+;--------------------------------
+; Variables
Var LatexPath
Var PythonPath
Var UserList
Var RunNumber
-#--------------------------------
-# load some NSIS libraries
+;--------------------------------
+; load some NSIS libraries
!include "MUI.nsh"
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!include "StrFunc.nsh"
-#!include "TextFunc.nsh"
-#!insertmacro LineFind
+;!include "TextFunc.nsh"
+;!insertmacro LineFind
-# Set of various macros and functions
+; Set of various macros and functions
!include "LyXUtils.nsh"
-# Function to check if needed programs are missing or not
+; Function to check if needed programs are missing or not
!include "MissingPrograms.nsh"
-# Function for page to manually select LaTeX's installation folder
+; Function for page to manually select LaTeX's installation folder
!include "LaTeXFolder.nsh"
-# Functions for page to set installer language
-# and LyX's menu language
+; Functions for page to set installer language
+; and LyX's menu language
!include "LanguageSettings.nsh"
-# Function for page to install Aspell dictionaries
+; Function for page to install Aspell dictionaries
!include "Aspell.nsh"
-# Use the Abiword macros to help set up associations with the file extension in the Registry.
-# Grabbed from
-# http://abiword.pchasm.org/source/cvs/abiword-cvs/abi/src/pkg/win/setup/NSISv2/abi_util_fileassoc.nsh
+; Use the Abiword macros to help set up associations with the file extension in the Registry.
+; Grabbed from
+; http://abiword.pchasm.org/source/cvs/abiword-cvs/abi/src/pkg/win/setup/NSISv2/abi_util_fileassoc.nsh
!include "abi_util_fileassoc.nsh"
-#--------------------------------
+;--------------------------------
-# Remember the installer language
+; Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
!define MUI_UNICON "${PRODUCT_DIR}\icons\lyx.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "${VERSION_BITMAP}"
-# Welcome page
+; Welcome page
!define MUI_WELCOMEPAGE_TEXT "$(WelcomePageText)"
!insertmacro MUI_PAGE_WELCOME
-# Show the license.
+; Show the license.
!insertmacro MUI_PAGE_LICENSE "${PRODUCT_LICENSE_FILE}"
-# Specify the installation directory.
+; Specify the installation directory.
!insertmacro MUI_PAGE_DIRECTORY
-# Specify LyX's menu language.
+; Specify LyX's menu language.
Page custom SelectMenuLanguage SelectMenuLanguage_LeaveFunction
-# Define which components to install.
+; Define which components to install.
!insertmacro MUI_PAGE_COMPONENTS
-# Specify where to install program shortcuts.
+; Specify where to install program shortcuts.
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_ROOT_KEY}"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${PRODUCT_VERSION}"
!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} $StartmenuFolder
-# Select latex.exe manually
+; Select latex.exe manually
Page custom LatexFolder LatexFolder_LeaveFunction
-# Check for needed programs
+; Check for needed programs
Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
-# Watch the components being installed.
+; Watch the components being installed.
!insertmacro MUI_PAGE_INSTFILES
-# Finish page
+; Finish page
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)"
!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchProduct"
!insertmacro MUI_PAGE_FINISH
-# The uninstaller.
+; The uninstaller.
!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_INSTFILES
-#--------------------------------
-# Languages
+;--------------------------------
+; Languages
!insertmacro MUI_LANGUAGE "English" # first language is the default language
!insertmacro MUI_LANGUAGE "Danish"
LicenseData "$(LyXLicenseData)"
-#--------------------------------
-# Reserve Files
+;--------------------------------
+; Reserve Files
-# These files are inserted before other files in the data block
+; These files are inserted before other files in the data block
!insertmacro MUI_RESERVEFILE_LANGDLL
ReserveFile "io_ui_language.ini"
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-#--------------------------------
-# Installer sections
+;--------------------------------
+; Installer sections
Section "!${PRODUCT_NAME}" SecCore
SectionIn RO
StrCpy $CreateDesktopIcon "true"
SectionEnd
-# Section descriptions
+; Section descriptions
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
!insertmacro MUI_DESCRIPTION_TEXT ${SecAllUsers} "$(SecAllUsersDescription)"
!include "InstallActions-small.nsh"
-#--------------------------------
-# This hook function is called internally by NSIS on installer startup
+;--------------------------------
+; This hook function is called internally by NSIS on installer startup
Function .onInit
- # set the installer language to the Windows locale language
+ ; set the installer language to the Windows locale language
System::Call "kernel32::GetUserDefaultLangID()i.a"
- # Check that the installer is not currently running
+ ; Check that the installer is not currently running
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${INSTALLER_EXE}.Instance") i .r1 ?e'
Pop $R0
${if} $R0 != "0"
Abort
${endif}
- # Check if LyX is already installed
+ ; Check if LyX is already installed
ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher"
${if} $0 != ""
MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)"
Abort
${endif}
- # Default settings
- # These can be reset to "all" in section SecAllUsers.
+ ; Default settings
+ ; These can be reset to "all" in section SecAllUsers.
SetShellVarContext current
StrCpy $ProductRootKey "HKCU"
- # This can be reset to "true" in section SecDesktop.
+ ; This can be reset to "true" in section SecDesktop.
StrCpy $CreateDesktopIcon "false"
StrCpy $CreateFileAssociations "false"
- # If the user does *not* have administrator privileges, abort
+ ; If the user does *not* have administrator privileges, abort
StrCpy $Answer ""
StrCpy $UserName ""
!insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh
Abort
${endif}
- # check which programs are installed or not
+ ; check which programs are installed or not
Call MissingPrograms ; function from MissingPrograms.nsh
- # used later in the function LatexFolder
+ ; used later in the function LatexFolder
StrCpy $State "0"
ClearErrors
FunctionEnd
-#--------------------------------
+;--------------------------------
Function LaunchProduct
Exec ${PRODUCT_BAT}
FunctionEnd
-#--------------------------------
+;--------------------------------
-#Function DeleteLines
-# StrCpy $0 SkipWrite
-# Push $0
-#FunctionEnd
+;Function DeleteLines
+; StrCpy $0 SkipWrite
+; Push $0
+;FunctionEnd
-#--------------------------------
-# The Uninstaller
+;--------------------------------
+; The Uninstaller
Function un.onInit
- # Check that LyX is not currently running
+ ; Check that LyX is not currently running
FindProcDLL::FindProc "lyx.exe"
${if} $R0 == "1"
MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)"
Abort
${endif}
- # Ascertain whether the user has sufficient privileges to uninstall.
+ ; Ascertain whether the user has sufficient privileges to uninstall.
SetShellVarContext current
ReadRegStr $0 HKCU "${PRODUCT_UNINST_KEY}" "RootKey"
${endif}
${endif}
- # If the user does *not* have administrator privileges, abort
+ ; If the user does *not* have administrator privileges, abort
StrCpy $Answer ""
!insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh
${if} $Answer == "yes"
Abort
${endif}
- # Macro to investigate name of LyX's preferences folders to be able remove them
+ ; Macro to investigate name of LyX's preferences folders to be able remove them
!insertmacro UnAppPreSuff $AppPre $AppSuff ; macro from LyXUtils.nsh
- # test if Aspell was installed together with LyX
+ ; test if Aspell was installed together with LyX
ReadRegStr $0 HKLM "Software\Aspell" "OnlyWithLyX" ; special entry to test if it was installed with LyX
${if} $0 == "Yes"
SectionSetText 2 "Aspell" ; names the corersponding uninstaller section (has the index "2" as it is the third section in Uninstall.nsh)
SectionSetText 2 "" ; hides the corresponding uninstaller section
${endif}
- # test if MiKTeX was installed together with LyX
+ ; test if MiKTeX was installed together with LyX
ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX"
${if} $0 == "Yes"
SectionSetText 3 "MiKTeX" ; names the corersponding uninstaller section
SectionSetText 3 "" ; hides the corresponding uninstaller section
${endif}
- # ignore JabRef because this could only be installed with the complete installer version
+ ; ignore JabRef because this could only be installed with the complete installer version
SectionSetText 4 "" ; hides the corresponding uninstaller section
StrCpy $JabRefInstalled ""
FunctionEnd
-#----------------------
-#Installer sections
+;----------------------
+;Installer sections
!include "Uninstall.nsh"
-# eof
+; eof
--- /dev/null
+#% Do not delete the line below; configure depends on this
+# \DeclareLaTeXClass[powerdot.cls,enumitem.sty,genmisc.sty,listings.sty,xkeyval.sty]{powerdot presentation}
+# PowerDot textclass definition file.
+# Created (29.Aug.05): Mael Hilléreau
+# Last modified: 17.Sep.05
+#
+# ----------------------------------------------------------
+# Copyright (C) 2005 Hendri Adriaens and Christopher Ellison
+# ----------------------------------------------------------
+#
+# This work may be distributed and/or modified under the
+# conditions of the LaTeX Project Public License, either version 1.3
+# of this license or (at your option) any later version.
+# The latest version of this license is in
+# http://www.latex-project.org/lppl.txt
+# and version 1.3 or later is part of all distributions of LaTeX
+# version 2003/12/01 or later.
+#
+# This work has the LPPL maintenance status "maintained".
+#
+# This Current Maintainer of this work is Christopher Ellison.
+#
+# This work consists of all files listed in manifest.txt.
+
+###
+# General textclass parameters
+###
+Columns 1
+Sides 1
+MaxCounter Counter_EnumI
+ProvidesUrl 1
+DefaultStyle Standard
+
+DefaultFont
+ Family Sans
+ Series Medium
+ Shape Up
+ Size Normal
+ Color None
+EndFont
+
+###
+# General textclass parameters
+###
+ClassOptions
+ FontSize size=8|size=9|size=10|size=11|size=12|size=14|size=17|size=20
+ PageStyle ""
+End
+
+###
+# Title style definition
+###
+Style Title
+ Margin Static
+ LatexType Command
+ InTitle 1
+ LatexName title
+ ParSkip 0.4
+ ItemSep 0
+ TopSep 0
+ BottomSep 1
+ ParSep 1
+ Align Center
+ AlignPossible Center
+ LabelType No_Label
+
+ Font
+ Series Bold
+ Size Largest
+ Color Blue
+ EndFont
+End
+
+###
+# Author style definition
+###
+Style Author
+ Margin Static
+ LatexType Command
+ InTitle 1
+ LatexName author
+ LabelSep xxx
+ ParSkip 0.4
+ TopSep 1.3
+ BottomSep 0.7
+ ParSep 0.7
+ Align Center
+ AlignPossible Center
+ LabelType No_Label
+
+ Font
+ Size Large
+ Color Blue
+ EndFont
+End
+
+###
+# Date style definition
+###
+Style Date
+ Margin Dynamic
+ LatexType Command
+ InTitle 1
+ LatexName date
+ LabelSep xxx
+ ParSkip 0.4
+ TopSep 0.9
+ BottomSep 0.5
+ ParSep 1
+ Align Center
+ AlignPossible Center
+ LabelType No_Label
+
+ Font
+ Size Large
+ Color Blue
+ EndFont
+End
+
+###
+# Standard style definition
+###
+Style Standard
+ Margin Static
+ LatexType Paragraph
+ LatexName dummy
+ ParSkip 0.4
+ Align Block
+ AlignPossible Block, Left, Right, Center
+ LabelType No_Label
+End
+
+###
+# Slide styles definition
+###
+Style Slide
+ Margin Static
+ LatexType Command
+ LatexName lyxend\lyxslide
+ LabelSep xxx
+ ParSkip 0.4
+ TopSep 1.3
+ BottomSep 0.7
+ ParSep 0.7
+ Align Center
+ AlignPossible Center
+ LabelType Counter_Subsection
+ LabelString " "
+ OptionalArgs 1
+
+ Font
+ Series Bold
+ Size Large
+ Color Magenta
+ EndFont
+End
+
+Style EndSlide
+ CopyStyle Slide
+ KeepEmpty 1
+ LatexName lyxend
+ Margin Static
+ ParSkip 0
+ TopSep 0
+ BottomSep 1
+ ParSep 0
+ LabelType Static
+ LabelBottomSep 0
+ LeftMargin MMMMMMM
+ LabelString "~=~"
+ OptionalArgs 0
+
+ Font
+ Color None
+ EndFont
+End
+
+
+
+###
+# Wideslide style definition
+###
+Style WideSlide
+ CopyStyle Slide
+ LatexName lyxend\lyxwideslide
+
+ Font
+ Color Green
+ EndFont
+End
+
+###
+# EmptySlide style definition
+###
+Style EmptySlide
+ CopyStyle Slide
+ LatexName lyxend\lyxemptyslide
+ LeftMargin MMMMMMMMMMMMMM
+ LabelString "Empty slide:"
+ LabelType Static
+ KeepEmpty 1
+
+ Font
+ Color Cyan
+ EndFont
+End
+
+###
+# Note style definition
+###
+Style Note
+ CopyStyle Slide
+ LatexName lyxend\lyxnote
+ LeftMargin MMMMMMM
+ LabelString "Note:"
+ LabelType Static
+ KeepEmpty 1
+ OptionalArgs 0
+
+ Font
+ Color Red
+ EndFont
+End
+
+###
+# Section style definition
+###
+Style Section
+ CopyStyle Slide
+ LatexName lyxend\section
+ LabelType Counter_Section
+ LabelString ""
+
+ Font
+ Size Larger
+ Color Blue
+ EndFont
+End
+
+###
+# Itemize styles definition
+###
+Style Itemize
+ Margin Static
+ LatexType Item_Environment
+ LatexName itemize
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep 0.7
+ ParSep 0.3
+ Align Block
+ AlignPossible Block, Left
+ LabelType Static
+ LabelString *
+End
+
+Style ItemizeType1
+ CopyStyle Itemize
+ LatexParam [type=1]
+End
+
+###
+# Enumerate styles definition
+###
+Style Enumerate
+ Margin Static
+ LatexType Item_Environment
+ LatexName enumerate
+ NextNoIndent 1
+ LeftMargin MMN
+ LabelSep xx
+ ParSkip 0.0
+ ItemSep 0.2
+ TopSep 0.7
+ BottomSep 0.7
+ ParSep 0.3
+ Align Block
+ AlignPossible Block, Left
+ LabelType Counter_EnumI
+End
+
+Style EnumerateType1
+ CopyStyle Enumerate
+ LatexParam [type=1]
+End
+
+###
+# Bibliography style definition
+###
+Style Bibliography
+ Margin First_Dynamic
+ LatexType Item_Environment
+ LatexName thebibliography
+ NextNoIndent 1
+ LeftMargin MM
+ ParSkip 0.4
+ ItemSep 0
+ TopSep 0.7
+ BottomSep 0.7
+ ParSep 0.5
+ Align Block
+ AlignPossible Block, Left
+ LabelType Bibliography
+ LabelString ""
+ LabelBottomSep 0
+End
+
+###
+# Quotation style definition
+###
+Style Quotation
+ Margin Static
+ LatexType Environment
+ LatexName quotation
+ NextNoIndent 1
+ LeftMargin MMM
+ RightMargin MMM
+ ParIndent MM
+ ParSkip 0
+ ItemSep 0
+ TopSep 0.5
+ BottomSep 0.5
+ ParSep 0
+ Align Block
+ AlignPossible Block, Left, Right, Center
+End
+
+###
+# Quote style definition
+###
+Style Quote
+ Margin Static
+ LatexType Environment
+ LatexName quote
+ NextNoIndent 1
+ LeftMargin MMM
+ RightMargin MMM
+ TopSep 0.5
+ ParSep 0.5
+ BottomSep 0.5
+ Align Block
+ AlignPossible Block, Left, Right, Center
+ LabelType No_Label
+End
+
+###
+# Verse style definition
+###
+Style Verse
+# LaTeX type is first dynamic because of LaTeX implementation.
+# In LyX this does not make sense.
+ LatexType Environment
+ LatexName verse
+ Margin First_Dynamic
+ NextNoIndent 1
+ LeftMargin MMMM
+ LabelIndent MMMM
+ ParSkip 0.4
+ TopSep 0.7
+ BottomSep 0.7
+ ParSep 0.5
+ Align Block
+ AlignPossible Block, Left
+ LabelType No_Label
+End
+
+###
+# Caption style definition
+###
+Style Caption
+ Margin First_Dynamic
+ LatexType Command
+ LatexName caption
+ NeedProtect 1
+ LabelSep xx
+ ParSkip 0.4
+ TopSep 0.5
+ Align Center
+ AlignPossible Center
+ LabelType Sensitive
+ LabelString Caption
+ OptionalArgs 1
+
+ LabelFont
+ Series Bold
+ EndFont
+End
+
+###
+# Floats definitions
+###
+Float
+ Type table
+ GuiName Table
+ Extension lot
+ NumberWithin none
+ Style plain
+ ListName "List of Tables"
+ LaTeXBuiltin true
+End
+
+Float
+ Type figure
+ GuiName Figure
+ Extension lof
+ NumberWithin none
+ Style plain
+ ListName "List of Figures"
+ LaTeXBuiltin true
+End
+
+Float
+ Type algorithm
+ GuiName Algorithm
+ Extension loa
+ NumberWithin none
+ Style ruled
+ ListName "List of Algorithms"
+ LaTeXBuiltin false
+End
+
+###
+# Counters definitions
+###
+Counter
+ Name enumi
+End
+
+Counter
+ Name enumii
+ Within enumi
+End
+
+Counter
+ Name enumiii
+ Within enumii
+End
+
+Counter
+ Name enumiv
+ Within enumiii
+End
+
+Counter
+ Name bibitem
+End
+
+Counter
+ Name figure
+End
+
+Counter
+ Name table
+End
+
+Counter
+ Name algorithm
+End
--- /dev/null
+## Automatically generated lyx session file
+## Editing this file manually may cause lyx to crash.
+
+[toolbars]
+standard = 0 0
+extra = 0 0
+math = 2 1
+minibuffer = 1 1
+review = 2 1
+table = 2 1
+view/update = 0 3
+
+[session info]
+IconSizeXY = 20
+WindowHeight = 550
+WindowIsMaximized = no
+WindowPosX = 200
+WindowPosY = 200
+WindowWidth = 712
--- /dev/null
+# -*- text -*-
+
+# file stdtoolbars.inc
+# This file is part of LyX, the document processor.
+# Licence details can be found in the file COPYING.
+
+# author Jean-Marc Lasgouttes
+# author John Levon
+
+# Full author contact details are available in file CREDITS.
+
+# The interface is designed (partially) following the KDE Human Interface
+# Guidelines (http://usability.kde.org/hig/)
+
+# A Toolbar starts like :
+#
+# Toolbar "name" "GUI Name"
+#
+# Only four commands are allowed inside the begin_toolbar and end_toolbar
+# directives:
+# Item "The tooltip" "<action> [<parameter>]" adds an icon to the toolbar performing
+# "<action> <parameter>"
+# Examples:
+# Item "Small font" "font-size small"
+# Item Emphasized set-emph
+#
+# Layouts adds the layouts combo-box to the toolbar
+#
+# Separator adds some spacing to the toolbar
+#
+# Minibuffer adds the command buffer (Qt only, only one may exist)
+#
+# The icons are found in the lib/image 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).
+#
+# All other lyx commands will get a "unknown" icon.
+#
+# This is the default toolbar:
+
+Toolbar "standard" "Standard"
+ Layouts
+ Item "New document" "buffer-new"
+ Item "Open document" "file-open"
+ Item "Save document" "buffer-write"
+ Item "Print document" "dialog-show print"
+ Separator
+ Item "Undo" "undo"
+ Item "Redo" "redo"
+ Item "Cut" "cut"
+ Item "Copy" "copy"
+ Item "Paste" "paste"
+ Item "Find and replace" "dialog-show findreplace"
+ Separator
+ Item "Toggle emphasis" "font-emph"
+ Item "Toggle noun" "font-noun"
+ Item "Apply last" "font-free-apply"
+ Separator
+ Item "Insert math" "math-mode"
+ Item "Insert graphics" "dialog-show-new-inset graphics"
+ Item "Insert table" "tabular-insert"
+End
+
+Toolbar "extra" "Extra"
+ Item "Default" "layout"
+ Item "Numbered list" "layout Enumerate"
+ Item "Itemized list" "layout Itemize"
+ Item "List" "layout List"
+ Item "Description" "layout Description"
+ Item "Increase depth" "depth-increment"
+ Item "Decrease depth" "depth-decrement"
+ Separator
+ Item "Insert figure float" "float-insert figure"
+ Item "Insert table float" "float-insert table"
+ Item "Insert label" "label-insert"
+ Item "Insert cross-reference" "dialog-show-new-inset ref"
+ Item "Insert citation" "dialog-show-new-inset citation"
+ Item "Insert index entry" "index-insert"
+ Item "Insert glossary entry" "nomencl-insert"
+ Separator
+ Item "Insert footnote" "footnote-insert"
+ Item "Insert margin note" "marginalnote-insert"
+ Item "Insert note" "note-insert"
+ Item "Insert URL" "url-insert"
+ Item "Insert TeX code" "ert-insert"
+ Item "Include file" "dialog-show-new-inset include"
+ Separator
+ Item "Text style" "dialog-show character"
+ Item "Paragraph settings" "layout-paragraph"
+ Item "Table of contents" "toc-view"
+ Item "Check spelling" "dialog-show spellchecker"
+ Item "Thesaurus" "thesaurus-entry"
+End
+
+Toolbar "table" "Table"
+ Item "Add row" "tabular-feature append-row"
+ Item "Add column" "tabular-feature append-column"
+ Item "Delete row" "tabular-feature delete-row"
+ Item "Delete column" "tabular-feature delete-column"
+ Separator
+ Item "Set top line" "tabular-feature toggle-line-top"
+ Item "Set bottom line" "tabular-feature toggle-line-bottom"
+ Item "Set left line" "tabular-feature toggle-line-left"
+ Item "Set right line" "tabular-feature toggle-line-right"
+ Item "Set all lines" "tabular-feature set-all-lines"
+ Item "Unset all lines" "tabular-feature unset-all-lines"
+ Separator
+ Item "Align left" "tabular-feature align-left"
+ Item "Align center" "tabular-feature align-center"
+ Item "Align right" "tabular-feature align-right"
+ Separator
+ Item "Align top" "tabular-feature valign-top"
+ Item "Align middle" "tabular-feature valign-middle"
+ Item "Align bottom" "tabular-feature valign-bottom"
+ Separator
+ Item "Rotate cell" "tabular-feature set-rotate-cell"
+ Item "Rotate table" "tabular-feature set-rotate-tabular"
+ Item "Set multi-column" "tabular-feature multicolumn"
+End
+
+Toolbar "math" "Math"
+ Item "Show math panel" "dialog-show mathpanel"
+ Item "Set display mode" "math-display"
+ Item "Subscript" "math-subscript"
+ Item "Superscript" "math-superscript"
+ Item "Insert root" "math-insert \root"
+ Item "Insert square root" "math-insert \sqrt"
+ 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 { }"
+ Separator
+ Item "Insert matrix" "math-matrix 2 2"
+ Item "Insert cases environment" "math-insert \cases"
+ Item "Add row" "tabular-feature append-row"
+ Item "Add column" "tabular-feature append-column"
+ Item "Delete row" "tabular-feature delete-row"
+ Item "Delete column" "tabular-feature delete-column"
+End
+
+Toolbar "minibuffer" "Command Buffer"
+ Minibuffer
+End
+
+Toolbar "review" "Review"
+ Item "Track changes" "changes-track"
+ Item "Show changes in output" "changes-output"
+ Separator
+ Item "Next change" "change-next"
+ Item "Accept change" "change-accept"
+ Item "Reject change" "change-reject"
+ Separator
+ Item "Merge changes" "changes-merge"
+ Item "Accept all changes" "all-changes-accept"
+ Item "Reject all changes" "all-changes-reject"
+ Separator
+ Item "Insert note" "note-insert"
+ Item "Next note" "note-next"
+End
+
+Toolbar "view/update" "View/Update"
+ Item "View DVI" "buffer-view dvi"
+ Item "Update DVI" "buffer-update dvi"
+ Item "View PDF (pdflatex)" "buffer-view pdf2"
+ Item "View PostScript" "buffer-view ps"
+ Item "Update PostScript" "buffer-update ps"
+End