From cfcc73e18be0b02a25b46ead4efc4eff501955ae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Sat, 13 Apr 2013 13:37:02 +0200
Subject: [PATCH] installer: support Canadien

- support spell-checking French (Canada), see bug #8629
- prepare for LyX 2.0.6
---
 development/Win32/packaging/installer/ChangeLog.txt  |  5 +++--
 .../packaging/installer/HunspellDictionaryNames.txt  |  2 ++
 .../packaging/installer/include/dictionaries.nsh     |  6 +++---
 .../Win32/packaging/installer/include/init.nsh       | 12 ++++++++++++
 development/Win32/packaging/installer/settings.nsh   |  6 +++---
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 4a0898155d..323b9fd066 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,9 @@
-Changelog for LyX-2051-6:
+Changelog for LyX-206-1:
 - support for Vietnamese, Thai, Serbian Cyrillic and Mongolian will now
   automatically be installed to MiKTeX
 - language support files for Belarusian and Hungarian are now included
-- new spell-checker dictionary for Serbian(Latin)
+- spell-checker dictionaries for Serbian(Latin) and French(Canada) are now available
+  (for French(Canada) see also http://wiki.lyx.org/Windows/FrenchCanadian)
 - updated to eLyXer 1.2.5
 - updated spell-checker dictionaries for Belarusian, Breton, Italian, Korean,
   Latin, Norwegian, Portuguese, Romanian, Serbian(Cyrillic), Slovakian and Swedish 
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index ecb95cfe76..86c4669106 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -50,6 +50,8 @@ eu_ES.aff
 eu_ES.dic
 fa_IR.aff
 fa_IR.dic
+fr_CA.aff
+fr_CA.dic
 fr_FR.aff
 fr_FR.dic
 ga_IE.aff
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh
index 9ed3838805..d93232d18f 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -28,8 +28,8 @@ Function FindDictionaries
   
   # read out the possible spell-checker filenames from the file	
   FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
-  ${for} $5 1 68
-   # the file has 136 lines, but we only need to check for one of the 2 dictionary files per language
+  ${for} $5 1 69
+   # the file has 138 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   # skip the .aff file
    FileRead $R5 $String   # $String is now the .dic filename
@@ -66,7 +66,7 @@ Function DownloadHunspellDictionaries
  
  # read out the locations from the file	
  FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${For} $5 1 136       # the file has 136 lines
+ ${For} $5 1 138       # the file has 138 lines
  
   FileRead $R5 $String # $String is now the dictionary name
   StrCpy $R3 $String -6 # $R3 is now the dictionary language code
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index 05dc91e398..d5fcb7c3a1 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -228,6 +228,11 @@ Section "Fran
  AddSize 1200
 SectionEnd
 
+Section "Français (Canada)" SecDFrenchCanada
+ StrCpy $DictCodes "fr_CA,$DictCodes"
+ AddSize 1390
+SectionEnd
+
 Section /o "Gaeilge" SecDGaelic
  StrCpy $DictCodes "ga_IR,$DictCodes"
  AddSize 1090
@@ -870,6 +875,13 @@ Function .onInit
    SectionSetFlags ${SecDFarsi} $0
    SectionSetSize ${SecDFarsi} 0
   ${endif}
+  StrCpy $Search "fr_CA"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecDFrenchCanada} $0
+   SectionSetSize ${SecDFrenchCanada} 0
+  ${endif}
   StrCpy $Search "fr_FR"
   Call StrPoint
   ${if} $Pointer != "-1"
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 8363a9d1f1..1b4ca6f5b7 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 0
-!define APP_VERSION_REVISION 5
-!define APP_VERSION_EMERGENCY "1" # use "1" for an emergency release of LyX otherwise ""
+!define APP_VERSION_REVISION 6
+!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
 !define APP_EMERGENCY_DOT "." # use "." for an emergency release of LyX otherwise ""
-!define APP_VERSION_BUILD 6 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
-- 
2.39.5