Make change requested by Andy Black

sillsdev · Jun 3, 2024 · e56040b · e56040b
1 parent 1345759
commit e56040b
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 0 deletions.
diff --git a/...xt/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/AffixAlloFeatsAdCtl.txt b/...xt/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/AffixAlloFeatsAdCtl.txt
@@ -24,6 +24,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -37,6 +38,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/CliticAdCtl.txt b/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/CliticAdCtl.txt
@@ -47,6 +47,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -60,6 +61,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/...re/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/IrregularlyInflectedFormsAdCtl.txt b/...re/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/IrregularlyInflectedFormsAdCtl.txt
@@ -24,6 +24,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -37,6 +38,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/LatinAdCtl.txt b/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/LatinAdCtl.txt
@@ -24,6 +24,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -37,6 +38,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/Orizabaadctl.txt b/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/Orizabaadctl.txt
@@ -55,6 +55,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -68,6 +69,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/...exText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/QuechuaMYLadctl.txt b/...exText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/QuechuaMYLadctl.txt
@@ -81,6 +81,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -94,6 +95,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/...LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/StemName3adctl.txt b/...LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/StemName3adctl.txt
@@ -28,6 +28,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -41,6 +42,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/...Text/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/StemNameTestAdCtl.txt b/...Text/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/StemNameTestAdCtl.txt
@@ -48,6 +48,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -61,6 +62,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/TestAdCtl.txt b/Src/LexText/ParserCore/ParserCoreTests/M3ToXAmpleTransformerTestsDataFiles/TestAdCtl.txt
@@ -51,6 +51,7 @@
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -64,6 +65,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin < current orderclassmin)
 	AND (left orderclassmax < current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))

diff --git a/Src/Transforms/Application/FxtM3ParserToXAmpleADCtl.xsl b/Src/Transforms/Application/FxtM3ParserToXAmpleADCtl.xsl
@@ -397,6 +397,7 @@ User tests
 	(    (left orderclassmin &lt; current orderclassmin)
 	AND (left orderclassmax &lt; current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 	OR ((current orderclass = -1) AND (left orderclass = 0))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
@@ -410,6 +411,7 @@ OR ((left orderclass = -1) AND (current orderclass ~= -32000)) | allow derivatio
 	(    (left orderclassmin &lt; current orderclassmin)
 	AND (left orderclassmax &lt; current orderclassmax) )
 	OR (current orderclass = 0)
+	OR (left orderclass = 0)
 	OR ((current orderclass = -1) AND (left orderclass = -1))
 OR ((current orderclass = -32000) AND (left orderclass = -32000))
 OR ((current orderclassmin = -31999) AND (current orderclassmax = -1))