Unrelated fixes/cleanup addressing recent git-review comments.

* Replaced empty (mw:Placeholder) span tags with meta-tag.
* Minor code refactoring in DSR computation.
* Removed hardcoding of "mwt" prefix for object ids.
* Added rt-info for html tags that are not lower-case in the
  source wikitext.
  - Additional 2 wt2wt tests green.

Change-Id: I9bb6a075bc60b6d78186d23000128eef6a04c787
This commit is contained in:
Subramanya Sastry 2012-11-20 19:42:30 -06:00
parent 7069ef41c4
commit 3eff5dfc13

View file

@ -75,12 +75,12 @@ Cite.prototype.handleRef = function ( tokens ) {
//bits.push(Util.formatNum( ref.groupIndex + 1 )); //bits.push(Util.formatNum( ref.groupIndex + 1 ));
bits.push(ref.groupIndex + 1); bits.push(ref.groupIndex + 1);
var refId = "#mwt" + this.manager.env.generateUID(), var about = "#" + this.manager.env.newObjectId(),
text = this.manager.env.text, text = this.manager.env.text,
span = new TagTk('span', [ span = new TagTk('span', [
new KV('id', linkback), new KV('id', linkback),
new KV('class', 'reference'), new KV('class', 'reference'),
new KV('about', refId), new KV('about', about),
new KV('typeof', 'mw:Object/Ext/Cite') new KV('typeof', 'mw:Object/Ext/Cite')
]); ]);
@ -108,7 +108,7 @@ Cite.prototype.handleRef = function ( tokens ) {
new EndTagTk( 'span' ), new EndTagTk( 'span' ),
new SelfclosingTagTk( 'meta', [ new SelfclosingTagTk( 'meta', [
new KV( 'typeof', 'mw:Object/Ext/Cite/End' ), new KV( 'typeof', 'mw:Object/Ext/Cite/End' ),
new KV( 'about', refId) new KV( 'about', about)
], { tsr: endTsr } ) ], { tsr: endTsr } )
]; ];
//console.warn( 'ref res: ' + JSON.stringify( res, null, 2 ) ); //console.warn( 'ref res: ' + JSON.stringify( res, null, 2 ) );
@ -126,8 +126,7 @@ function genPlaceholderTokens(env, token, src) {
} }
return [ return [
new TagTk('span', [ new KV( 'typeof', 'mw:Placeholder' ) ], dataAttribs), new SelfclosingTagTk('meta', [ new KV( 'typeof', 'mw:Placeholder' ) ], dataAttribs)
new EndTagTk('span')
]; ];
} }