wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-11-24 15:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a new parsing pipeline for processing ref tokens.

Browse source 
* Added a tokens/x-mediawiki/post-expansion sub-pipeline that
  is used to process ref-content.  This same pipeline type
  could also be used to post-process tokenized content from
  other extensions.
* Cleaned up transform handler ranks a bit.
* Fixed paragraph-handler to accept initial state and also
  fixed it to do a complete reset on encountering EOFTk.
  Cite ref-content handling uses the sub-pipeline while
  passing the inBlockToken flag to prevent top-level p-wrapping
  of ref-content.
* Fixes references output on en:Barack Obama and introduces
  lists in individual ref items.
* No change in parser tests -- how do we add tests for testing
  extensions like cite/ref?

Change-Id: I928a3a0f5f989ec28bbe73383794fe6f32599fd1
This commit is contained in:
Subramanya Sastry 2012-11-29 14:09:06 -06:00
parent d257cee069
commit 1de2752f0d
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
js/lib/ext.Cite.js
View file

@ -40,9 +40,8 @@ Cite.prototype.reset = function ( token ) {
// Cite should be the first thing to run in pahse 3 so the <ref>-</ref>
// content tokens are pulled out of the token stream and dont pollute
// the main token stream with any unbalanced tags/pres and the like.
Cite.prototype.rank = 2.01; // after QuoteTransformer, but before PostExpandParagraphHandler
Cite.prototype.referencesRank = 2.6; // after PostExpandParagraphHandler
//Cite.prototype.rank = 2.6;
Cite.prototype.rank = 2.01;
Cite.prototype.referencesRank = 2.6;
/**
* Handle ref section tokens collected by the TokenCollector.
@ -139,6 +138,27 @@ function genPlaceholderTokens(env, token, src) {
* @returns {Object} TokenContext
*/
Cite.prototype.onReferences = function ( token, manager ) {
function processRefTokens(ref) {
var out;
// pipeline for processing ref-content
// NOTE: This is a synchronous pipeline
var pipeline = manager.pipeFactory.getPipeline(
'tokens/x-mediawiki/post-expansion',
{ wrapTemplates: false, inBlockToken: true }
);
pipeline.addListener('chunk', function(toks) {
out = Util.stripEOFTkfromTokens(toks);
});
pipeline.addListener('end', function() {});
ref.tokens.push(new EOFTk());
pipeline.process(ref.tokens);
// SSS FIXME: Even though pipeline is a sync-pipeline,
// are we guaranteed that at this point, the 'chunk'
// handler has run?
return out;
}
if ( token.constructor === EndTagTk ) {
return { tokens: genPlaceholderTokens(this.manager.env, token, "</references>") };
}
@ -146,21 +166,15 @@ Cite.prototype.onReferences = function ( token, manager ) {
//console.warn( 'references refGroups:' + JSON.stringify( this.refGroups, null, 2 ) );
var refGroups = this.refGroups;
var arrow = '↑';
var renderLine = function( ref ) {
var out = [ new TagTk('li', [new KV('id', ref.target)] ) ];
if (ref.linkbacks.length === 1) {
out = out.concat([
new TagTk( 'a', [
new KV('href', '#' + ref.linkbacks[0])
]
),
new TagTk( 'a', [ new KV('href', '#' + ref.linkbacks[0]) ]),
arrow,
new EndTagTk( 'a' )
],
ref.tokens // The original content tokens
);
], processRefTokens(ref));
} else {
out.push( arrow );
$.each(ref.linkbacks, function(i, linkback) {
@ -177,9 +191,7 @@ Cite.prototype.onReferences = function ( token, manager ) {
//},
ref.groupIndex + '.' + i,
new EndTagTk( 'a' )
],
ref.tokens // The original content tokens
);
], processRefTokens(ref));
});
}
//console.warn( 'renderLine res: ' + JSON.stringify( out, null, 2 ));