LT-22039: xhtml has new nodeId attribute (#283)

jtmaxwell3 · JakeOliver28 · web-flow · commit 676f62fe7b55 · 2025-03-12T08:19:26.000-07:00
Co-authored-by: Jake Oliver &lt;jeoliver97@gmail.com&gt;
diff --git a/Src/xWorks/ConfiguredLcmGenerator.cs b/Src/xWorks/ConfiguredLcmGenerator.cs
@@ -344,7 +344,7 @@ internal static IFragment GenerateContentForEntry(ICmObject entry, ConfigurableD
 				{
 					var clerk = settings.PropertyTable.GetValue<RecordClerk>("ActiveClerk", null);
 					var entryClassName = settings.StylesGenerator.AddStyles(configuration).Trim('.');
-					settings.ContentGenerator.StartEntry(xw, configuration,
+					settings.ContentGenerator.StartEntry(xw, configuration, settings,
 						entryClassName, entry.Guid, index, clerk);
 					settings.ContentGenerator.AddEntryData(xw, pieces);
 					settings.ContentGenerator.EndEntry(xw);
@@ -883,7 +883,7 @@ private static IFragment GenerateContentForPicture(ICmFile pictureFile, Configur
 				// An XHTML id attribute must be unique but the ICmfile is used for all references to the same file within the project.
 				// The ICmPicture that owns the file does have unique guid so we use that.
 				var ownerGuid = owner.Guid.ToString();
-				return settings.ContentGenerator.AddImage(config, className, srcAttribute, ownerGuid);
+				return settings.ContentGenerator.AddImage(config, settings, className, srcAttribute, ownerGuid);
 			}
 			return settings.ContentGenerator.CreateFragment();
 		}
@@ -1936,7 +1936,7 @@ private static IFragment GenerateSenseContent(ConfigurableDictionaryNode config,
 			if (bldr.Length() == 0)
 				return bldr;
 
-			return settings.ContentGenerator.AddSenseData(config, senseNumberSpan, ((ICmObject)item).Owner.Guid, bldr, first);
+			return settings.ContentGenerator.AddSenseData(config, settings, senseNumberSpan, ((ICmObject)item).Owner.Guid, bldr, first);
 		}
 
 		private static IFragment GeneratePictureContent(ConfigurableDictionaryNode config, DictionaryPublicationDecorator publicationDecorator,
@@ -2021,7 +2021,7 @@ private static IFragment GenerateCollectionItemContent(ConfigurableDictionaryNod
 			if (bldr.Length() == 0)
 				return bldr;
 			var collectionContent = bldr;
-			return settings.ContentGenerator.AddCollectionItem(config, IsBlockProperty(config), GetCollectionItemClassAttribute(config), collectionContent, first);
+			return settings.ContentGenerator.AddCollectionItem(config, settings, IsBlockProperty(config), GetCollectionItemClassAttribute(config), collectionContent, first);
 		}
 
 		private static void GenerateContentForLexRefCollection(ConfigurableDictionaryNode config,
@@ -2155,7 +2155,7 @@ private static IFragment GenerateCrossReferenceChildren(ConfigurableDictionaryNo
 							if (!content.IsNullOrEmpty())
 							{
 								// targets
-								settings.ContentGenerator.AddCollection(xw, child, IsBlockProperty(child),
+								settings.ContentGenerator.AddCollection(xw, child, settings, IsBlockProperty(child),
 									CssGenerator.GetClassAttributeForConfig(child), content);
 								settings.StylesGenerator.AddStyles(child);
 							}
@@ -2222,7 +2222,7 @@ private static IFragment GenerateSenseNumberSpanIfNeeded(ConfigurableDictionaryN
 			var senseNumberWs = string.IsNullOrEmpty(info.HomographConfig.WritingSystem) ? "en" : info.HomographConfig.WritingSystem;
 			if (string.IsNullOrEmpty(formattedSenseNumber))
 				return settings.ContentGenerator.CreateFragment();
-			return settings.ContentGenerator.GenerateSenseNumber(senseConfigNode, formattedSenseNumber, senseNumberWs);
+			return settings.ContentGenerator.GenerateSenseNumber(senseConfigNode, settings, formattedSenseNumber, senseNumberWs);
 		}
 
 		private static string GetSenseNumber(string numberingStyle, ref SenseInfo info)
@@ -2604,7 +2604,7 @@ private static IFragment GenerateContentForSimpleString(ConfigurableDictionaryNo
 			var writingSystem = GetLanguageFromFirstOptionOrAnalysis(config.DictionaryNodeOptions as DictionaryNodeWritingSystemOptions,
 				settings.Cache);
 			var cssClassName = settings.StylesGenerator.AddStyles(config).Trim('.');
-			return settings.ContentGenerator.AddProperty(config, settings.PropertyTable, cssClassName, false, simpleString, writingSystem);
+			return settings.ContentGenerator.AddProperty(config, settings, cssClassName, false, simpleString, writingSystem);
 
 		}
 
@@ -2777,12 +2777,12 @@ private static IFragment GenerateContentForString(ITsString fieldValue, Configur
 						{
 							writingSystem = writingSystem ?? GetLanguageFromFirstOption(config.DictionaryNodeOptions as DictionaryNodeWritingSystemOptions,
 																settings.Cache);
-							settings.ContentGenerator.StartMultiRunString(writer, config, writingSystem);
+							settings.ContentGenerator.StartMultiRunString(writer, config, settings, writingSystem);
 							var wsRtl = settings.Cache.WritingSystemFactory.get_Engine(writingSystem).RightToLeftScript;
 							if (rightToLeft != wsRtl)
 							{
 								rightToLeft = wsRtl; // the outer WS direction will be used to identify embedded runs of the opposite direction.
-								settings.ContentGenerator.StartBiDiWrapper(writer, config, rightToLeft);
+								settings.ContentGenerator.StartBiDiWrapper(writer, config, settings, rightToLeft);
 							}
 						}
 
@@ -2858,11 +2858,11 @@ private static IFragment GenerateAudioWsContent(string wsId,
 		private static void GenerateRunWithPossibleLink(GeneratorSettings settings, string writingSystem, IFragmentWriter writer, string style,
 			string text, Guid linkDestination, bool rightToLeft, ConfigurableDictionaryNode config, bool first, string externalLink = null)
 		{
-			settings.ContentGenerator.StartRun(writer, config, settings.PropertyTable, writingSystem, first);
+			settings.ContentGenerator.StartRun(writer, config, settings, writingSystem, first);
 			var wsRtl = settings.Cache.WritingSystemFactory.get_Engine(writingSystem).RightToLeftScript;
 			if (rightToLeft != wsRtl)
 			{
-				settings.ContentGenerator.StartBiDiWrapper(writer, config, wsRtl);
+				settings.ContentGenerator.StartBiDiWrapper(writer, config, settings, wsRtl);
 			}
 			if (!String.IsNullOrEmpty(style))
 			{
@@ -2913,7 +2913,7 @@ private static IFragment GenerateContentForAudioFile(ConfigurableDictionaryNode
 			if (string.IsNullOrEmpty(audioId) && string.IsNullOrEmpty(srcAttribute) && string.IsNullOrEmpty(audioIcon))
 				return settings.ContentGenerator.CreateFragment();
 			var safeAudioId = GetSafeXHTMLId(audioId);
-			return settings.ContentGenerator.GenerateAudioLinkContent(config, classname, srcAttribute, audioIcon, safeAudioId);
+			return settings.ContentGenerator.GenerateAudioLinkContent(config, settings, classname, srcAttribute, audioIcon, safeAudioId);
 		}
 
 		private static string GetSafeXHTMLId(string audioId)
@@ -3082,7 +3082,7 @@ private static void GenerateTableRow(ITsString rowUSFM, IFragmentWriter writer,
 		private static void GenerateError(IFragmentWriter writer, GeneratorSettings settings, ConfigurableDictionaryNode config, string text)
 		{
 			var writingSystem = settings.Cache.WritingSystemFactory.GetStrFromWs(settings.Cache.WritingSystemFactory.UserWs);
-			settings.ContentGenerator.StartRun(writer, null, settings.PropertyTable, writingSystem, true);
+			settings.ContentGenerator.StartRun(writer, null, settings, writingSystem, true);
 			settings.ContentGenerator.SetRunStyle(writer, null, settings.PropertyTable, writingSystem, null, true);
 			if (text.Contains(TxtLineSplit))
 			{
@@ -3258,6 +3258,7 @@ public class GeneratorSettings
 			public string ExportPath { get; }
 			public bool RightToLeft { get; }
 			public bool IsWebExport { get; }
+			public bool IsXhtmlExport { get; set; }
 			public bool IsTemplate { get; }
 
 			public GeneratorSettings(LcmCache cache, PropertyTable propertyTable, bool relativePaths,bool copyFiles, string exportPath, bool rightToLeft = false, bool isWebExport = false)
@@ -3285,6 +3286,7 @@ public GeneratorSettings(LcmCache cache, ReadOnlyPropertyTable propertyTable, bo
 				RightToLeft = rightToLeft;
 				IsWebExport = isWebExport;
 				IsTemplate = isTemplate;
+				IsXhtmlExport = false;
 				StylesGenerator.Init(propertyTable);
 			}
 		}
diff --git a/Src/xWorks/DictionaryExportService.cs b/Src/xWorks/DictionaryExportService.cs
@@ -140,7 +140,7 @@ private void ExportConfiguredXhtml(string xhtmlPath, DictionaryConfigurationMode
 			var publicationDecorator = ConfiguredLcmGenerator.GetPublicationDecoratorAndEntries(m_propertyTable, out var entriesToSave, exportType);
 			if (progress != null)
 				progress.Maximum = entriesToSave.Length;
-			LcmXhtmlGenerator.SavePublishedHtmlWithStyles(entriesToSave, publicationDecorator, int.MaxValue, configuration, m_propertyTable, xhtmlPath, progress);
+			LcmXhtmlGenerator.SavePublishedHtmlWithStyles(entriesToSave, publicationDecorator, int.MaxValue, configuration, m_propertyTable, xhtmlPath, progress, true);
 		}
 
 		public List<JArray> ExportConfiguredJson(string folderPath, DictionaryConfigurationModel configuration, out int[] entryIds)
diff --git a/Src/xWorks/ILcmContentGenerator.cs b/Src/xWorks/ILcmContentGenerator.cs
@@ -16,23 +16,23 @@ namespace SIL.FieldWorks.XWorks
 	public interface ILcmContentGenerator
 	{
 		IFragment GenerateWsPrefixWithString(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool displayAbbreviation, int wsId, IFragment content);
-		IFragment GenerateAudioLinkContent(ConfigurableDictionaryNode config, string classname, string srcAttribute, string caption, string safeAudioId);
+		IFragment GenerateAudioLinkContent(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string classname, string srcAttribute, string caption, string safeAudioId);
 		IFragment WriteProcessedObject(ConfigurableDictionaryNode config, bool isBlock, IFragment elementContent, string className);
 		IFragment WriteProcessedCollection(ConfigurableDictionaryNode config, bool isBlock, IFragment elementContent, string className);
 		IFragment GenerateGramInfoBeforeSensesContent(IFragment content, ConfigurableDictionaryNode config);
 		IFragment GenerateGroupingNode(ConfigurableDictionaryNode config, object field, string className,  DictionaryPublicationDecorator publicationDecorator, ConfiguredLcmGenerator.GeneratorSettings settings,
 			Func<object, ConfigurableDictionaryNode, DictionaryPublicationDecorator, ConfiguredLcmGenerator.GeneratorSettings, IFragment> childContentGenerator);
-		IFragment AddSenseData(ConfigurableDictionaryNode config, IFragment senseNumberSpan, Guid ownerGuid, IFragment senseContent, bool first);
-		IFragment AddCollectionItem(ConfigurableDictionaryNode config, bool isBlock, string collectionItemClass, IFragment content, bool first);
-		IFragment AddProperty(ConfigurableDictionaryNode config, ReadOnlyPropertyTable propTable, string className, bool isBlockProperty, string content, string writingSystem);
+		IFragment AddSenseData(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, IFragment senseNumberSpan, Guid ownerGuid, IFragment senseContent, bool first);
+		IFragment AddCollectionItem(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool isBlock, string collectionItemClass, IFragment content, bool first);
+		IFragment AddProperty(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string className, bool isBlockProperty, string content, string writingSystem);
 		IFragment CreateFragment();
 		IFragment CreateFragment(string str);
 		IFragmentWriter CreateWriter(IFragment fragment);
-		void StartMultiRunString(IFragmentWriter writer, ConfigurableDictionaryNode config, string writingSystem);
+		void StartMultiRunString(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string writingSystem);
 		void EndMultiRunString(IFragmentWriter writer);
-		void StartBiDiWrapper(IFragmentWriter writer, ConfigurableDictionaryNode config, bool rightToLeft);
+		void StartBiDiWrapper(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool rightToLeft);
 		void EndBiDiWrapper(IFragmentWriter writer);
-		void StartRun(IFragmentWriter writer, ConfigurableDictionaryNode config, ReadOnlyPropertyTable propTable, string writingSystem, bool first);
+		void StartRun(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string writingSystem, bool first);
 		void EndRun(IFragmentWriter writer);
 		void SetRunStyle(IFragmentWriter writer, ConfigurableDictionaryNode config, ReadOnlyPropertyTable propertyTable, string writingSystem, string runStyle, bool error);
 		void StartLink(IFragmentWriter writer, ConfigurableDictionaryNode config, Guid destination);
@@ -48,16 +48,16 @@ IFragment GenerateGroupingNode(ConfigurableDictionaryNode config, object field,
 		void EndTableRow(IFragmentWriter writer);
 		void EndTableBody(IFragmentWriter writer);
 		void EndTable(IFragmentWriter writer, ConfigurableDictionaryNode config);
-		void StartEntry(IFragmentWriter writer, ConfigurableDictionaryNode config, string className, Guid entryGuid, int index, RecordClerk clerk);
+		void StartEntry(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string className, Guid entryGuid, int index, RecordClerk clerk);
 		void AddEntryData(IFragmentWriter writer, List<ConfiguredLcmGenerator.ConfigFragment> pieces);
 		void EndEntry(IFragmentWriter writer);
-		void AddCollection(IFragmentWriter writer, ConfigurableDictionaryNode config, bool isBlockProperty, string className, IFragment content);
+		void AddCollection(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool isBlockProperty, string className, IFragment content);
 		void BeginObjectProperty(IFragmentWriter writer, ConfigurableDictionaryNode config, bool isBlockProperty, string getCollectionItemClassAttribute);
 		void EndObject(IFragmentWriter writer);
 		void WriteProcessedContents(IFragmentWriter writer, ConfigurableDictionaryNode config, IFragment contents);
-		IFragment AddImage(ConfigurableDictionaryNode config, string classAttribute, string srcAttribute, string pictureGuid);
+		IFragment AddImage(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string classAttribute, string srcAttribute, string pictureGuid);
 		IFragment AddImageCaption(ConfigurableDictionaryNode config, IFragment captionContent);
-		IFragment GenerateSenseNumber(ConfigurableDictionaryNode config, string formattedSenseNumber, string senseNumberWs);
+		IFragment GenerateSenseNumber(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string formattedSenseNumber, string senseNumberWs);
 		IFragment AddLexReferences(ConfigurableDictionaryNode config, bool generateLexType, IFragment lexTypeContent, string className, IFragment referencesContent, bool typeBefore);
 		void BeginCrossReference(IFragmentWriter writer, ConfigurableDictionaryNode config, bool isBlockProperty, string className);
 		void EndCrossReference(IFragmentWriter writer);
diff --git a/Src/xWorks/LcmJsonGenerator.cs b/Src/xWorks/LcmJsonGenerator.cs
@@ -44,7 +44,7 @@ public IFragment GenerateWsPrefixWithString(ConfigurableDictionaryNode config, C
 			return content;
 		}
 
-		public IFragment GenerateAudioLinkContent(ConfigurableDictionaryNode config, string classname, string srcAttribute, string caption,
+		public IFragment GenerateAudioLinkContent(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string classname, string srcAttribute, string caption,
 			string safeAudioId)
 		{
 			/*"audio": {
@@ -117,14 +117,14 @@ public IFragment GenerateGroupingNode(ConfigurableDictionaryNode config, object
 			return new StringFragment();
 		}
 
-		public IFragment AddCollectionItem(ConfigurableDictionaryNode config, bool isBlock, string className, IFragment content, bool first)
+		public IFragment AddCollectionItem(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool isBlock, string className, IFragment content, bool first)
 		{
 			var fragment = new StringFragment();
 			fragment.StrBuilder.Append(content.IsNullOrEmpty() ? string.Empty : $"{{{content}}},");
 			return fragment;
 		}
 
-		public IFragment AddProperty(ConfigurableDictionaryNode config, ReadOnlyPropertyTable propTable, string className, bool isBlockProperty, string content, string writingSystem)
+		public IFragment AddProperty(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string className, bool isBlockProperty, string content, string writingSystem)
 		{
 			var fragment = new StringFragment($"\"{className}\": \"{content}\",");
 			return fragment;
@@ -145,23 +145,23 @@ public IFragmentWriter CreateWriter(IFragment bldr)
 			return new JsonFragmentWriter(((StringFragment)bldr).StrBuilder);
 		}
 
-		public void StartMultiRunString(IFragmentWriter writer, ConfigurableDictionaryNode config, string writingSystem)
+		public void StartMultiRunString(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string writingSystem)
 		{
 		}
 
 		public void EndMultiRunString(IFragmentWriter writer)
 		{
 		}
 
-		public void StartBiDiWrapper(IFragmentWriter writer, ConfigurableDictionaryNode config, bool rightToLeft)
+		public void StartBiDiWrapper(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool rightToLeft)
 		{
 		}
 
 		public void EndBiDiWrapper(IFragmentWriter writer)
 		{
 		}
 
-		public void StartRun(IFragmentWriter writer, ConfigurableDictionaryNode config, ReadOnlyPropertyTable propTable, string writingSystem, bool first)
+		public void StartRun(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string writingSystem, bool first)
 		{
 			var jsonWriter = (JsonFragmentWriter)writer;
 			jsonWriter.StartObject();
@@ -253,7 +253,7 @@ public void EndTable(IFragmentWriter writer, ConfigurableDictionaryNode config)
 			// TODO: decide on a useful json representation for tables
 		}
 
-		public void StartEntry(IFragmentWriter xw, ConfigurableDictionaryNode config, string className, Guid entryGuid, int index, RecordClerk clerk)
+		public void StartEntry(IFragmentWriter xw, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string className, Guid entryGuid, int index, RecordClerk clerk)
 		{
 			var jsonWriter = (JsonFragmentWriter)xw;
 			jsonWriter.StartObject();
@@ -292,7 +292,7 @@ public void EndEntry(IFragmentWriter xw)
 			((JsonFragmentWriter)xw).EndObject();
 		}
 
-		public void AddCollection(IFragmentWriter writer, ConfigurableDictionaryNode config, bool isBlockProperty, string className, IFragment content)
+		public void AddCollection(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool isBlockProperty, string className, IFragment content)
 		{
 			((JsonFragmentWriter)writer).InsertPropertyName(className);
 			BeginArray(writer);
@@ -335,7 +335,7 @@ public void WriteProcessedContents(IFragmentWriter writer, ConfigurableDictionar
 			}
 		}
 
-		public IFragment AddImage(ConfigurableDictionaryNode config, string classAttribute, string srcAttribute, string pictureGuid)
+		public IFragment AddImage(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string classAttribute, string srcAttribute, string pictureGuid)
 		{
 			var bldr = new StringBuilder();
 			var fragment = new StringFragment();
@@ -358,7 +358,7 @@ public IFragment AddImageCaption(ConfigurableDictionaryNode config, IFragment ca
 			return new StringFragment(captionContent.ToString());
 		}
 
-		public IFragment GenerateSenseNumber(ConfigurableDictionaryNode config, string formattedSenseNumber, string wsId)
+		public IFragment GenerateSenseNumber(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string formattedSenseNumber, string wsId)
 		{
 			return new StringFragment(formattedSenseNumber);
 		}
@@ -435,7 +435,7 @@ public IFragment GenerateErrorContent(StringBuilder badStrBuilder)
 			return new StringFragment($"\\u+0FFF\\u+0FFF\\u+0FFF{badStrBuilder}");
 		}
 
-		public IFragment AddSenseData(ConfigurableDictionaryNode config, IFragment senseNumberSpan, Guid ownerGuid, IFragment senseContent, bool first)
+		public IFragment AddSenseData(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, IFragment senseNumberSpan, Guid ownerGuid, IFragment senseContent, bool first)
 		{
 			var bldr = new StringBuilder();
 			var fragment = new StringFragment(bldr);
diff --git a/Src/xWorks/LcmWordGenerator.cs b/Src/xWorks/LcmWordGenerator.cs
diff --git a/Src/xWorks/LcmXhtmlGenerator.cs b/Src/xWorks/LcmXhtmlGenerator.cs

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ internal static IFragment GenerateContentForEntry(ICmObject entry, ConfigurableD`
`344`	`344`	`{`
`345`	`345`	`var clerk = settings.PropertyTable.GetValue<RecordClerk>("ActiveClerk", null);`
`346`	`346`	`var entryClassName = settings.StylesGenerator.AddStyles(configuration).Trim('.');`
`347`		`- settings.ContentGenerator.StartEntry(xw, configuration,`
	`347`	`+ settings.ContentGenerator.StartEntry(xw, configuration, settings,`
`348`	`348`	`entryClassName, entry.Guid, index, clerk);`
`349`	`349`	`settings.ContentGenerator.AddEntryData(xw, pieces);`
`350`	`350`	`settings.ContentGenerator.EndEntry(xw);`
`@@ -883,7 +883,7 @@ private static IFragment GenerateContentForPicture(ICmFile pictureFile, Configur`
`883`	`883`	`// An XHTML id attribute must be unique but the ICmfile is used for all references to the same file within the project.`
`884`	`884`	`// The ICmPicture that owns the file does have unique guid so we use that.`
`885`	`885`	`var ownerGuid = owner.Guid.ToString();`
`886`		`- return settings.ContentGenerator.AddImage(config, className, srcAttribute, ownerGuid);`
	`886`	`+ return settings.ContentGenerator.AddImage(config, settings, className, srcAttribute, ownerGuid);`
`887`	`887`	`}`
`888`	`888`	`return settings.ContentGenerator.CreateFragment();`
`889`	`889`	`}`
`@@ -1936,7 +1936,7 @@ private static IFragment GenerateSenseContent(ConfigurableDictionaryNode config,`
`1936`	`1936`	`if (bldr.Length() == 0)`
`1937`	`1937`	`return bldr;`
`1938`	`1938`
`1939`		`- return settings.ContentGenerator.AddSenseData(config, senseNumberSpan, ((ICmObject)item).Owner.Guid, bldr, first);`
	`1939`	`+ return settings.ContentGenerator.AddSenseData(config, settings, senseNumberSpan, ((ICmObject)item).Owner.Guid, bldr, first);`
`1940`	`1940`	`}`
`1941`	`1941`
`1942`	`1942`	`private static IFragment GeneratePictureContent(ConfigurableDictionaryNode config, DictionaryPublicationDecorator publicationDecorator,`
`@@ -2021,7 +2021,7 @@ private static IFragment GenerateCollectionItemContent(ConfigurableDictionaryNod`
`2021`	`2021`	`if (bldr.Length() == 0)`
`2022`	`2022`	`return bldr;`
`2023`	`2023`	`var collectionContent = bldr;`
`2024`		`- return settings.ContentGenerator.AddCollectionItem(config, IsBlockProperty(config), GetCollectionItemClassAttribute(config), collectionContent, first);`
	`2024`	`+ return settings.ContentGenerator.AddCollectionItem(config, settings, IsBlockProperty(config), GetCollectionItemClassAttribute(config), collectionContent, first);`
`2025`	`2025`	`}`
`2026`	`2026`
`2027`	`2027`	`private static void GenerateContentForLexRefCollection(ConfigurableDictionaryNode config,`
`@@ -2155,7 +2155,7 @@ private static IFragment GenerateCrossReferenceChildren(ConfigurableDictionaryNo`
`2155`	`2155`	`if (!content.IsNullOrEmpty())`
`2156`	`2156`	`{`
`2157`	`2157`	`// targets`
`2158`		`- settings.ContentGenerator.AddCollection(xw, child, IsBlockProperty(child),`
	`2158`	`+ settings.ContentGenerator.AddCollection(xw, child, settings, IsBlockProperty(child),`
`2159`	`2159`	`CssGenerator.GetClassAttributeForConfig(child), content);`
`2160`	`2160`	`settings.StylesGenerator.AddStyles(child);`
`2161`	`2161`	`}`
`@@ -2222,7 +2222,7 @@ private static IFragment GenerateSenseNumberSpanIfNeeded(ConfigurableDictionaryN`
`2222`	`2222`	`var senseNumberWs = string.IsNullOrEmpty(info.HomographConfig.WritingSystem) ? "en" : info.HomographConfig.WritingSystem;`
`2223`	`2223`	`if (string.IsNullOrEmpty(formattedSenseNumber))`
`2224`	`2224`	`return settings.ContentGenerator.CreateFragment();`
`2225`		`- return settings.ContentGenerator.GenerateSenseNumber(senseConfigNode, formattedSenseNumber, senseNumberWs);`
	`2225`	`+ return settings.ContentGenerator.GenerateSenseNumber(senseConfigNode, settings, formattedSenseNumber, senseNumberWs);`
`2226`	`2226`	`}`
`2227`	`2227`
`2228`	`2228`	`private static string GetSenseNumber(string numberingStyle, ref SenseInfo info)`
`@@ -2604,7 +2604,7 @@ private static IFragment GenerateContentForSimpleString(ConfigurableDictionaryNo`
`2604`	`2604`	`var writingSystem = GetLanguageFromFirstOptionOrAnalysis(config.DictionaryNodeOptions as DictionaryNodeWritingSystemOptions,`
`2605`	`2605`	`settings.Cache);`
`2606`	`2606`	`var cssClassName = settings.StylesGenerator.AddStyles(config).Trim('.');`
`2607`		`- return settings.ContentGenerator.AddProperty(config, settings.PropertyTable, cssClassName, false, simpleString, writingSystem);`
	`2607`	`+ return settings.ContentGenerator.AddProperty(config, settings, cssClassName, false, simpleString, writingSystem);`
`2608`	`2608`
`2609`	`2609`	`}`
`2610`	`2610`
`@@ -2777,12 +2777,12 @@ private static IFragment GenerateContentForString(ITsString fieldValue, Configur`
`2777`	`2777`	`{`
`2778`	`2778`	`writingSystem = writingSystem ?? GetLanguageFromFirstOption(config.DictionaryNodeOptions as DictionaryNodeWritingSystemOptions,`
`2779`	`2779`	`settings.Cache);`
`2780`		`- settings.ContentGenerator.StartMultiRunString(writer, config, writingSystem);`
	`2780`	`+ settings.ContentGenerator.StartMultiRunString(writer, config, settings, writingSystem);`
`2781`	`2781`	`var wsRtl = settings.Cache.WritingSystemFactory.get_Engine(writingSystem).RightToLeftScript;`
`2782`	`2782`	`if (rightToLeft != wsRtl)`
`2783`	`2783`	`{`
`2784`	`2784`	`rightToLeft = wsRtl; // the outer WS direction will be used to identify embedded runs of the opposite direction.`
`2785`		`- settings.ContentGenerator.StartBiDiWrapper(writer, config, rightToLeft);`
	`2785`	`+ settings.ContentGenerator.StartBiDiWrapper(writer, config, settings, rightToLeft);`
`2786`	`2786`	`}`
`2787`	`2787`	`}`
`2788`	`2788`
`@@ -2858,11 +2858,11 @@ private static IFragment GenerateAudioWsContent(string wsId,`
`2858`	`2858`	`private static void GenerateRunWithPossibleLink(GeneratorSettings settings, string writingSystem, IFragmentWriter writer, string style,`
`2859`	`2859`	`string text, Guid linkDestination, bool rightToLeft, ConfigurableDictionaryNode config, bool first, string externalLink = null)`
`2860`	`2860`	`{`
`2861`		`- settings.ContentGenerator.StartRun(writer, config, settings.PropertyTable, writingSystem, first);`
	`2861`	`+ settings.ContentGenerator.StartRun(writer, config, settings, writingSystem, first);`
`2862`	`2862`	`var wsRtl = settings.Cache.WritingSystemFactory.get_Engine(writingSystem).RightToLeftScript;`
`2863`	`2863`	`if (rightToLeft != wsRtl)`
`2864`	`2864`	`{`
`2865`		`- settings.ContentGenerator.StartBiDiWrapper(writer, config, wsRtl);`
	`2865`	`+ settings.ContentGenerator.StartBiDiWrapper(writer, config, settings, wsRtl);`
`2866`	`2866`	`}`
`2867`	`2867`	`if (!String.IsNullOrEmpty(style))`
`2868`	`2868`	`{`
`@@ -2913,7 +2913,7 @@ private static IFragment GenerateContentForAudioFile(ConfigurableDictionaryNode`
`2913`	`2913`	`if (string.IsNullOrEmpty(audioId) && string.IsNullOrEmpty(srcAttribute) && string.IsNullOrEmpty(audioIcon))`
`2914`	`2914`	`return settings.ContentGenerator.CreateFragment();`
`2915`	`2915`	`var safeAudioId = GetSafeXHTMLId(audioId);`
`2916`		`- return settings.ContentGenerator.GenerateAudioLinkContent(config, classname, srcAttribute, audioIcon, safeAudioId);`
	`2916`	`+ return settings.ContentGenerator.GenerateAudioLinkContent(config, settings, classname, srcAttribute, audioIcon, safeAudioId);`
`2917`	`2917`	`}`
`2918`	`2918`
`2919`	`2919`	`private static string GetSafeXHTMLId(string audioId)`
`@@ -3082,7 +3082,7 @@ private static void GenerateTableRow(ITsString rowUSFM, IFragmentWriter writer,`
`3082`	`3082`	`private static void GenerateError(IFragmentWriter writer, GeneratorSettings settings, ConfigurableDictionaryNode config, string text)`
`3083`	`3083`	`{`
`3084`	`3084`	`var writingSystem = settings.Cache.WritingSystemFactory.GetStrFromWs(settings.Cache.WritingSystemFactory.UserWs);`
`3085`		`- settings.ContentGenerator.StartRun(writer, null, settings.PropertyTable, writingSystem, true);`
	`3085`	`+ settings.ContentGenerator.StartRun(writer, null, settings, writingSystem, true);`
`3086`	`3086`	`settings.ContentGenerator.SetRunStyle(writer, null, settings.PropertyTable, writingSystem, null, true);`
`3087`	`3087`	`if (text.Contains(TxtLineSplit))`
`3088`	`3088`	`{`
`@@ -3258,6 +3258,7 @@ public class GeneratorSettings`
`3258`	`3258`	`public string ExportPath { get; }`
`3259`	`3259`	`public bool RightToLeft { get; }`
`3260`	`3260`	`public bool IsWebExport { get; }`
	`3261`	`+ public bool IsXhtmlExport { get; set; }`
`3261`	`3262`	`public bool IsTemplate { get; }`
`3262`	`3263`
`3263`	`3264`	`public GeneratorSettings(LcmCache cache, PropertyTable propertyTable, bool relativePaths,bool copyFiles, string exportPath, bool rightToLeft = false, bool isWebExport = false)`
`@@ -3285,6 +3286,7 @@ public GeneratorSettings(LcmCache cache, ReadOnlyPropertyTable propertyTable, bo`
`3285`	`3286`	`RightToLeft = rightToLeft;`
`3286`	`3287`	`IsWebExport = isWebExport;`
`3287`	`3288`	`IsTemplate = isTemplate;`
	`3289`	`+ IsXhtmlExport = false;`
`3288`	`3290`	`StylesGenerator.Init(propertyTable);`
`3289`	`3291`	`}`
`3290`	`3292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private void ExportConfiguredXhtml(string xhtmlPath, DictionaryConfigurationMode`
`140`	`140`	`var publicationDecorator = ConfiguredLcmGenerator.GetPublicationDecoratorAndEntries(m_propertyTable, out var entriesToSave, exportType);`
`141`	`141`	`if (progress != null)`
`142`	`142`	`progress.Maximum = entriesToSave.Length;`
`143`		`- LcmXhtmlGenerator.SavePublishedHtmlWithStyles(entriesToSave, publicationDecorator, int.MaxValue, configuration, m_propertyTable, xhtmlPath, progress);`
	`143`	`+ LcmXhtmlGenerator.SavePublishedHtmlWithStyles(entriesToSave, publicationDecorator, int.MaxValue, configuration, m_propertyTable, xhtmlPath, progress, true);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`public List<JArray> ExportConfiguredJson(string folderPath, DictionaryConfigurationModel configuration, out int[] entryIds)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public IFragment GenerateWsPrefixWithString(ConfigurableDictionaryNode config, C`
`44`	`44`	`return content;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public IFragment GenerateAudioLinkContent(ConfigurableDictionaryNode config, string classname, string srcAttribute, string caption,`
	`47`	`+ public IFragment GenerateAudioLinkContent(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string classname, string srcAttribute, string caption,`
`48`	`48`	`string safeAudioId)`
`49`	`49`	`{`
`50`	`50`	`/*"audio": {`
`@@ -117,14 +117,14 @@ public IFragment GenerateGroupingNode(ConfigurableDictionaryNode config, object`
`117`	`117`	`return new StringFragment();`
`118`	`118`	`}`
`119`	`119`
`120`		`- public IFragment AddCollectionItem(ConfigurableDictionaryNode config, bool isBlock, string className, IFragment content, bool first)`
	`120`	`+ public IFragment AddCollectionItem(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool isBlock, string className, IFragment content, bool first)`
`121`	`121`	`{`
`122`	`122`	`var fragment = new StringFragment();`
`123`	`123`	`fragment.StrBuilder.Append(content.IsNullOrEmpty() ? string.Empty : $"{{{content}}},");`
`124`	`124`	`return fragment;`
`125`	`125`	`}`
`126`	`126`
`127`		`- public IFragment AddProperty(ConfigurableDictionaryNode config, ReadOnlyPropertyTable propTable, string className, bool isBlockProperty, string content, string writingSystem)`
	`127`	`+ public IFragment AddProperty(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string className, bool isBlockProperty, string content, string writingSystem)`
`128`	`128`	`{`
`129`	`129`	`var fragment = new StringFragment($"\"{className}\": \"{content}\",");`
`130`	`130`	`return fragment;`
`@@ -145,23 +145,23 @@ public IFragmentWriter CreateWriter(IFragment bldr)`
`145`	`145`	`return new JsonFragmentWriter(((StringFragment)bldr).StrBuilder);`
`146`	`146`	`}`
`147`	`147`
`148`		`- public void StartMultiRunString(IFragmentWriter writer, ConfigurableDictionaryNode config, string writingSystem)`
	`148`	`+ public void StartMultiRunString(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string writingSystem)`
`149`	`149`	`{`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`public void EndMultiRunString(IFragmentWriter writer)`
`153`	`153`	`{`
`154`	`154`	`}`
`155`	`155`
`156`		`- public void StartBiDiWrapper(IFragmentWriter writer, ConfigurableDictionaryNode config, bool rightToLeft)`
	`156`	`+ public void StartBiDiWrapper(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool rightToLeft)`
`157`	`157`	`{`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`public void EndBiDiWrapper(IFragmentWriter writer)`
`161`	`161`	`{`
`162`	`162`	`}`
`163`	`163`
`164`		`- public void StartRun(IFragmentWriter writer, ConfigurableDictionaryNode config, ReadOnlyPropertyTable propTable, string writingSystem, bool first)`
	`164`	`+ public void StartRun(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string writingSystem, bool first)`
`165`	`165`	`{`
`166`	`166`	`var jsonWriter = (JsonFragmentWriter)writer;`
`167`	`167`	`jsonWriter.StartObject();`
`@@ -253,7 +253,7 @@ public void EndTable(IFragmentWriter writer, ConfigurableDictionaryNode config)`
`253`	`253`	`// TODO: decide on a useful json representation for tables`
`254`	`254`	`}`
`255`	`255`
`256`		`- public void StartEntry(IFragmentWriter xw, ConfigurableDictionaryNode config, string className, Guid entryGuid, int index, RecordClerk clerk)`
	`256`	`+ public void StartEntry(IFragmentWriter xw, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string className, Guid entryGuid, int index, RecordClerk clerk)`
`257`	`257`	`{`
`258`	`258`	`var jsonWriter = (JsonFragmentWriter)xw;`
`259`	`259`	`jsonWriter.StartObject();`
`@@ -292,7 +292,7 @@ public void EndEntry(IFragmentWriter xw)`
`292`	`292`	`((JsonFragmentWriter)xw).EndObject();`
`293`	`293`	`}`
`294`	`294`
`295`		`- public void AddCollection(IFragmentWriter writer, ConfigurableDictionaryNode config, bool isBlockProperty, string className, IFragment content)`
	`295`	`+ public void AddCollection(IFragmentWriter writer, ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, bool isBlockProperty, string className, IFragment content)`
`296`	`296`	`{`
`297`	`297`	`((JsonFragmentWriter)writer).InsertPropertyName(className);`
`298`	`298`	`BeginArray(writer);`
`@@ -335,7 +335,7 @@ public void WriteProcessedContents(IFragmentWriter writer, ConfigurableDictionar`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`338`		`- public IFragment AddImage(ConfigurableDictionaryNode config, string classAttribute, string srcAttribute, string pictureGuid)`
	`338`	`+ public IFragment AddImage(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string classAttribute, string srcAttribute, string pictureGuid)`
`339`	`339`	`{`
`340`	`340`	`var bldr = new StringBuilder();`
`341`	`341`	`var fragment = new StringFragment();`
`@@ -358,7 +358,7 @@ public IFragment AddImageCaption(ConfigurableDictionaryNode config, IFragment ca`
`358`	`358`	`return new StringFragment(captionContent.ToString());`
`359`	`359`	`}`
`360`	`360`
`361`		`- public IFragment GenerateSenseNumber(ConfigurableDictionaryNode config, string formattedSenseNumber, string wsId)`
	`361`	`+ public IFragment GenerateSenseNumber(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, string formattedSenseNumber, string wsId)`
`362`	`362`	`{`
`363`	`363`	`return new StringFragment(formattedSenseNumber);`
`364`	`364`	`}`
`@@ -435,7 +435,7 @@ public IFragment GenerateErrorContent(StringBuilder badStrBuilder)`
`435`	`435`	`return new StringFragment($"\\u+0FFF\\u+0FFF\\u+0FFF{badStrBuilder}");`
`436`	`436`	`}`
`437`	`437`
`438`		`- public IFragment AddSenseData(ConfigurableDictionaryNode config, IFragment senseNumberSpan, Guid ownerGuid, IFragment senseContent, bool first)`
	`438`	`+ public IFragment AddSenseData(ConfigurableDictionaryNode config, ConfiguredLcmGenerator.GeneratorSettings settings, IFragment senseNumberSpan, Guid ownerGuid, IFragment senseContent, bool first)`
`439`	`439`	`{`
`440`	`440`	`var bldr = new StringBuilder();`
`441`	`441`	`var fragment = new StringFragment(bldr);`