merge
authorralf@brainbot.com
Tue Nov 18 15:11:49 2008 +0100 (6 weeks ago)
changeset 1806d3b7f3d97541
parent 18044940350bc196
parent 1805389e659cefae
child 1808285601af4512
merge
       1 --- a/mwlib/mwscan.py	Tue Nov 18 14:52:06 2008 +0100
       2 +++ b/mwlib/mwscan.py	Tue Nov 18 15:11:49 2008 +0100
       3 @@ -251,7 +251,7 @@
       4                                  break
       5                          res.append(("TEXT", scanres.text((type, start, tlen))))                    
       6                          i+=1
       7 -                elif tt.t in ["noinclude"]:
       8 +                elif tt.t in ["font", "noinclude", 'p', 'caption']:
       9                      pass
      10                  elif tt.t=="table":
      11                      if isEndToken:
     1.1 --- a/mwlib/parser.py	Tue Nov 18 14:52:06 2008 +0100
     1.2 +++ b/mwlib/parser.py	Tue Nov 18 15:11:49 2008 +0100
     1.3 @@ -880,7 +880,6 @@
     1.4          n.append(Text("".join(txt)))
     1.5          return n
     1.6  
     1.7 -    
     1.8      parseCODETag = parsePRETag
     1.9      parseSOURCETag = parsePRETag
    1.10      def parseA7831D532A30DF0CD772BBC895944EC1Tag(self):
    1.11 @@ -888,18 +887,6 @@
    1.12          p.__class__ = Magic
    1.13          return p    
    1.14  
    1.15 -    parseRUBYTag = parseTag
    1.16 -    parseRBTag = parseTag
    1.17 -    parseRPTag = parseTag
    1.18 -    parseRTTag = parseTag
    1.19 -    parseDLTag = parseTag
    1.20 -    parseDTTag = parseTag
    1.21 -    parseDDTag = parseTag
    1.22 -    parseTBODYTag = parseTag
    1.23 -    parseCAPTIONTag = parseTag
    1.24 -    
    1.25 -    parsePTag = parseTag
    1.26 -    parseFONTTag = parseTag
    1.27      parseREFTag = parseTag
    1.28      parseREFERENCESTag = parseTag
    1.29      
    1.30 @@ -1429,7 +1416,6 @@
    1.31          else:
    1.32              return m()
    1.33  
    1.34 -        
    1.35      def parseEMTag(self):
    1.36          return self._parseStyledTag(Style("''"))
    1.37