clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-04-30 22:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extend the HTML rendering mechanism to support attributes specified as macro invocations

Browse Source
This commit is contained in:
Jeremy Ruston
2013-06-18 15:37:19 +01:00
parent 18f8b7266e
commit 12b471b8fb
7 changed files with 87 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/modules/parsers/wikiparser/rules/html.js
View File

@@ -190,13 +190,13 @@ exports.parseMacroParameter = function(source,pos) {
};
/*
Look for a macro invocation. Returns null if not found, or {type: "macro-invocation", name:, parameters:, start:, end:}
Look for a macro invocation. Returns null if not found, or {type: "macrocall", name:, parameters:, start:, end:}
*/
exports.parseMacroInvocation = function(source,pos) {
var node = {
type: "macro-invocation",
type: "macrocall",
start: pos,
parameters: []
params: []
}
// Define our regexps
var reMacroName = /([^\s>"'=]+)/g;
@@ -218,7 +218,7 @@ exports.parseMacroInvocation = function(source,pos) {
// Process parameters
var parameter = this.parseMacroParameter(source,pos);
while(parameter) {
node.parameters.push(parameter);
node.params.push(parameter);
pos = parameter.end;
// Get the next parameter
parameter = this.parseMacroParameter(source,pos);