Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions packages/markdown-common/lib/tocommonmarkrules.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,23 @@ const listItemCloseRule = {
close: true,
};

const romanListOpenRule = {
tag: `${CommonMarkModel.NAMESPACE}.List`,
leaf: false,
open: true,
close: false,
enter: (node,token,callback) => {
node.type = 'roman';
node.tight = 'true'; // XXX Default but can be overridden when closing the list tag
},
};
const romanListCloseRule = {
tag: `${CommonMarkModel.NAMESPACE}.List`,
leaf: false,
open: false,
close: true,
};

const tableOpenRule = {
tag: `${CommonMarkModel.NAMESPACE}.Table`,
leaf: false,
Expand Down Expand Up @@ -361,6 +378,9 @@ rules.blocks.bullet_list_open = bulletListOpenRule;
rules.blocks.bullet_list_close = bulletListCloseRule;
rules.blocks.ordered_list_open = orderedListOpenRule;
rules.blocks.ordered_list_close = orderedListCloseRule;
rules.blocks.roman_list_open = romanListOpenRule;
rules.blocks.roman_list_close = romanListCloseRule;
rules.blocks.roma_list = romanListOpenRule;
rules.blocks.list_item_open = listItemOpenRule;
rules.blocks.list_item_close = listItemCloseRule;
rules.blocks.table_open = tableOpenRule;
Expand Down
2 changes: 2 additions & 0 deletions packages/markdown-html/src/ToHtmlStringVisitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ class ToHtmlStringVisitor {
const { delimiter, start, tight} = thing;
if(thing.type === 'ordered') {
parameters.result += `<ol delimiter=${delimiter} start=${start} tight=${tight}>`;
}else if(this.type === 'roman'){
parameters.result += `<ol type="i" delimiter=${delimiter} start=${start} tight=${tight}>`;
}
else {
parameters.result += `<ul tight=${tight}>`;
Expand Down
2 changes: 2 additions & 0 deletions packages/markdown-it-template/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ function template_plugin(md) {
md.renderer.rules['block_ulist_close'] = template_block_render('ulist');
md.renderer.rules['block_olist_open'] = template_block_render('olist');
md.renderer.rules['block_olist_close'] = template_block_render('olist');
md.renderer.rules['block_rlist_open'] = template_block_render('rlist');
md.renderer.rules['block_rlist_close'] = template_block_render('rlist');
}

module.exports = template_plugin;
2 changes: 1 addition & 1 deletion packages/markdown-it-template/lib/names.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{ "blocks": [ "clause", "ulist", "olist" ],
{ "blocks": [ "clause", "ulist", "olist","rlist" ],
"inlines": [ "if", "optional", "with", "join" ] }
22 changes: 22 additions & 0 deletions packages/markdown-template/lib/templaterules.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,26 @@ var olistCloseRule = {
open: false,
close: true
};

var rlistOpenRule = {
tag: "".concat(TemplateMarkModel.NAMESPACE, ".ListBlockDefinition"),
leaf: false,
open: true,
close: false,
enter: (node, token, callback) => {
node.name = getAttr(token.attrs, 'name', null);
node.type = 'roman';
node.tight = 'true';
node.start = 'i';
node.delimiter = 'period';
}
};
var rlistCloseRule = {
tag: "".concat(TemplateMarkModel.NAMESPACE, ".ListBlockDefinition"),
leaf: false,
open: false,
close: true
};
var rules = {
inlines: {},
blocks: {}
Expand All @@ -276,4 +296,6 @@ rules.blocks.block_ulist_open = ulistOpenRule;
rules.blocks.block_ulist_close = ulistCloseRule;
rules.blocks.block_olist_open = olistOpenRule;
rules.blocks.block_olist_close = olistCloseRule;
rules.blocks.block_rlist_open = rlistOpenRule;
rules.blocks.block_rlist_close = rlistCloseRule;
module.exports = rules;
9 changes: 8 additions & 1 deletion packages/markdown-template/src/fromtemplatemarkrules.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,14 @@ rules.JoinDefinition = (visitor,thing,children,parameters,resultString,resultSeq
};
// Container blocks
rules.ListBlockDefinition = (visitor,thing,children,parameters,resultString,resultSeq) => {
const listKind = thing.type === 'bullet' ? 'ulist' : 'olist';
let listKind;
if(this.type === 'bullete'){
listKind = 'ulist';
}else if(this.type === 'roman'){
listKind = 'rlist';
}else{
listKind = 'olist';
}
const prefix = CommonMarkUtils.mkPrefix(parameters,1);
const next1 = prefix;
const next2 = `{{#${listKind} ${thing.name}}}\n`;
Expand Down