feat(version): updated installer 2.8.4

- For automatic pagination, inline pagenum elements in paragraph (fix #40) - A new language selector is provided in conversion parameters (fix #39) - Document languages are computed by checking the text languages instead of default style, that was not updated by Word language dialogs in tests. - Fixed a language test for bdo element
daisy · Feb 28, 2024 · 56f6ae6 · 56f6ae6
1 parent d555660
commit 56f6ae6
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 61 deletions.
diff --git a/Common/DaisyAddinLib/Controls/EnumControl.resx b/Common/DaisyAddinLib/Controls/EnumControl.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -181,6 +181,6 @@
     <value>EnumControl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.8.3.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
+    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.8.4.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
   </data>
 </root>
diff --git a/Common/DaisyAddinLib/Controls/StrUserControl.resx b/Common/DaisyAddinLib/Controls/StrUserControl.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -211,6 +211,6 @@
     <value>StrUserControl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.8.3.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
+    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.8.4.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
   </data>
 </root>
diff --git a/Common/DaisyAddinLib/ConversionParametersForm.Designer.cs b/Common/DaisyAddinLib/ConversionParametersForm.Designer.cs
diff --git a/Common/DaisyAddinLib/ConversionParametersForm.resx b/Common/DaisyAddinLib/ConversionParametersForm.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -894,13 +894,13 @@ your document with the Word Accessibility Checker.
     <value>Segoe UI, 9pt</value>
   </data>
   <data name="DestinationControl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 10</value>
+    <value>5, 13</value>
   </data>
   <data name="DestinationControl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>5, 4, 5, 4</value>
   </data>
   <data name="DestinationControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>643, 57</value>
+    <value>1005, 57</value>
   </data>
   <data name="DestinationControl.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>

diff --git a/Common/DaisyAddinLib/Properties/AssemblyInfo.cs b/Common/DaisyAddinLib/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/* 
+/* 
  * Copyright (c) 2006, Clever Age
  * All rights reserved.
  * 
@@ -59,5 +59,5 @@
 //
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
-[assembly: AssemblyVersion("2.8.3.0")]
-[assembly: AssemblyFileVersion("2.8.3.0")]
+[assembly: AssemblyVersion("2.8.4.0")]
+[assembly: AssemblyFileVersion("2.8.4.0")]
diff --git a/Common/DaisyConverterLib/Properties/AssemblyInfo.cs b/Common/DaisyConverterLib/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/* 
+/* 
  * Copyright (c) 2006, Clever Age
  * All rights reserved.
  * 
@@ -57,5 +57,5 @@
 //      Numéro de build
 //      Révision
 //
-[assembly: AssemblyVersion("2.8.3.0")]
-[assembly: AssemblyFileVersion("2.8.3.0")]
+[assembly: AssemblyVersion("2.8.4.0")]
+[assembly: AssemblyFileVersion("2.8.4.0")]
diff --git a/Common/DaisyConverterLib/resources/xslts/oox2Daisy.xsl b/Common/DaisyConverterLib/resources/xslts/oox2Daisy.xsl
@@ -228,7 +228,7 @@
                         <meta name="dtb:uid" content="{$UID}"/>
                     </xsl:otherwise>
                 </xsl:choose>
-                <meta name="dtb:generator" content="SaveAsDAISY 2.8.3, by the DAISY Consortium"/>
+                <meta name="dtb:generator" content="SaveAsDAISY 2.8.4, by the DAISY Consortium"/>
                 <!--Choose block for checking whether user has entered the Title of the document or not-->
                 <meta name="dc:Title" content="{$Title}"/>
                 <!--Choose block for checking whether user has entered the Creator of the document or not-->
@@ -393,4 +393,4 @@
             </book>
         </dtbook>
     </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/CustomActionAddin/Properties/AssemblyInfo.cs b/CustomActionAddin/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.8.3.0")]
-[assembly: AssemblyFileVersion("2.8.3.0")]
+[assembly: AssemblyVersion("2.8.4.0")]
+[assembly: AssemblyFileVersion("2.8.4.0")]
diff --git a/Installer/DaisyAddinForWordSetup/Product.wxs b/Installer/DaisyAddinForWordSetup/Product.wxs
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
     <!--  IMPORTANT NOTE:
               When creating a new release, 
@@ -9,7 +9,7 @@
         -->
 
     <!-- Preprocessor variables, update following your addin assemblies version -->
-    <?define AddinVersion = "2.8.3.0" ?>
+    <?define AddinVersion = "2.8.4.0" ?>
 
     <!-- DO NOT touch this code -->
     <?define UpgradeCode = "81FEF910-4CDE-43B9-8E7B-9F7D34A14765"?>
@@ -24,13 +24,13 @@
     <?endif ?>
 
     <!--Change this ID for update -->
-    <Product Id="502B26F7-4647-484C-83EC-A377274927AF" 
+    <Product Id="AF904FA4-E478-4811-A136-5279277DB2EB" 
             Name="SaveAsDAISY add-in version $(var.AddinVersion)" 
             Language="1033" Version="$(var.AddinVersion)" 
             Manufacturer="DAISY Consortium" 
             UpgradeCode="$(var.UpgradeCode)">
         <!--Change this ID for update -->
-        <Package Id="BDA60CB5-1CDD-438B-BE56-F0DEC3F534D0"
+        <Package Id="8D71DBC2-C27A-45AA-A1FA-8602F64CD7DF"
 				 Compressed="yes"
 				 InstallPrivileges="limited"
 				 InstallerVersion="200" />
@@ -1205,4 +1205,4 @@
         <UI />
 
     </Product>
-</Wix>
+</Wix>
diff --git a/Installer/SaveAsDAISYInstaller/Properties/AssemblyInfo.cs b/Installer/SaveAsDAISYInstaller/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.8.3.0")]
-[assembly: AssemblyFileVersion("2.8.3.0")]
+[assembly: AssemblyVersion("2.8.4.0")]
+[assembly: AssemblyFileVersion("2.8.4.0")]
diff --git a/Word2007/DaisyWord2007AddIn/AssemblyInfo.cs b/Word2007/DaisyWord2007AddIn/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 //
@@ -26,7 +26,7 @@
 // You can specify all the value or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.8.3.0")]
+[assembly: AssemblyVersion("2.8.4.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -49,4 +49,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersion("2.8.3.0")]
+[assembly: AssemblyFileVersion("2.8.4.0")]
diff --git a/Word2007/DaisyWord2007AddIn/DocumentPreprocessor.cs b/Word2007/DaisyWord2007AddIn/DocumentPreprocessor.cs
@@ -190,7 +190,7 @@ public ConversionStatus CreateWorkingCopy(ref object preprocessedObject, ref Doc
                 FileName: tmpFileName,
                 Visible: false
             );
-
+            
             // Note : using the recommended "copy document into another one" way of 
             // cloning found on forums can provoque clipboard issue ...
             // Alt idea : saving a first time a copy, and saving back as the original file name,

diff --git a/Word2007/DaisyWord2007AddIn/Language.resx b/Word2007/DaisyWord2007AddIn/Language.resx
@@ -112,27 +112,34 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lBx_Lngs.ItemHeight" type="System.Int32, mscorlib">
+    <value>16</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="lBx_Lngs.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 29</value>
+    <value>3, 36</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lBx_Lngs.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="lBx_Lngs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>286, 134</value>
+    <value>380, 164</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="lBx_Lngs.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
   <data name="&gt;&gt;lBx_Lngs.Name" xml:space="preserve">
     <value>lBx_Lngs</value>
   </data>
   <data name="&gt;&gt;lBx_Lngs.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;lBx_Lngs.Parent" xml:space="preserve">
     <value>$this</value>
@@ -144,10 +151,13 @@
     <value>True</value>
   </data>
   <data name="lbl_Lang.Location" type="System.Drawing.Point, System.Drawing">
-    <value>-1, 9</value>
+    <value>-1, 11</value>
+  </data>
+  <data name="lbl_Lang.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="lbl_Lang.Size" type="System.Drawing.Size, System.Drawing">
-    <value>115, 13</value>
+    <value>142, 16</value>
   </data>
   <data name="lbl_Lang.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -159,7 +169,7 @@
     <value>lbl_Lang</value>
   </data>
   <data name="&gt;&gt;lbl_Lang.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;lbl_Lang.Parent" xml:space="preserve">
     <value>$this</value>
@@ -168,10 +178,13 @@
     <value>2</value>
   </data>
   <data name="btn_Apply.Location" type="System.Drawing.Point, System.Drawing">
-    <value>132, 169</value>
+    <value>176, 208</value>
+  </data>
+  <data name="btn_Apply.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="btn_Apply.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+    <value>100, 28</value>
   </data>
   <data name="btn_Apply.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -183,7 +196,7 @@
     <value>btn_Apply</value>
   </data>
   <data name="&gt;&gt;btn_Apply.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;btn_Apply.Parent" xml:space="preserve">
     <value>$this</value>
@@ -192,10 +205,13 @@
     <value>1</value>
   </data>
   <data name="btn_Close.Location" type="System.Drawing.Point, System.Drawing">
-    <value>213, 169</value>
+    <value>284, 208</value>
+  </data>
+  <data name="btn_Close.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="btn_Close.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+    <value>100, 28</value>
   </data>
   <data name="btn_Close.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -207,34 +223,39 @@
     <value>btn_Close</value>
   </data>
   <data name="&gt;&gt;btn_Close.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;btn_Close.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btn_Close.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>292, 196</value>
+    <value>311, 192</value>
+  </data>
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Language</value>
+    <value>Language selection</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Language</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>