Merge branch 'bugfix-10878' into release-6.0.2

runrevmark · runrevmark · commit ef7d2499c6ba · 2013-05-20T15:11:07.000+01:00
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -1085,7 +1085,9 @@ void MCParagraph::draw(MCDC *dc, int2 x, int2 y, uint2 fixeda,
 
 				// MW-2012-02-10: [[ FixedTable ]] If we have reached the final tab in fixed
 				//   table mode, we are done.
-				if (ct == nt - 2 && t[nt - 2] == t[nt - 1])
+				// MW-2013-05-20: [[ Bug 10878 ]] Tweaked conditions to work for min two tabStops
+				//   rather than 3.
+				if (ct >= nt - 2 && t[nt - 2] == t[nt - 1])
 					break;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,9 @@ void MCParagraph::draw(MCDC *dc, int2 x, int2 y, uint2 fixeda,`
`1085`	`1085`
`1086`	`1086`	`// MW-2012-02-10: [[ FixedTable ]] If we have reached the final tab in fixed`
`1087`	`1087`	`// table mode, we are done.`
`1088`		`- if (ct == nt - 2 && t[nt - 2] == t[nt - 1])`
	`1088`	`+ // MW-2013-05-20: [[ Bug 10878 ]] Tweaked conditions to work for min two tabStops`
	`1089`	`+ // rather than 3.`
	`1090`	`+ if (ct >= nt - 2 && t[nt - 2] == t[nt - 1])`
`1089`	`1091`	`break;`
`1090`	`1092`	`}`
`1091`	`1093`	`}`