Merge branch 'release/9.1' into LT-21939

sillsdev · Nov 12, 2024 · e697a61 · e697a61
2 parents 1ba0477 + db58ab0
commit e697a61
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -34,7 +34,7 @@ jobs:
         run: NDP461-DevPack-KB3105179-ENU.exe /q
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: | 
             2.1.x

diff --git a/Src/xWorks/ConfiguredLcmGenerator.cs b/Src/xWorks/ConfiguredLcmGenerator.cs
@@ -861,7 +861,7 @@ private static string GenerateSrcAttributeFromFilePath(ICmFile file, string subF
 			{
 				filePath = MakeSafeFilePath(file.AbsoluteInternalPath);
 			}
-			return filePath;
+			return (settings.UseRelativePaths || !settings.UseUri) ? filePath : new Uri(filePath).ToString();
 		}
 
 		private static string GenerateSrcAttributeForMediaFromFilePath(string filename, string subFolder, GeneratorSettings settings)
@@ -3175,6 +3175,8 @@ public class GeneratorSettings
 			public LcmCache Cache { get; }
 			public ReadOnlyPropertyTable PropertyTable { get; }
 			public bool UseRelativePaths { get; }
+
+			public bool UseUri { get; }
 			public bool CopyFiles { get; }
 			public string ExportPath { get; }
 			public bool RightToLeft { get; }
@@ -3186,8 +3188,12 @@ public GeneratorSettings(LcmCache cache, PropertyTable propertyTable, bool relat
 			{
 			}
 
-
 			public GeneratorSettings(LcmCache cache, ReadOnlyPropertyTable propertyTable, bool relativePaths, bool copyFiles, string exportPath, bool rightToLeft = false, bool isWebExport = false, bool isTemplate = false)
+			: this(cache, propertyTable == null ? null : propertyTable, relativePaths, true, copyFiles, exportPath, rightToLeft, isWebExport, isTemplate)
+			{
+			}
+
+			public GeneratorSettings(LcmCache cache, ReadOnlyPropertyTable propertyTable, bool relativePaths, bool useUri, bool copyFiles, string exportPath, bool rightToLeft = false, bool isWebExport = false, bool isTemplate = false)
 			{
 				if (cache == null || propertyTable == null)
 				{
@@ -3196,6 +3202,7 @@ public GeneratorSettings(LcmCache cache, ReadOnlyPropertyTable propertyTable, bo
 				Cache = cache;
 				PropertyTable = propertyTable;
 				UseRelativePaths = relativePaths;
+				UseUri = useUri;
 				CopyFiles = copyFiles;
 				ExportPath = exportPath;
 				RightToLeft = rightToLeft;

diff --git a/Src/xWorks/LcmWordGenerator.cs b/Src/xWorks/LcmWordGenerator.cs
@@ -65,7 +65,8 @@ public static void SavePublishedDocx(int[] entryHvos, DictionaryPublicationDecor
 
 				generator.Init(readOnlyPropertyTable);
 				IsBidi = ConfiguredLcmGenerator.IsEntryStyleRtl(readOnlyPropertyTable, configuration);
-				var settings = new ConfiguredLcmGenerator.GeneratorSettings(cache, readOnlyPropertyTable, false, true, System.IO.Path.GetDirectoryName(filePath),
+				// Call GeneratorSettings with relativesPaths = false but useUri = false because that works better for Word.
+				var settings = new ConfiguredLcmGenerator.GeneratorSettings(cache, readOnlyPropertyTable, false, false, true, System.IO.Path.GetDirectoryName(filePath),
 							IsBidi, System.IO.Path.GetFileName(cssPath) == "configured.css")
 							{ ContentGenerator = generator, StylesGenerator = generator};
 				settings.StylesGenerator.AddGlobalStyles(configuration, readOnlyPropertyTable);
@@ -173,7 +174,7 @@ public static void SavePublishedDocx(int[] entryHvos, DictionaryPublicationDecor
 								Name = CompatSettingNameValues.CompatibilityMode,
 								// val determines the version of word we are targeting.
 								// 14 corresponds to Office 2010; 16 would correspond to Office 2019
-								Val = new StringValue("14"),
+								Val = new StringValue("16"),
 								Uri = new StringValue("http://schemas.microsoft.com/office/word")
 							},
 							new CompatibilitySetting()
@@ -183,7 +184,7 @@ public static void SavePublishedDocx(int[] entryHvos, DictionaryPublicationDecor
 								Val = new StringValue("0"),
 								Uri = new StringValue("http://schemas.microsoft.com/office/word")
 							}
-							// If in the future, if we find that certain style items are different in different version of word,
+							// If in the future, if we find that certain style items are different in different versions of word,
 							// it may help to specify more compatibility settings.
 							// A full list of all possible compatibility settings may be found here:
 							// https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.compatsettingnamevalues?view=openxml-3.0.1