From 96a82aff419583dc560b04b8c76b6eaed12e8933 Mon Sep 17 00:00:00 2001 From: mark-sil Date: Tue, 3 Sep 2024 15:54:14 -0400 Subject: [PATCH] Word Export: Add missing Between content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed the check for DictionaryNodeOptions. In addition to IParaOption, sometimes we get in here for a DictionaryNodeListOptions and sometimes it is null. Removing the check lead to another problem when adding the type. The type was always being passed false for ‘first’ when it should always be passed true. We don’t want between content for the type Node. This fixes many of the issues identified in LT-21808. Change-Id: I347eaa0876f7f09b650932a3563c0c06b82d3891 --- Src/xWorks/ConfiguredLcmGenerator.cs | 2 +- Src/xWorks/LcmWordGenerator.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Src/xWorks/ConfiguredLcmGenerator.cs b/Src/xWorks/ConfiguredLcmGenerator.cs index de44b52dab..dfde8ff89a 100644 --- a/Src/xWorks/ConfiguredLcmGenerator.cs +++ b/Src/xWorks/ConfiguredLcmGenerator.cs @@ -1606,7 +1606,7 @@ private static void GenerateContentForLexEntryRefsByType(ConfigurableDictionaryN var generateLexType = typeNode != null; var lexTypeContent = generateLexType ? GenerateCollectionItemContent(typeNode, pubDecorator, lexEntryType, - lexEntryType.Owner, settings, false) + lexEntryType.Owner, settings, true) : null; var className = generateLexType ? settings.StylesGenerator.AddStyles(typeNode).Trim('.') : null; var refsByType = settings.ContentGenerator.AddLexReferences(typeNode, generateLexType, diff --git a/Src/xWorks/LcmWordGenerator.cs b/Src/xWorks/LcmWordGenerator.cs index f6b9980751..40e6de8ae9 100644 --- a/Src/xWorks/LcmWordGenerator.cs +++ b/Src/xWorks/LcmWordGenerator.cs @@ -993,7 +993,6 @@ config.DictionaryNodeOptions is IParaOption && // and it is not the first item in the collection. if (!first && config != null && - config.DictionaryNodeOptions is IParaOption && !eachInAParagraph && !string.IsNullOrEmpty(config.Between)) {