Word Export: Add missing Before/After/Between content

- Add between content for CrossRreference types.
- Add before and after content for LexicalRelations->Targets.

Note: I think passing child to AddCollection() is the correct
node for the collection being added. The other implementations
of AddCollection() do not use this parameter so they are not
affected.
This fixes one of the issues identified in LT-21808.

Change-Id: I2bfbea70752fb0acfdd98d550753256b54783e33

Src/xWorks/ConfiguredLcmGenerator.cs

@@ -2005,12 +2005,12 @@ private static void GenerateContentForLexRefCollection(ConfigurableDictionaryNod
 			var organizedRefs = SortAndFilterLexRefsAndTargets(collection, cmOwner, config);
 
 			// Now that we have things in the right order, try outputting one type at a time
-			bool first = true;
+			bool firstIteration = true;
 			foreach (var referenceList in organizedRefs)
 			{
 				var xBldr = GenerateCrossReferenceChildren(config, pubDecorator, referenceList, cmOwner, settings);
-				settings.ContentGenerator.BetweenCrossReferenceType(xBldr, config, first);
-				first = false;
+				settings.ContentGenerator.BetweenCrossReferenceType(xBldr, config, firstIteration);
+				firstIteration = false;
 				bldr.Append(xBldr);
 			}
 		}

Src/xWorks/ILcmContentGenerator.cs

@@ -61,7 +61,7 @@ IFragment GenerateGroupingNode(ConfigurableDictionaryNode config, object field,
 		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);
-		void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool first);
+		void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool firstItem);
 		IFragment WriteProcessedSenses(ConfigurableDictionaryNode config, bool isBlock, IFragment senseContent, string className, IFragment sharedCollectionInfo);
 		IFragment AddAudioWsContent(string wsId, Guid linkTarget, IFragment fileContent);
 		IFragment GenerateErrorContent(StringBuilder badStrBuilder);

Src/xWorks/LcmJsonGenerator.cs

@@ -411,7 +411,7 @@ public void EndCrossReference(IFragmentWriter writer)
 			((JsonFragmentWriter)writer).InsertRawJson(",");
 		}
 
-		public void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool first)
+		public void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool firstItem)
 		{
 		}
 

Src/xWorks/LcmWordGenerator.cs

@@ -1621,10 +1621,10 @@ public void EndCrossReference(IFragmentWriter writer)
 			return;
 		}
 
-		public void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool first)
+		public void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool firstItem)
 		{
 			// Add Between text if it is not the first item in the collection.
-			if (!first && !string.IsNullOrEmpty(node.Between))
+			if (!firstItem && !string.IsNullOrEmpty(node.Between))
 			{
 				var betweenRun = CreateBeforeAfterBetweenRun(node.Between);
 				((DocFragment)content).DocBody.PrependChild(betweenRun);

Src/xWorks/LcmXhtmlGenerator.cs

@@ -992,7 +992,7 @@ public void EndCrossReference(IFragmentWriter writer)
 			EndObject(writer);
 		}
 
-		public void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool first)
+		public void BetweenCrossReferenceType(IFragment content, ConfigurableDictionaryNode node, bool firstItem)
 		{
 		}