Merge branch 'release/9.1' into LT-21911

Src/GenerateHCConfig/ConsoleLogger.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using SIL.LCModel;
 using SIL.FieldWorks.WordWorks.Parser;
@@ -103,5 +103,10 @@ public void InvalidReduplicationForm(IMoForm form, string reason, IMoMorphSynAna
 		{
 			Console.WriteLine("The reduplication form \"{0}\" is invalid. Reason: {1}", form.Form.VernacularDefaultWritingSystem.Text, reason);
 		}
+
+		public void InvalidRewriteRule(IPhRegularRule rule, string reason)
+		{
+			Console.WriteLine("The rewrite rule \"{0}\" is invalid. Reason: {1}", rule.Name.BestAnalysisVernacularAlternative.Text, reason);
+		}
 	}
 }

Src/LexText/Interlinear/FocusBoxController.cs

@@ -346,27 +346,9 @@ private void UpdateButtonState()
 			if (InterlinDoc == null || !InterlinDoc.IsFocusBoxInstalled)
 				return;
 			// we're fully installed, so update the buttons.
-			if (ShowLinkWordsIcon)
-			{
-				btnLinkNextWord.Visible = true;
-				btnLinkNextWord.Enabled = true;
-			}
-			else
-			{
-				btnLinkNextWord.Visible = false;
-				btnLinkNextWord.Enabled = false;
-			}
+			btnLinkNextWord.Visible = btnLinkNextWord.Enabled = ShowLinkWordsIcon;
+			btnBreakPhrase.Visible = btnBreakPhrase.Enabled = ShowBreakPhraseIcon;
 
-			if (ShowBreakPhraseIcon)
-			{
-				btnBreakPhrase.Visible = true;
-				btnBreakPhrase.Enabled = true;
-			}
-			else
-			{
-				btnBreakPhrase.Visible = false;
-				btnBreakPhrase.Enabled = false;
-			}
 			UpdateButtonState_Undo();
 			// LT-11406: Somehow JoinWords (and BreakPhrase) leaves the selection elsewhere,
 			// this should make it select the default location.
@@ -376,16 +358,8 @@ private void UpdateButtonState()
 
 		private void UpdateButtonState_Undo()
 		{
-			if (InterlinWordControl != null && InterlinWordControl.HasChanged)
-			{
-				btnUndoChanges.Visible = true;
-				btnUndoChanges.Enabled = true;
-			}
-			else
-			{
-				btnUndoChanges.Visible = false;
-				btnUndoChanges.Enabled = false;
-			}
+			bool shouldEnable = InterlinWordControl != null && InterlinWordControl.HasChanged;
+			btnUndoChanges.Visible = btnUndoChanges.Enabled = shouldEnable;
 		}
 
 		private void btnLinkNextWord_Click(object sender, EventArgs e)

Src/LexText/LexTextControls/PatternView.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
@@ -134,11 +134,16 @@ protected override void OnKeyDown(KeyEventArgs e)
 		/// <param name="e"></param>
 		protected override void OnKeyPress(KeyPressEventArgs e)
 		{
-			if (e.KeyChar == (char) Keys.Back)
+			e.Handled = true;
+			if (e.KeyChar == (char)Keys.Back || e.KeyChar == (char)Keys.Delete)
 			{
 				if (RemoveItemsRequested != null)
 					RemoveItemsRequested(this, new RemoveItemsRequestedEventArgs(false));
-				e.Handled = true;
+			}
+			else
+			{
+				// Ignore all other characters (fixes LT-21888).
+				return;
 			}
 			base.OnKeyPress(e);
 		}

Src/LexText/Morphology/AffixRuleFormulaControl.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 SIL International
+// Copyright (c) 2015 SIL International
 // This software is licensed under the LGPL, version 2.1 or later
 // (http://www.gnu.org/licenses/lgpl-2.1.html)
 
@@ -176,7 +176,7 @@ private bool DisplayVariableOption(object option)
 		private bool DisplayColumnOption(object option)
 		{
 			SelectionHelper sel = SelectionHelper.Create(m_view);
-			if (sel.IsRange)
+			if (sel == null || sel.IsRange)
 				return false;
 
 			int cellId = GetCell(sel);
@@ -599,6 +599,8 @@ protected override int RemoveItems(SelectionHelper sel, bool forward, out int ce
 							int prevCellId = GetPrevCell(seqCtxt.Hvo);
 							cellIndex = GetCellCount(prevCellId) - 1;
 							Rule.InputOS.Remove(seqCtxt);
+							// Unschedule the removal of the column.
+							m_removeCol = null;
 							return prevCellId;
 						}
 						bool reconstruct = RemoveContextsFrom(forward, sel, seqCtxt, false, out cellIndex);
@@ -716,7 +718,7 @@ protected bool RemoveFromOutput(bool forward, SelectionHelper sel, out int index
 			else
 			{
 				int idx = GetIndexToRemove(mappings, sel, forward);
-				if (idx > -1)
+				if (idx > -1 && idx < mappings.Count())
 				{
 					var mapping = (IMoRuleMapping) mappings[idx];
 					index = idx - 1;

Src/LexText/Morphology/RuleFormulaControl.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2015 SIL International
+// Copyright (c) 2015 SIL International
 // This software is licensed under the LGPL, version 2.1 or later
 // (http://www.gnu.org/licenses/lgpl-2.1.html)
 
@@ -569,6 +569,12 @@ private void m_insertionControl_Insert(object sender, InsertEventArgs e)
 			var redo = string.Format(MEStrings.ksRuleRedoInsert, option);
 
 			SelectionHelper sel = SelectionHelper.Create(m_view);
+			if (sel == null)
+			{
+				// The selection can become invalid because of an undo (see LT-20588).
+				m_insertionControl.UpdateOptionsDisplay();
+				return;
+			}
 			int cellId = -1;
 			int cellIndex = -1;
 			switch (option.Type)

Src/LexText/ParserCore/HCLoader.cs

@@ -236,9 +236,13 @@ private void LoadLanguage()
 						if (regRule.StrucDescOS.Count > 0 || regRule.RightHandSidesOS.Any(rhs => rhs.StrucChangeOS.Count > 0))
 						{
 							RewriteRule hcRegRule = LoadRewriteRule(regRule);
-							m_morphophonemic.PhonologicalRules.Add(hcRegRule);
+							if (hcRegRule == null)
+								continue;
+							// Choose which stratum the phonological rules apply on.
 							if (!m_notOnClitics)
 								m_clitic.PhonologicalRules.Add(hcRegRule);
+							else
+								m_morphophonemic.PhonologicalRules.Add(hcRegRule);
 							m_language.PhonologicalRules.Add(hcRegRule);
 						}
 						break;
@@ -248,9 +252,12 @@ private void LoadLanguage()
 						if (metaRule.LeftSwitchIndex != -1 && metaRule.RightSwitchIndex != -1)
 						{
 							MetathesisRule hcMetaRule = LoadMetathesisRule(metaRule);
-							m_morphophonemic.PhonologicalRules.Add(hcMetaRule);
+
+							// Choose which stratum the phonological rules apply on.
 							if (!m_notOnClitics)
 								m_clitic.PhonologicalRules.Add(hcMetaRule);
+							else
+								m_morphophonemic.PhonologicalRules.Add(hcMetaRule);
 							m_language.PhonologicalRules.Add(hcMetaRule);
 						}
 						break;
@@ -1698,6 +1705,11 @@ private RewriteRule LoadRewriteRule(IPhRegularRule prule)
 			}
 			hcPrule.Properties[HCParser.PRuleID] = prule.Hvo;
 
+			if (hcPrule.Lhs.Children.Count > 1)
+			{
+				m_logger.InvalidRewriteRule(prule, ParserCoreStrings.ksMaxElementsInRule);
+				return null;
+			}
 			foreach (IPhSegRuleRHS rhs in prule.RightHandSidesOS)
 			{
 				var psubrule = new RewriteSubrule();
@@ -1748,6 +1760,12 @@ private RewriteRule LoadRewriteRule(IPhRegularRule prule)
 					psubrule.RightEnvironment = rightPattern;
 				}
 
+				if (psubrule.Rhs.Children.Count > 1)
+				{
+					m_logger.InvalidRewriteRule(prule, ParserCoreStrings.ksMaxElementsInRule);
+					return null;
+				}
+
 				hcPrule.Subrules.Add(psubrule);
 			}
 

Src/LexText/ParserCore/HCParser.cs

@@ -640,6 +640,14 @@ public void InvalidReduplicationForm(IMoForm form, string reason, IMoMorphSynAna
 				m_xmlWriter.WriteElementString("Reason", reason);
 				m_xmlWriter.WriteEndElement();
 			}
+			public void InvalidRewriteRule(IPhRegularRule rule, string reason)
+			{
+				m_xmlWriter.WriteStartElement("LoadError");
+				m_xmlWriter.WriteAttributeString("type", "invalid-rewrite-rule");
+				m_xmlWriter.WriteElementString("Rule", rule.Name.BestAnalysisVernacularAlternative.Text);
+				m_xmlWriter.WriteElementString("Reason", reason);
+				m_xmlWriter.WriteEndElement();
+			}
 		}
 	}
 }

Src/LexText/ParserCore/IHCLoadErrorLogger.cs

@@ -1,4 +1,4 @@
-using SIL.LCModel;
+using SIL.LCModel;
 
 namespace SIL.FieldWorks.WordWorks.Parser
 {
@@ -10,5 +10,6 @@ public interface IHCLoadErrorLogger
 		void DuplicateGrapheme(IPhPhoneme phoneme);
 		void InvalidEnvironment(IMoForm form, IPhEnvironment env, string reason, IMoMorphSynAnalysis msa);
 		void InvalidReduplicationForm(IMoForm form, string reason, IMoMorphSynAnalysis msa);
+		void InvalidRewriteRule(IPhRegularRule prule, string reason);
 	}
 }

Src/LexText/ParserCore/ParserCoreStrings.resx

@@ -189,4 +189,7 @@
   <data name="ksTestX" xml:space="preserve">
     <value>Tested {0}</value>
   </data>
+  <data name="ksMaxElementsInRule" xml:space="preserve">
+    <value>A rule can't have more than one element in its left-hand side or its right-hand side.</value>
+  </data>
 </root>

Src/LexText/ParserCore/ParserCoreTests/HCLoaderTests.cs

@@ -41,7 +41,8 @@ private enum LoadErrorType
 			InvalidPhoneme,
 			DuplicateGrapheme,
 			InvalidEnvironment,
-			InvalidRedupForm
+			InvalidRedupForm,
+			InvalidRewriteRule
 		}
 
 		private class TestHCLoadErrorLogger : IHCLoadErrorLogger
@@ -82,6 +83,11 @@ public void InvalidReduplicationForm(IMoForm form, string reason, IMoMorphSynAna
 			{
 				m_loadErrors.Add(Tuple.Create(LoadErrorType.InvalidRedupForm, (ICmObject) msa));
 			}
+
+			public void InvalidRewriteRule(IPhRegularRule rule, string reason)
+			{
+				m_loadErrors.Add(Tuple.Create(LoadErrorType.InvalidRedupForm, (ICmObject) rule));
+			}
 		}
 
 		private readonly List<Tuple<LoadErrorType, ICmObject>> m_loadErrors = new List<Tuple<LoadErrorType, ICmObject>>();
@@ -986,9 +992,6 @@ public void PhonologicalRule()
 			Cache.LanguageProject.PhonologicalDataOA.PhonRulesOS.Add(prule);
 			prule.Name.SetAnalysisDefaultWritingSystem("prule");
 			prule.Direction = 2;
-			IPhSimpleContextSeg segCtxt = Cache.ServiceLocator.GetInstance<IPhSimpleContextSegFactory>().Create();
-			prule.StrucDescOS.Add(segCtxt);
-			segCtxt.FeatureStructureRA = GetPhoneme("a");
 			IPhSimpleContextNC ncCtxt = Cache.ServiceLocator.GetInstance<IPhSimpleContextNCFactory>().Create();
 			prule.StrucDescOS.Add(ncCtxt);
 			ncCtxt.FeatureStructureRA = m_vowel;
@@ -1019,7 +1022,7 @@ public void PhonologicalRule()
 
 			Assert.That(hcPrule.Direction, Is.EqualTo(Machine.DataStructures.Direction.LeftToRight));
 			Assert.That(hcPrule.ApplicationMode, Is.EqualTo(RewriteApplicationMode.Simultaneous));
-			Assert.That(hcPrule.Lhs.ToString(), Is.EqualTo(m_lang.Strata[0].CharacterDefinitionTable["a"].FeatureStruct + VowelFS));
+			Assert.That(hcPrule.Lhs.ToString(), Is.EqualTo(VowelFS));
 
 			Assert.That(hcPrule.Subrules.Count, Is.EqualTo(1));
 			RewriteSubrule subrule = hcPrule.Subrules[0];

Src/MasterVersionInfo.txt

@@ -1,4 +1,4 @@
 FWMAJOR=9
 FWMINOR=2
-FWREVISION=3
+FWREVISION=4
 FWBETAVERSION=Alpha

Src/Transforms/Presentation/FormatCommon.xsl

@@ -118,6 +118,15 @@
 										</span>
 									</li>
 								</xsl:when>
+								<xsl:when test="@type = 'invalid-rewrite-rule'">
+									<li>
+										<xsl:text>The rewrite rule "</xsl:text>
+										<xsl:value-of select="Rule" />
+										<xsl:text>" is invalid. Reason: </xsl:text>
+										<xsl:value-of select="Reason" />
+										<xsl:text> </xsl:text>
+									</li>
+								</xsl:when>
 								<xsl:otherwise>
 									<!-- Do not expect any others to happen, but just in case, we show them in all their HC glory -->
 									<li><xsl:value-of select="."/></li>

Src/xWorks/CssGenerator.cs

@@ -1262,12 +1262,12 @@ internal static List<StyleDeclaration> GenerateCssStyleFromLcmStyleSheet(string
 					string customBullet = exportStyleInfo.BulletInfo.m_bulletCustom;
 					declaration.Add(new Property("content") { Term = new PrimitiveTerm(UnitType.String, customBullet) });
 				}
-				else if (BulletSymbolsCollection.ContainsKey(exportStyleInfo.NumberScheme.ToString()))
+				else if (BulletSymbolsCollection.ContainsKey(numScheme))
 				{
 					string selectedBullet = BulletSymbolsCollection[numScheme];
 					declaration.Add(new Property("content") { Term = new PrimitiveTerm(UnitType.String, selectedBullet) });
 				}
-				else if (NumberingStylesCollection.ContainsKey(exportStyleInfo.NumberScheme.ToString()))
+				else if (NumberingStylesCollection.ContainsKey(numScheme))
 				{
 					if (node != null)
 					{