Changeset 181
- Timestamp:
- 04/12/08 08:04:07 (9 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
packages/feaTools/trunk/Lib/feaTools/parser.py
r180 r181 488 488 counter += 1 489 489 targetText = targetText[end:] 490 writer.gsubType6(precedingContext, extractedTargets, trailingContext, replacement , ignore=ignore)490 writer.gsubType6(precedingContext, extractedTargets, trailingContext, replacement) 491 491 492 492 def _parsePosType1(writer, target, value): packages/feaTools/trunk/Lib/feaTools/test.py
r180 r181 40 40 self._instructions.append(("gsub type 4", (target, replacement))) 41 41 42 def gsubType6(self, precedingContext, target, trailingContext, replacement , ignore=False):43 self._instructions.append(("gsub type 6", (precedingContext, target, trailingContext, replacement , ignore)))42 def gsubType6(self, precedingContext, target, trailingContext, replacement): 43 self._instructions.append(("gsub type 6", (precedingContext, target, trailingContext, replacement))) 44 44 45 45 def gposType1(self, target, value): … … 439 439 result = writer.getData() 440 440 expected = [ 441 ("gsub type 6", (["f"], ["o"], [], "o.alt" , False))441 ("gsub type 6", (["f"], ["o"], [], "o.alt")) 442 442 ] 443 443 self.assertEqual(result, expected) … … 448 448 result = writer.getData() 449 449 expected = [ 450 ("gsub type 6", (["f"], ["o"], ["o"], "o.alt" , False))450 ("gsub type 6", (["f"], ["o"], ["o"], "o.alt")) 451 451 ] 452 452 self.assertEqual(result, expected) … … 457 457 result = writer.getData() 458 458 expected = [ 459 ("gsub type 6", (["f"], ["o", "o"], [], "o_o.alt" , False))459 ("gsub type 6", (["f"], ["o", "o"], [], "o_o.alt")) 460 460 ] 461 461 self.assertEqual(result, expected) … … 466 466 result = writer.getData() 467 467 expected = [ 468 ("gsub type 6", (["f"], ["o", "o"], ["b"], "o_o.alt" , False))468 ("gsub type 6", (["f"], ["o", "o"], ["b"], "o_o.alt")) 469 469 ] 470 470 self.assertEqual(result, expected) … … 476 476 #result = writer.getData() 477 477 #expected = [ 478 # ("gsub type 6", ([["f"]], [["o"]], [["o"]], "o.alt" , False))478 # ("gsub type 6", ([["f"]], [["o"]], [["o"]], "o.alt")) 479 479 # ] 480 480 #self.assertEqual(result, expected) … … 486 486 result = writer.getData() 487 487 expected = [ 488 ("gsub type 6", ([], [["foo", "bar"]], ["bar"], ["foo.alt", "bar.alt"] , False))488 ("gsub type 6", ([], [["foo", "bar"]], ["bar"], ["foo.alt", "bar.alt"])) 489 489 ] 490 490 self.assertEqual(result, expected) … … 497 497 result = writer.getData() 498 498 expected = [ 499 ("gsub type 6", (["f"], ["o"], [], None , True))499 ("gsub type 6", (["f"], ["o"], [], None)) 500 500 ] 501 501 self.assertEqual(result, expected) … … 506 506 result = writer.getData() 507 507 expected = [ 508 ("gsub type 6", (["f"], ["o"], ["o"], None , True))508 ("gsub type 6", (["f"], ["o"], ["o"], None)) 509 509 ] 510 510 self.assertEqual(result, expected) … … 515 515 result = writer.getData() 516 516 expected = [ 517 ("gsub type 6", (["f"], ["o", "o"], [], None , True))517 ("gsub type 6", (["f"], ["o", "o"], [], None)) 518 518 ] 519 519 self.assertEqual(result, expected) … … 524 524 result = writer.getData() 525 525 expected = [ 526 ("gsub type 6", (["f"], ["o", "o"], ["b"], None , True))526 ("gsub type 6", (["f"], ["o", "o"], ["b"], None)) 527 527 ] 528 528 self.assertEqual(result, expected) … … 533 533 result = writer.getData() 534 534 expected = [ 535 ("gsub type 6", ([], [["foo", "bar"]], ["bar"], None , True))535 ("gsub type 6", ([], [["foo", "bar"]], ["bar"], None)) 536 536 ] 537 537 self.assertEqual(result, expected) packages/feaTools/trunk/Lib/feaTools/writers/baseWriter.py
r180 r181 25 25 raise NotImplementedError 26 26 27 def gsubType6(self, precedingContext, target, trailingContext, replacement , ignore=False):27 def gsubType6(self, precedingContext, target, trailingContext, replacement): 28 28 raise NotImplementedError 29 29 packages/feaTools/trunk/Lib/feaTools/writers/fdkSyntaxWriter.py
r171 r181 98 98 self._instructions.append(t) 99 99 100 def gsubType6(self, precedingContext, target, trailingContext, replacement , ignore=False):100 def gsubType6(self, precedingContext, target, trailingContext, replacement): 101 101 if isinstance(precedingContext, list): 102 102 precedingContext = self._list2String(precedingContext) … … 108 108 if isinstance(replacement, list): 109 109 replacement = self._list2String(replacement) 110 if ignore: 110 # if the replacement is None, this is an "ignore" 111 if replacement is None: 111 112 if precedingContext and trailingContext: 112 113 t = "ignore sub %s %s %s;" % (precedingContext, target, trailingContext) … … 117 118 else: 118 119 t = "ignore sub %s;" % target 120 # otherwise it is a regular substitution 119 121 else: 120 122 if precedingContext and trailingContext:
