diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4570f39b..38589e93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,10 +25,29 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
+ with:
+ fetch-depth: 0 # fetch full history for GitVersion
+
+ - name: Setup .NET
+ uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # v2.1.0
+ with:
+ dotnet-version: 6.0.x
- - name: Add MSBuild to PATH
- uses: microsoft/setup-msbuild@v1.0.2
+ #- name: Restore
+ # run: dotnet restore
+
+ - name: setup-msbuild
+ uses: microsoft/setup-msbuild@v1.1.3
+ with:
+ # Folder location of where vswhere.exe is located if a self-hosted agent
+ vswhere-path: # optional
+ # Version of Visual Studio to search; defaults to latest if not specified
+ vs-version: # optional
+ # Enable searching for pre-release versions of Visual Studio/MSBuild
+ vs-prerelease: # optional
+ # The preferred processor architecture of MSBuild. Can be either "x86" or "x64". "x64" is only available from Visual Studio version 17.0 and later.
+ msbuild-architecture: x64 # optional, default is x86
- name: Fetch nuget dependecies
run: nuget restore "${{env.SOLUTION_FILE_PATH}}"
@@ -48,13 +67,14 @@ jobs:
#- name: Test
# run: output/Win32/${{matrix.build_configuration}}/RunTests.exe
- - name: rename installer
- if: ${{ success() && matrix.build_configuration == 'Release' }}
- run: cp "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.exe" "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe"
+ # now that we're building on TeamCity (to sign it), this isn't needed
+ #- name: rename installer
+ # if: ${{ success() && matrix.build_configuration == 'Release' }}
+ # run: cp "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.exe" "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe"
- - name: publish artifact
- if: ${{ success() && matrix.build_configuration == 'Release' }}
- uses: actions/upload-artifact@v2.2.4
- with:
- name: silconverters-installers.${{matrix.platform}}.latest
- path: output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe
\ No newline at end of file
+ #- name: Upload a Build Artifact
+ # if: ${{ success() && matrix.build_configuration == 'Release' }}
+ # uses: actions/upload-artifact@v3.1.1
+ # with:
+ # name: silconverters-installers.${{matrix.platform}}.latest
+ # path: output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..6bc626c2
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,11 @@
+
+
+ SILConverters
+ SILConverters
+ 5.1
+ 5.1.1.0
+ 8A50226C-84D0-4CAF-AF8F-B0284643C415
+ 2022
+ SIL International
+
+
\ No newline at end of file
diff --git a/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode64bitMM.wixproj b/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode64bitMM.wixproj
index ec0ff9fe..32f1b6ab 100644
--- a/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode64bitMM.wixproj
+++ b/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode64bitMM.wixproj
@@ -1,5 +1,6 @@
+
Release
x64
@@ -8,6 +9,8 @@
2.0
AdaptIt2Unicode64bitMM
Module
+
+
Debug
@@ -21,11 +24,20 @@
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
\ No newline at end of file
diff --git a/Installer/ParatextBackTranslationHelperPlugin64bitMM/ParatextBackTranslationHelperPlugin_MergeModule.wxs b/Installer/ParatextBackTranslationHelperPlugin64bitMM/ParatextBackTranslationHelperPlugin_MergeModule.wxs
new file mode 100644
index 00000000..1a808758
--- /dev/null
+++ b/Installer/ParatextBackTranslationHelperPlugin64bitMM/ParatextBackTranslationHelperPlugin_MergeModule.wxs
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Installer/ParatextBackTranslationHelperPlugin64bitMM/packages.config b/Installer/ParatextBackTranslationHelperPlugin64bitMM/packages.config
new file mode 100644
index 00000000..48182e9f
--- /dev/null
+++ b/Installer/ParatextBackTranslationHelperPlugin64bitMM/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Installer/SCOffice0364bitMM/SCOffice0364bitMM.wixproj b/Installer/SCOffice0364bitMM/SCOffice0364bitMM.wixproj
index 125abef8..48f1d76a 100644
--- a/Installer/SCOffice0364bitMM/SCOffice0364bitMM.wixproj
+++ b/Installer/SCOffice0364bitMM/SCOffice0364bitMM.wixproj
@@ -1,5 +1,6 @@
+
Release
x64
@@ -8,6 +9,8 @@
2.0
SCOffice0364bitMM
Module
+
+
Debug
@@ -22,11 +25,20 @@
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
diff --git a/Installer/SEC Setup 64bit/EcMergeModules.wxs b/Installer/SEC Setup 64bit/EcMergeModules.wxs
index 7c9e1abe..be75a1e4 100644
--- a/Installer/SEC Setup 64bit/EcMergeModules.wxs
+++ b/Installer/SEC Setup 64bit/EcMergeModules.wxs
@@ -23,12 +23,17 @@
+
+
+
+
+
diff --git a/Installer/SEC Setup 64bit/Product.wxs b/Installer/SEC Setup 64bit/Product.wxs
index 1fec0f64..cc7589e7 100644
--- a/Installer/SEC Setup 64bit/Product.wxs
+++ b/Installer/SEC Setup 64bit/Product.wxs
@@ -1,8 +1,8 @@
-
+
@@ -133,6 +133,9 @@
+
+
+
diff --git a/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj b/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj
index 06d1e91e..ad6cc2c4 100644
--- a/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj
+++ b/Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj
@@ -1,13 +1,14 @@
-
+
+
Release
x64
3.7
{69CB9E94-E875-4B29-AB69-3BBFE8D467E8}
2.0
- SetupSILConverters64
+ SetupSILConverters_x64
Package
@@ -57,7 +58,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
+
+
+
+ $(TargetFileName)
+ $(MSBuildStartupDirectory)\
+ $(SolutionDir)build\
+ $(SolutionDir)output\$(PlatformName)\
+ "$(OutputDir)$(MsiFile)"
+
+
+
+
\ No newline at end of file
diff --git a/Installer/SEC Setup 64bit/packages.config b/Installer/SEC Setup 64bit/packages.config
index 4e3c5bfe..42f10aa9 100644
--- a/Installer/SEC Setup 64bit/packages.config
+++ b/Installer/SEC Setup 64bit/packages.config
@@ -1,4 +1,5 @@
-
+
+
\ No newline at end of file
diff --git a/Installer/SEC Setup/EcFeatures.wxs b/Installer/SEC Setup/EcFeatures.wxs
index 18b6bf75..45d31a3e 100644
--- a/Installer/SEC Setup/EcFeatures.wxs
+++ b/Installer/SEC Setup/EcFeatures.wxs
@@ -61,12 +61,12 @@
-
+
-
+
@@ -78,7 +78,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -98,14 +98,14 @@
-
+
-
+
@@ -127,13 +127,8 @@
-
-
-
-
-
-
-
+
+
@@ -159,6 +154,14 @@
+
+
+
+
+
+
+
+
diff --git a/Installer/SEC Setup/EcMergeModules.wxs b/Installer/SEC Setup/EcMergeModules.wxs
index 3c4e8d6f..127a1bbe 100644
--- a/Installer/SEC Setup/EcMergeModules.wxs
+++ b/Installer/SEC Setup/EcMergeModules.wxs
@@ -26,6 +26,7 @@
+
diff --git a/Installer/SEC Setup/Product.wxs b/Installer/SEC Setup/Product.wxs
index a7499372..2d84e285 100644
--- a/Installer/SEC Setup/Product.wxs
+++ b/Installer/SEC Setup/Product.wxs
@@ -4,8 +4,8 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-
+
Privileged
diff --git a/Installer/SEC Setup/SEC Setup.wixproj b/Installer/SEC Setup/SEC Setup.wixproj
index 1f9ac0cc..688af7a5 100644
--- a/Installer/SEC Setup/SEC Setup.wixproj
+++ b/Installer/SEC Setup/SEC Setup.wixproj
@@ -1,13 +1,14 @@
-
+
+
Release
x86
3.7
{348850e8-5c84-4c77-ba1a-220c6e48fa6e}
2.0
- SetupSILConverters
+ SetupSILConverters_x86
Package
@@ -65,7 +66,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
+
+
+
+ $(TargetFileName)
+ $(MSBuildStartupDirectory)\
+ $(SolutionDir)build\
+ $(SolutionDir)output\$(PlatformName)\
+ "$(OutputDir)$(MsiFile)"
+
+
+
+
\ No newline at end of file
diff --git a/Installer/SEC Setup/packages.config b/Installer/SEC Setup/packages.config
index 4e3c5bfe..42f10aa9 100644
--- a/Installer/SEC Setup/packages.config
+++ b/Installer/SEC Setup/packages.config
@@ -1,4 +1,5 @@
-
+
+
\ No newline at end of file
diff --git a/Installer/SFM Converter 64bit MM/SFM Converter 64bit MM.wixproj b/Installer/SFM Converter 64bit MM/SFM Converter 64bit MM.wixproj
index 609f61d7..39dc7867 100644
--- a/Installer/SFM Converter 64bit MM/SFM Converter 64bit MM.wixproj
+++ b/Installer/SFM Converter 64bit MM/SFM Converter 64bit MM.wixproj
@@ -1,5 +1,6 @@
+
Release
x64
@@ -8,6 +9,8 @@
2.0
SFM Converter 64bit MM
Module
+
+
Debug
@@ -21,11 +24,20 @@
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+ $(TargetName)_$(TruncatedVersion)_$(PlatformName)$(TargetExt)
+ $(SolutionDir)build\
+ $(SolutionDir)output\$(PlatformName)\
+ "$(OutputDir)$(ExeFile)" UseInsignia
+
+
+
+
\ No newline at end of file
diff --git a/Installer/SetupSILConverters/packages.config b/Installer/SetupSILConverters/packages.config
index 4e3c5bfe..42f10aa9 100644
--- a/Installer/SetupSILConverters/packages.config
+++ b/Installer/SetupSILConverters/packages.config
@@ -1,4 +1,5 @@
-
+
+
\ No newline at end of file
diff --git a/Installer/SilConvertersForWord64bitMM/SilConvertersForWord64bitMM.wixproj b/Installer/SilConvertersForWord64bitMM/SilConvertersForWord64bitMM.wixproj
index 565d0560..e1ab9a60 100644
--- a/Installer/SilConvertersForWord64bitMM/SilConvertersForWord64bitMM.wixproj
+++ b/Installer/SilConvertersForWord64bitMM/SilConvertersForWord64bitMM.wixproj
@@ -1,5 +1,6 @@
+
Release
x64
@@ -8,6 +9,8 @@
2.0
SilConvertersForWord64bitMM
Module
+
+
Debug
@@ -21,11 +24,20 @@
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
-
+
$(EcLibFilesPath)\net48\x86\ECInterfaces.dll
-
+
$(EcLibFilesPath)\net48\x64\ECInterfaces.dll
-
+
$(EcLibFilesPath)\net48\x86\SilEncConverters40.dll
-
+
$(EcLibFilesPath)\net48\x64\SilEncConverters40.dll
@@ -208,6 +204,6 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
\ No newline at end of file
diff --git a/src/AdaptIt2Unicode/packages.config b/src/AdaptIt2Unicode/packages.config
index d6cab12d..59d699ac 100644
--- a/src/AdaptIt2Unicode/packages.config
+++ b/src/AdaptIt2Unicode/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/BackTranslationHelper/BackTranslationHelper.csproj b/src/BackTranslationHelper/BackTranslationHelper.csproj
new file mode 100644
index 00000000..de2501f3
--- /dev/null
+++ b/src/BackTranslationHelper/BackTranslationHelper.csproj
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+ Debug
+ AnyCPU
+ {3E74CE98-6558-4AF0-BB0C-C7E436208B1B}
+ Library
+ Properties
+ BackTranslationHelper
+ BackTranslationHelper
+ v4.8
+ 8.0
+ 512
+ true
+
+
+
+
+ true
+ full
+ false
+ ..\..\output\x86\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ ..\..\output\x86\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+ ..\..\output\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+
+
+ ..\..\output\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+
+
+ true
+ ..\..\output\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+
+
+ ..\..\output\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+
+
+ true
+
+
+ FieldWorks.snk
+
+
+
+ ..\..\packages\DialogAdapters.Gtk2.0.1.11\lib\net461\DialogAdapters.dll
+
+
+ $(EcLibFilesPath)\net48\x86\ECInterfaces.dll
+
+
+ $(EcLibFilesPath)\net48\x64\ECInterfaces.dll
+
+
+ ..\..\packages\Enchant.Net.1.4.2\lib\net461\Enchant.Net.dll
+
+
+ ..\..\packages\icu.net.2.8.1\lib\net451\icu.net.dll
+
+
+ ..\..\packages\L10NSharp.5.0.0\lib\net461\L10NSharp.dll
+
+
+ ..\..\packages\Markdig.Signed.0.30.2\lib\net452\Markdig.Signed.dll
+
+
+ ..\..\packages\Microsoft.DotNet.PlatformAbstractions.2.0.4\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
+
+
+ ..\..\packages\Microsoft.Extensions.DependencyModel.2.0.4\lib\net451\Microsoft.Extensions.DependencyModel.dll
+
+
+ ..\..\packages\Mono.Unix.7.1.0-final.1.21458.1\lib\net45\Mono.Unix.dll
+
+
+ ..\..\packages\NDesk.DBus.0.15.0\lib\NDesk.DBus.dll
+
+
+ ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
+
+ ..\..\packages\SIL.Core.10.0.0-beta0081\lib\net461\SIL.Core.dll
+
+
+ ..\..\packages\SIL.Core.Desktop.10.0.0-beta0081\lib\net461\SIL.Core.Desktop.dll
+
+
+ ..\..\packages\SIL.Windows.Forms.10.0.0-beta0081\lib\net461\SIL.Windows.Forms.dll
+
+
+ ..\..\packages\SIL.Windows.Forms.GeckoBrowserAdapter.10.0.0-beta0081\lib\net461\SIL.Windows.Forms.GeckoBrowserAdapter.dll
+
+
+ ..\..\packages\SIL.WritingSystems.10.0.0-beta0081\lib\net461\SIL.WritingSystems.dll
+
+
+ $(EcLibFilesPath)\net48\x86\SilEncConverters40.dll
+
+
+ $(EcLibFilesPath)\net48\x64\SilEncConverters40.dll
+
+
+ ..\..\packages\Spart.1.0.0\lib\net461\Spart.dll
+
+
+
+ ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
+
+
+ ..\..\packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll
+
+
+
+
+
+ ..\..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll
+
+
+ ..\..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll
+
+
+
+ ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
+
+
+
+
+ ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
+
+
+ ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
+ ..\..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll
+
+
+ ..\..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll
+
+
+ ..\..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll
+
+
+
+
+
+ ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
+
+
+
+
+
+
+
+
+
+ ..\..\packages\TagLibSharp.2.2.0\lib\net45\TagLibSharp.dll
+
+
+
+
+
+ UserControl
+
+
+ BackTranslationHelperCtrl.cs
+
+
+
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ True
+ Settings.settings
+
+
+
+
+ BackTranslationHelperCtrl.cs
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/BackTranslationHelper/BackTranslationHelperCtrl.cs b/src/BackTranslationHelper/BackTranslationHelperCtrl.cs
new file mode 100644
index 00000000..d9678f98
--- /dev/null
+++ b/src/BackTranslationHelper/BackTranslationHelperCtrl.cs
@@ -0,0 +1,341 @@
+using ECInterfaces;
+using SilEncConverters40;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace BackTranslationHelper
+{
+ public partial class BackTranslationHelperCtrl : UserControl
+ {
+ public int MaxPossibleTargetTranslations = 3; // to add more, you have to add new lines like the one starting at row 2
+
+ #region Member variables
+ // the form in which this UserControl is embedded will initialize these
+ public IBackTranslationHelperDataSource BackTranslationHelperDataSource;
+ public List TheTranslators = new List();
+
+ public BackTranslationHelperModel _model;
+ #endregion
+
+ public BackTranslationHelperCtrl()
+ {
+ InitializeComponent();
+ }
+
+ public void Initialize(bool displayExistingTargetTranslation)
+ {
+ BackTranslationHelperDataSource.SetDataUpdateProc(UpdateData);
+
+ /* do w/ GetPluginData/PutPluginData
+ foreach (var translatorName in Properties.Settings.Default.MapProjectsToTranslatorNames.Cast().ToList())
+ {
+ if (!TheTranslators.Select(t => t.Name).Contains(translatorName))
+ {
+ if (DirectableEncConverter.EncConverters.ContainsKey(translatorName))
+ TheTranslators.Add(DirectableEncConverter.EncConverters[translatorName]);
+ else
+ {
+ Properties.Settings.Default.MapProjectsToTranslatorNames.Remove(translatorName);
+ Properties.Settings.Default.Save();
+ }
+ }
+ }
+ */
+
+ // see how many converters are configured (if none, then query for one)
+ if (!TheTranslators.Any())
+ {
+ var aTranslator = QueryTranslator();
+ TheTranslators.Add(aTranslator.GetEncConverter);
+ }
+
+ tableLayoutPanel.SuspendLayout();
+ SuspendLayout();
+
+ hideColumn1LabelsToolStripMenuItem.Checked = Properties.Settings.Default.HideLabels;
+ InitializeLabelHiding();
+
+ labelSourceData.Font = BackTranslationHelperDataSource.SourceLanguageFont;
+ if (displayExistingTargetTranslation)
+ {
+ labelForExistingTargetData.Visible = !hideColumn1LabelsToolStripMenuItem.Checked;
+ labelTargetTextExisting.Visible = true;
+ labelTargetTextExisting.Font = BackTranslationHelperDataSource.TargetLanguageFont;
+ }
+ else
+ labelTargetTextExisting.Visible = labelForExistingTargetData.Visible = false;
+
+ textBoxTargetBackTranslation.Font = BackTranslationHelperDataSource.TargetLanguageFont;
+
+ // we're either showing the target translated suggestion in a textbox (if there's only 1 converter)
+ // or in labels above it to choose from (if there are more than one converter)
+ var labelsPossibleTargetTranslations = tableLayoutPanel.Controls.OfType
-
+
DynamicLibrary
true
diff --git a/src/SILConvertersOffice10/ManagedAggregator/SecOffice_ManagedAggregator10.csproj b/src/SILConvertersOffice10/ManagedAggregator/SecOffice_ManagedAggregator10.csproj
index 80affce2..f71e53ba 100644
--- a/src/SILConvertersOffice10/ManagedAggregator/SecOffice_ManagedAggregator10.csproj
+++ b/src/SILConvertersOffice10/ManagedAggregator/SecOffice_ManagedAggregator10.csproj
@@ -1,5 +1,5 @@
-
+
Debug
x86
@@ -17,7 +17,7 @@
true
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
DEBUG;TRACE
full
x86
@@ -33,7 +33,7 @@
false
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
TRACE
true
false
@@ -52,7 +52,7 @@
true
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
DEBUG;TRACE
full
x64
@@ -62,7 +62,7 @@
false
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
TRACE
true
pdbonly
@@ -93,6 +93,6 @@
- xcopy /y "$(TargetDir)*.*" $(SolutionDir)output\$(PlatformName)\$(ConfigurationName)\
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice10/SILConvertersOffice10.csproj b/src/SILConvertersOffice10/SILConvertersOffice10.csproj
index d48003c7..1ebaf8dc 100644
--- a/src/SILConvertersOffice10/SILConvertersOffice10.csproj
+++ b/src/SILConvertersOffice10/SILConvertersOffice10.csproj
@@ -1,6 +1,6 @@
-
-
+
+
Debug
x86
@@ -74,23 +74,25 @@
7.3
AllRules.ruleset
+
+ false
+
-
+
$(EcLibFilesPath)\net48\x86\ECInterfaces.dll
-
+
$(EcLibFilesPath)\net48\x64\ECInterfaces.dll
-
+
$(EcLibFilesPath)\net48\x86\SilEncConverters40.dll
-
+
$(EcLibFilesPath)\net48\x64\SilEncConverters40.dll
+
+ $(EcDistFilesPath)\win-$(Platform)\native\BackTranslationHelper.dll
+
False
True
@@ -221,6 +223,14 @@
SILConverterProcessorForm.designer.cs
+
+ TranslationHelperForm.cs
+ Form
+
+
+ TranslationHelperForm.designer.cs
+ TranslationHelperForm.cs
+
WordApp.cs
@@ -280,6 +290,9 @@
+
+ TranslationHelperForm.cs
+
@@ -287,6 +300,7 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
@@ -312,7 +326,6 @@
true
-
@@ -327,6 +340,6 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice10/TranslationHelperForm.resx b/src/SILConvertersOffice10/TranslationHelperForm.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/src/SILConvertersOffice10/TranslationHelperForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice10/app.config b/src/SILConvertersOffice10/app.config
new file mode 100644
index 00000000..cc4c784e
--- /dev/null
+++ b/src/SILConvertersOffice10/app.config
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice10/packages.config b/src/SILConvertersOffice10/packages.config
index d6cab12d..59d699ac 100644
--- a/src/SILConvertersOffice10/packages.config
+++ b/src/SILConvertersOffice10/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.h b/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.h
index cc14050a..3ffcc72f 100644
--- a/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.h
+++ b/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.h
@@ -3,11 +3,11 @@
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.01.0628 */
/* at Mon Jan 18 21:14:07 2038
*/
/* Compiler settings for COMAddInShim13.idl:
- Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0622
+ Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628
protocol : all , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
@@ -38,6 +38,14 @@
#pragma once
#endif
+#ifndef DECLSPEC_XFGVIRT
+#if defined(_CONTROL_FLOW_GUARD_XFG)
+#define DECLSPEC_XFGVIRT(base, func) __declspec(xfg_virtual(base, func))
+#else
+#define DECLSPEC_XFGVIRT(base, func)
+#endif
+#endif
+
/* Forward Declarations */
#ifndef __ConnectProxy_FWD_DEFINED__
diff --git a/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.vcxproj b/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.vcxproj
index 72388300..25a3027b 100644
--- a/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.vcxproj
+++ b/src/SILConvertersOffice13/COMAddInShim13/COMAddInShim13.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
diff --git a/src/SILConvertersOffice13/ManagedAggregator/SecOffice_ManagedAggregator13.csproj b/src/SILConvertersOffice13/ManagedAggregator/SecOffice_ManagedAggregator13.csproj
index 81b67a36..e4d8c7e0 100644
--- a/src/SILConvertersOffice13/ManagedAggregator/SecOffice_ManagedAggregator13.csproj
+++ b/src/SILConvertersOffice13/ManagedAggregator/SecOffice_ManagedAggregator13.csproj
@@ -1,5 +1,5 @@
-
+
Debug
x86
@@ -17,7 +17,7 @@
true
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
DEBUG;TRACE
full
x86
@@ -34,7 +34,7 @@
false
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
TRACE
true
false
@@ -54,7 +54,7 @@
true
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
DEBUG;TRACE
full
x64
@@ -64,7 +64,7 @@
false
- bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\output\$(Platform)\$(Configuration)\
TRACE
true
pdbonly
@@ -94,6 +94,7 @@
- xcopy /y "$(TargetDir)*.*" $(SolutionDir)output\$(PlatformName)\$(ConfigurationName)\
+
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice13/Properties/Settings.Designer.cs b/src/SILConvertersOffice13/Properties/Settings.Designer.cs
index e0fccb09..971d72aa 100644
--- a/src/SILConvertersOffice13/Properties/Settings.Designer.cs
+++ b/src/SILConvertersOffice13/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace SILConvertersOffice13.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/src/SILConvertersOffice13/SILConvertersOffice13.csproj b/src/SILConvertersOffice13/SILConvertersOffice13.csproj
index 7f2b3161..8240e79f 100644
--- a/src/SILConvertersOffice13/SILConvertersOffice13.csproj
+++ b/src/SILConvertersOffice13/SILConvertersOffice13.csproj
@@ -1,6 +1,6 @@
-
-
+
+
Debug
x86
@@ -42,7 +42,7 @@
true
- bin\x86\Debug\
+ ..\..\output\x86\Debug\
TRACE;DEBUG;BUILD_FOR_OFF15
false
x86
@@ -50,35 +50,41 @@
false
- bin\x86\Release\
+ ..\..\output\x86\Release\
TRACE;BUILD_FOR_OFF15
true
- true
+ false
x86
AllRules.ruleset
false
true
- bin\x64\Debug\
+ ..\..\output\x64\Debug\
TRACE;DEBUG;BUILD_FOR_OFF15
x64
7.3
AllRules.ruleset
- bin\x64\Release\
+ ..\..\output\x64\Release\
TRACE;BUILD_FOR_OFF15
true
- true
+ false
x64
7.3
AllRules.ruleset
+
+ false
+
$(EcDistFilesPath)\win-$(Platform)\native\AIGuesserEC.dll
+
+ $(EcDistFilesPath)\win-$(Platform)\native\BackTranslationHelper.dll
+
$(EcLibFilesPath)\net48\x86\ECInterfaces.dll
@@ -215,6 +221,14 @@
SILConverterProcessorForm.designer.cs
+
+ TranslationHelperForm.cs
+ Form
+
+
+ TranslationHelperForm.designer.cs
+ TranslationHelperForm.cs
+
WordApp.cs
@@ -249,6 +263,11 @@
True
Resources.resx
+
+ True
+ True
+ Settings.settings
+
@@ -281,6 +300,9 @@
+
+ TranslationHelperForm.cs
+
@@ -288,9 +310,13 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
-
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
@@ -317,7 +343,8 @@
- xcopy /y "$(TargetDir)*.*" $(SolutionDir)output\$(PlatformName)\$(ConfigurationName)
+
+
@@ -327,6 +354,6 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice13/app.config b/src/SILConvertersOffice13/app.config
new file mode 100644
index 00000000..cc4c784e
--- /dev/null
+++ b/src/SILConvertersOffice13/app.config
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/SILConvertersOffice13/packages.config b/src/SILConvertersOffice13/packages.config
index d6cab12d..59d699ac 100644
--- a/src/SILConvertersOffice13/packages.config
+++ b/src/SILConvertersOffice13/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/SILConvertersWordML/FontsStylesForm.Designer.cs b/src/SILConvertersWordML/FontsStylesForm.Designer.cs
index fa3241cd..920ffc8e 100644
--- a/src/SILConvertersWordML/FontsStylesForm.Designer.cs
+++ b/src/SILConvertersWordML/FontsStylesForm.Designer.cs
@@ -32,6 +32,11 @@ private void InitializeComponent()
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FontsStylesForm));
this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.ColumnFont = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnSampleData = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnConverter = new System.Windows.Forms.DataGridViewButtonColumn();
+ this.ColumnResults = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnTargetFont = new System.Windows.Forms.DataGridViewButtonColumn();
this.toolStrip = new System.Windows.Forms.ToolStrip();
this.toolStripButtonOpen = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonAutoSearch = new System.Windows.Forms.ToolStripButton();
@@ -71,11 +76,7 @@ private void InitializeComponent()
this.fontDialog = new System.Windows.Forms.FontDialog();
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
this.helpProvider = new System.Windows.Forms.HelpProvider();
- this.ColumnFont = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ColumnSampleData = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ColumnConverter = new System.Windows.Forms.DataGridViewButtonColumn();
- this.ColumnResults = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ColumnTargetFont = new System.Windows.Forms.DataGridViewButtonColumn();
+ this.combineIntoIsoformattedParagraphToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tableLayoutPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.toolStrip.SuspendLayout();
@@ -126,6 +127,50 @@ private void InitializeComponent()
this.dataGridView.TabIndex = 1;
this.dataGridView.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_CellMouseClick);
//
+ // ColumnFont
+ //
+ this.ColumnFont.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+ this.ColumnFont.HeaderText = "Font";
+ this.ColumnFont.Name = "ColumnFont";
+ this.ColumnFont.ReadOnly = true;
+ this.ColumnFont.ToolTipText = "The name of the font to apply the conversion to";
+ this.ColumnFont.Width = 53;
+ //
+ // ColumnSampleData
+ //
+ this.ColumnSampleData.HeaderText = "Example Data";
+ this.ColumnSampleData.Name = "ColumnSampleData";
+ this.ColumnSampleData.ReadOnly = true;
+ this.ColumnSampleData.ToolTipText = "This column shows sample data for the given font (click a cell in this column to " +
+ "see the next occurrence)";
+ //
+ // ColumnConverter
+ //
+ this.ColumnConverter.HeaderText = "Converter";
+ this.ColumnConverter.Name = "ColumnConverter";
+ this.ColumnConverter.ReadOnly = true;
+ this.ColumnConverter.ToolTipText = "Click a cell in this column to associate a system converter with the correspondin" +
+ "g font (use right-click to repeat the last converter selected)";
+ //
+ // ColumnResults
+ //
+ this.ColumnResults.HeaderText = "Example Results";
+ this.ColumnResults.Name = "ColumnResults";
+ this.ColumnResults.ReadOnly = true;
+ this.ColumnResults.ToolTipText = "This column shows a preview of what the output would look like after the conversi" +
+ "on";
+ //
+ // ColumnTargetFont
+ //
+ this.ColumnTargetFont.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+ this.ColumnTargetFont.HeaderText = "Apply Font";
+ this.ColumnTargetFont.Name = "ColumnTargetFont";
+ this.ColumnTargetFont.ReadOnly = true;
+ this.ColumnTargetFont.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.ColumnTargetFont.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.ColumnTargetFont.ToolTipText = "The name of the font to apply to the converted text";
+ this.ColumnTargetFont.Width = 82;
+ //
// toolStrip
//
this.toolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -438,7 +483,8 @@ private void InitializeComponent()
this.advancedToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.singlestepConversionToolStripMenuItem,
this.leaveXMLFileInFolderToolStripMenuItem,
- this.useLinqToolStripMenuItem});
+ this.useLinqToolStripMenuItem,
+ this.combineIntoIsoformattedParagraphToolStripMenuItem});
this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem";
this.advancedToolStripMenuItem.Size = new System.Drawing.Size(72, 20);
this.advancedToolStripMenuItem.Text = "&Advanced";
@@ -447,7 +493,7 @@ private void InitializeComponent()
//
this.singlestepConversionToolStripMenuItem.CheckOnClick = true;
this.singlestepConversionToolStripMenuItem.Name = "singlestepConversionToolStripMenuItem";
- this.singlestepConversionToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
+ this.singlestepConversionToolStripMenuItem.Size = new System.Drawing.Size(280, 22);
this.singlestepConversionToolStripMenuItem.Text = "&Single-step conversion";
this.singlestepConversionToolStripMenuItem.ToolTipText = "Check this item to see the result of the conversion one \'run\' at a time";
this.singlestepConversionToolStripMenuItem.CheckStateChanged += new System.EventHandler(this.singlestepConversionToolStripMenuItem_CheckStateChanged);
@@ -456,7 +502,7 @@ private void InitializeComponent()
//
this.leaveXMLFileInFolderToolStripMenuItem.CheckOnClick = true;
this.leaveXMLFileInFolderToolStripMenuItem.Name = "leaveXMLFileInFolderToolStripMenuItem";
- this.leaveXMLFileInFolderToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
+ this.leaveXMLFileInFolderToolStripMenuItem.Size = new System.Drawing.Size(280, 22);
this.leaveXMLFileInFolderToolStripMenuItem.Text = "&Leave XML files in folder ";
this.leaveXMLFileInFolderToolStripMenuItem.ToolTipText = resources.GetString("leaveXMLFileInFolderToolStripMenuItem.ToolTipText");
//
@@ -466,10 +512,10 @@ private void InitializeComponent()
this.useLinqToolStripMenuItem.CheckOnClick = true;
this.useLinqToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.useLinqToolStripMenuItem.Name = "useLinqToolStripMenuItem";
- this.useLinqToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
+ this.useLinqToolStripMenuItem.Size = new System.Drawing.Size(280, 22);
this.useLinqToolStripMenuItem.Text = "&Use Linq";
this.useLinqToolStripMenuItem.ToolTipText = "Check this menu to have the \'Linq\' technology attempt to do the conversion (may y" +
- "ield a different result if the normal approach doesn\'t work)";
+ "ield a different result if the normal approach doesn\'t work). Check this menu before opening the document.";
//
// fontDialog
//
@@ -482,49 +528,13 @@ private void InitializeComponent()
this.saveFileDialog.RestoreDirectory = true;
this.saveFileDialog.SupportMultiDottedExtensions = true;
//
- // ColumnFont
- //
- this.ColumnFont.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
- this.ColumnFont.HeaderText = "Font";
- this.ColumnFont.Name = "ColumnFont";
- this.ColumnFont.ReadOnly = true;
- this.ColumnFont.ToolTipText = "The name of the font to apply the conversion to";
- this.ColumnFont.Width = 53;
- //
- // ColumnSampleData
- //
- this.ColumnSampleData.HeaderText = "Example Data";
- this.ColumnSampleData.Name = "ColumnSampleData";
- this.ColumnSampleData.ReadOnly = true;
- this.ColumnSampleData.ToolTipText = "This column shows sample data for the given font (click a cell in this column to " +
- "see the next occurrence)";
- //
- // ColumnConverter
- //
- this.ColumnConverter.HeaderText = "Converter";
- this.ColumnConverter.Name = "ColumnConverter";
- this.ColumnConverter.ReadOnly = true;
- this.ColumnConverter.ToolTipText = "Click a cell in this column to associate a system converter with the correspondin" +
- "g font (use right-click to repeat the last converter selected)";
- //
- // ColumnResults
- //
- this.ColumnResults.HeaderText = "Example Results";
- this.ColumnResults.Name = "ColumnResults";
- this.ColumnResults.ReadOnly = true;
- this.ColumnResults.ToolTipText = "This column shows a preview of what the output would look like after the conversi" +
- "on";
- //
- // ColumnTargetFont
+ // combineIntoIsoformattedParagraphToolStripMenuItem
//
- this.ColumnTargetFont.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
- this.ColumnTargetFont.HeaderText = "Apply Font";
- this.ColumnTargetFont.Name = "ColumnTargetFont";
- this.ColumnTargetFont.ReadOnly = true;
- this.ColumnTargetFont.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.ColumnTargetFont.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.ColumnTargetFont.ToolTipText = "The name of the font to apply to the converted text";
- this.ColumnTargetFont.Width = 82;
+ this.combineIntoIsoformattedParagraphToolStripMenuItem.CheckOnClick = true;
+ this.combineIntoIsoformattedParagraphToolStripMenuItem.Name = "combineIntoIsoformattedParagraphToolStripMenuItem";
+ this.combineIntoIsoformattedParagraphToolStripMenuItem.Size = new System.Drawing.Size(280, 22);
+ this.combineIntoIsoformattedParagraphToolStripMenuItem.Text = "&Combine into iso-formatted paragraph";
+ this.combineIntoIsoformattedParagraphToolStripMenuItem.ToolTipText = resources.GetString("combineIntoIsoformattedParagraphToolStripMenuItem.ToolTipText");
//
// FontsStylesForm
//
@@ -599,6 +609,7 @@ private void InitializeComponent()
private System.Windows.Forms.DataGridViewButtonColumn ColumnConverter;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnResults;
private System.Windows.Forms.DataGridViewButtonColumn ColumnTargetFont;
+ private System.Windows.Forms.ToolStripMenuItem combineIntoIsoformattedParagraphToolStripMenuItem;
}
}
diff --git a/src/SILConvertersWordML/FontsStylesForm.cs b/src/SILConvertersWordML/FontsStylesForm.cs
index 5b579ca8..bb1c3493 100644
--- a/src/SILConvertersWordML/FontsStylesForm.cs
+++ b/src/SILConvertersWordML/FontsStylesForm.cs
@@ -430,7 +430,8 @@ protected DocXmlDocument ConvertDocToXml(Word.Application wrdApp, string strDocF
var bUsingLinq = useLinqToolStripMenuItem.Checked;
var doc = bUsingLinq
? WordLinqDocument.GetXmlDocument(ref strXmlFilename, strDocFilename,
- leaveXMLFileInFolderToolStripMenuItem.Checked)
+ leaveXMLFileInFolderToolStripMenuItem.Checked,
+ combineIntoIsoformattedParagraphToolStripMenuItem.Checked)
: Word03MLDocument.GetXmlDocument(ref strXmlFilename, strDocFilename,
leaveXMLFileInFolderToolStripMenuItem.Checked);
diff --git a/src/SILConvertersWordML/FontsStylesForm.resx b/src/SILConvertersWordML/FontsStylesForm.resx
index 4de6560c..76c71d4e 100644
--- a/src/SILConvertersWordML/FontsStylesForm.resx
+++ b/src/SILConvertersWordML/FontsStylesForm.resx
@@ -159,17 +159,17 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJRSURBVDhPrZDdS1NhHMfPnxD0L0RddRE2KOgmusiwFyTb
- lFxaQYtgDqwp3bSidBcFm0w2N3C4dMxtevb+/sY2040mm4HorGCp2xzLFAqGc/pt5+zMlyLrog/8OAee
- 5/N5nnOIPxH39R9XqBVKsUSSEYnfZJ73PVNyudyTzPI+1sgi6uONf0IkmUFyIQONgYQ/MoV88SuW14oY
- I63oEj5NdAhExxi1BiX+SmgqCk8oQr9vV4DvpR3kvlUgUxvQ2skTM2oNU2ie3igd8WJA48OwMQy5WoNs
- obgnr21uI50twxZdBLu9/TOj1jD65ujAQSQKFVYL6zV5o1KVtxBLl6CcjOEmm304oHMmaGmgegO51o8J
- Zwwmmw1WTwj5jerJuTJmlkpwzP4Av1cETlubQtonfMXoBDFqjdGBg+SyK5DIBjE8boc5uoAhMgZ+DyXf
- wriUC+1rwe5eRE1GGe0w7+IpKFQKPOLzcafzHm5zmiF7fAn5kcvYmb6LwRfdu5J+4XVCpQ/SwnTiA3zh
- OOzeKCzuMEhHEEaLF6N6M3QmN7oE3Xh47SxSIhZWhy5i3cZBD+8GCLnWSwcomZL2JwCj1Qcd6YTOFkGH
- 4CV4TQ0tvKsNCPSew4PG02htYjUTsrcuOuDwT2HSHsCEzVcVvTBYPBgnXdCbXFAbg2jiPgH1yVTkwplT
- aDx/ooX+B/XA++Q8TNVTSbsferObFs3Vm7iDM5CPecC6cp8O/EY9QLFVriBf2MTHL0XMpfOYSa0gMrsM
- as9fA9TzqDkyQC3+yzDK/4QgfgLhfEHCk6VvQgAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPrZDrS1NhHMfPnxD0L0S96kXYoKA30YuMdUEy
+ p+TSCloEc2BN6U0TSoUINllsbuBwOdlNzy5n9yu75DZSNgPRdYGlbnMsUygQdfpt5+zMS5H1og/8OAee
+ 5/N5nnOIP5HyDxxXapSqQak0Jxl8levrf6bi8/kn2eV97NEF1MeX+oRoOof0fA5aE4lANI5i+SsWV8rQ
+ kXZ0iZ9Od4gkx1i1Bi3+SjgegzccZd63K8D3jR0UvlUg15jQ2ikYZNUalvAcs1E26sOQ1o8RcwQKjRb5
+ UnlPXlnfRja/BSq2gJb29s+sWsPsn2UCB5Eq1VgurdbktUpV3kQyuwHVZBI3W1oOB/SuaUYaqt5AMR7A
+ hCsJC0XB7g2juFY9ubCFxIcNOGd+QNgrAa+tTSnrF79gdYIYsyeZwEEK+SVI5a8xYnDAGpvHMJmEsIeW
+ b8Eg40P3UrS7F9GQMVY7zNtUBkq1Eo+EQtzpvIfbvCbIH19CcfQydqbuQt7XvSsdEF8n1MYQI0xNv4c/
+ koLDF4PNEwHpDMFs82HMaIXe4kGXqBsPr51FRsLB8vBFrFI89AhugFCM+5gALdPS/gRhtvuhJ13QU1F0
+ iJ5DwG1oFlxtQLD3HB40nkYrl9NEyN+4mYAzEMekI4gJyl8VfTDZvDCQbhgtbmjMIXD5T0B/Mh25cOYU
+ Gs+faGb+QT3wLj0HS/VU0hGA0ephRGv1Jp5QAgqdF5wr95nAb9QDNJtbFRRL6/j4pYzZbBGJzBKiM4ug
+ 9/w1QD+PmiMD9OK/DKv8TwjiJ9i0Qb45QxnYAAAAAElFTkSuQmCC
@@ -197,17 +197,17 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJYSURBVDhPtZBdSFNhGMd321VeBEE3ddFFRSGE0QdLWtkq
- KhwFFiitD5IhuXJ2qunm2XZaZ5pzW043NtvcmLRFMaUiFlgMCnLFSkPbtChXjamVH5Wjleffmb4Q0qqb
- +sF78fD8f/8HXsF/I/IgtPqyU1/mcxqgVJxYcS8YzCOrv9Oop7YF3CwMNM3F79NcezPzKtDOosvvVJLI
- n2F5cXqYQfY6Rs3w2Bmkh/WzczTSvYnEfk+rlf7MjZh4gZ0raNEhO3vtF2A3quBxNBWTaG7aLHW80ASv
- TQuMmOGyqMHxRe4WLb68ZmAzKrtJNDdmXeXsRdclJbiUGfaG05jhC231FDIJA3TUkTiJzuG2atQuqxbZ
- d7vTc5GlpLzYBIepCpk3DWjVy5B5W4/GmuOYHj4PxeG9A0QVCAJG4wKvXY+JFwy/ZHDVpYFKJsH3ZAPu
- +E9hKq5G+FolPr2k4W8ux1SsFrJScR/R5/A5WJ2idAvGBjSYHFLBppEgnWAxPqTDxKAK4zElPsYoTMSV
- SEYrcEwifETUn3Q46qnZkr5qjD6RY/y5BlODOkzGaLzvr0Wq9yxS0ZOIhw6gbPf6MNHm47Sor2RL3vXI
- kIzIMcpLH/prMPbsHBIPy/H0+g74tIXcwZ0Fd4kyn2DQlHdGKmayJb039+OGVcKFHPu4vs49eBzYih6f
- EIYK4VfFoe02ovxKRyO9iP9EOltioos4Ny3iwq5C3LJumJFKl37btXkVqKNFS0g8N3SFeHmdvKS6rHhj
- V/6ahel1KxdDVLBsoFS8tq2qRJRPYv8CgeAHYUxuSEAje9sAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJZSURBVDhPtZBfSFNhGMZ321VeBEE3ddFFRSGE0R+WtLJV
+ VDgKLHC0/pAMyZWzU003z7bTPG5tc7bp1mabMyUXxTSKMrAYEaSF5ULbtKitGlMrdZWS5Xk60w9CWnVT
+ P/guXt7n97zwCf4b3Q86Vl70GKTNnmqolMeW3QsGs8jq75gN1JaAjwVL01zkPs012plXgUYW7a0eFYn8
+ mSpenIgxSF/HsA1+F4PJmGFm7unu3EBiv6feQX/mhmp4gZ0tqNMjPTe5quCyqOF3W/NJNDMNtZW8YEWT
+ UwcM2eCt1YDji3x1Onx5zcBpUXWSaGZs+pKZi97zKnBJG1ymk5jmC51GClPxauipQ1ESncXn0Gq8Dh3S
+ 71ab/xxLyXjRCndNKabemFBvkGPqrRHm8qOYiJ2F8uDufqIKBAGLZV6Ty4CxFwy/ZHDFq4VaLsH3hAl3
+ Wk8gFdUgdLUEn17SaLUXIRWpgLxQHCb6LM1uVq8s3ISRfi3GB9VwaiWYjLMYHdRjbECN0YgKHyMUxqIq
+ JHqKcUQifETUn7S4jdRMSbgMw08UGH2uRWpAj/EIjfd9FUj2nkay5ziiHfsg3bk2RLS5eGo1l9Ml77rk
+ SHQrMMxLH/rKMfLsDOIPi/D02jZc0uZy+7fn3CXKXILBmqxTMjGTLum9sRfX7RLu9oU9XLhtFx4HNqOr
+ WYjqYuFX5YGtTqL8SouZXsB/Ip0usdJ5nJcWcSFvLm461k3LZIu/7di4AtThvEUknhm6WLy0UlFQJs1f
+ 3569av7kmuULIcpZ0l8oXt1QWiDKJrF/gUDwA0zJbjxPK11bAAAAAElFTkSuQmCC
@@ -220,11 +220,11 @@
141, 17
- Check this menu to have the before and after xml files (intermediary files used in the conversion process) left in the folder with the original document. These can be compared to see what data was converted
+ Check this menu to have the before and after xml files (intermediary files used in the conversion process) left in the folder with the original document. These can be compared to see what data was converted. Check this menu before opening the document.
+
+
+ Check this menu to combine all the runs of text in a paragraph into a single run that has the formatting of the initial run of the paragraph. This is primarily to combine all the words in a paragraph together so they get converted together, which is recommended for when using a Translating EncConverter like Bing or DeepL, which work best with full sentences of text. Check this menu before opening the document.
-
- 347, 17
-
432, 17
diff --git a/src/SILConvertersWordML/SILConvertersWordML.csproj b/src/SILConvertersWordML/SILConvertersWordML.csproj
index 7ab74ee7..2aba7719 100644
--- a/src/SILConvertersWordML/SILConvertersWordML.csproj
+++ b/src/SILConvertersWordML/SILConvertersWordML.csproj
@@ -1,6 +1,6 @@
-
-
+
+
Debug
x86
@@ -243,7 +243,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
This project references a Microsoft Office PIA file, which is required to be built against or it won't work for older versions of Word. The missing file needing to be restored is {0}.
-
+
\ No newline at end of file
diff --git a/src/SILConvertersWordML/TestBwdc/Properties/Resources.Designer.cs b/src/SILConvertersWordML/TestBwdc/Properties/Resources.Designer.cs
index b01776b1..b902a9bb 100644
--- a/src/SILConvertersWordML/TestBwdc/Properties/Resources.Designer.cs
+++ b/src/SILConvertersWordML/TestBwdc/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace TestBwdc.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/src/SILConvertersWordML/TestBwdc/Properties/Resources.resx b/src/SILConvertersWordML/TestBwdc/Properties/Resources.resx
index 0a662409..4daa7ba1 100644
--- a/src/SILConvertersWordML/TestBwdc/Properties/Resources.resx
+++ b/src/SILConvertersWordML/TestBwdc/Properties/Resources.resx
@@ -119,9 +119,9 @@
- ..\testfile1.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+ ..\TestFiles\BulkWordDocConverter\testfile1.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
- ..\testfile2.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+ ..\TestFiles\BulkWordDocConverter\testfile2.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
\ No newline at end of file
diff --git a/src/SILConvertersWordML/TestBwdc/TestBwdc.csproj b/src/SILConvertersWordML/TestBwdc/TestBwdc.csproj
index 557d92d0..98effa92 100644
--- a/src/SILConvertersWordML/TestBwdc/TestBwdc.csproj
+++ b/src/SILConvertersWordML/TestBwdc/TestBwdc.csproj
@@ -1,6 +1,8 @@
-
-
+
+
+
+
Debug
AnyCPU
@@ -74,27 +76,31 @@
MinimumRecommendedRules.ruleset
-
- $(EcLibFilesPath)\net48\x86\ECInterfaces.dll
+
+ ..\..\..\packages\Encoding-Converters-Core.0.5.4\lib\net48\x86\ECInterfaces.dll
-
- $(EcLibFilesPath)\net48\x64\ECInterfaces.dll
+
+ ..\..\..\packages\ParatextEmbeddedUiPluginInterfaces.2.0.21\lib\net48\EmbeddedUiPluginInterfaces.dll
-
- $(EcLibFilesPath)\net48\x86\SilEncConverters40.dll
+
+
+
+ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
- $(EcLibFilesPath)\net48\x64\SilEncConverters40.dll
+
+ ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
+
+
+ ..\..\..\packages\ParatextPluginInterfaces.2.0.21\lib\netstandard2.0\PluginInterfaces.dll
+
+
+ ..\..\..\packages\Encoding-Converters-Core.0.5.4\lib\net48\x86\SilEncConverters40.dll
-
3.5
+
@@ -115,7 +121,9 @@
True
Resources.resx
-
+
+
+
@@ -271,16 +279,36 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ResXFileCodeGenerator
Resources.Designer.cs
+ Designer
+
+ {0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}
+ ParatextPluginBackTranslationHelper
+
{909c3757-ef5f-4639-b208-e1ee82570585}
SILConvertersWordML
@@ -333,7 +361,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
xcopy /y "$(TargetDir)*.*" $(SolutionDir)output\$(PlatformName)\$(ConfigurationName)
@@ -342,8 +422,15 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
+
+
+
+
+
+
+