feat(parser): improve list parsing

This commit is contained in:
PoiScript 2019-05-17 21:27:01 +08:00
parent ecf0d7e67d
commit c4041aefb6
6 changed files with 208 additions and 210 deletions

View file

@ -106,14 +106,14 @@ pub trait HtmlHandler<W: Write, E: From<Error>> {
fn dyn_block_end(&mut self, w: &mut W) -> Result<(), E> {
Ok(())
}
fn list_beg(&mut self, w: &mut W, ordered: bool) -> Result<(), E> {
fn list_beg(&mut self, w: &mut W, _indent: usize, ordered: bool) -> Result<(), E> {
if ordered {
Ok(write!(w, "<ol>")?)
} else {
Ok(write!(w, "<ul>")?)
}
}
fn list_end(&mut self, w: &mut W, ordered: bool) -> Result<(), E> {
fn list_end(&mut self, w: &mut W, _indent: usize, ordered: bool) -> Result<(), E> {
if ordered {
Ok(write!(w, "</ol>")?)
} else {

View file

@ -25,8 +25,8 @@ macro_rules! handle_event {
VerseBlock { cont, args } => $handler.verse_block($writer, cont, args)?,
DynBlockBeg { name, args } => $handler.dyn_block_beg($writer, name, args)?,
DynBlockEnd => $handler.dyn_block_end($writer)?,
ListBeg { ordered } => $handler.list_beg($writer, ordered)?,
ListEnd { ordered } => $handler.list_end($writer, ordered)?,
ListBeg { indent, ordered } => $handler.list_beg($writer, indent, ordered)?,
ListEnd { indent, ordered } => $handler.list_end($writer, indent, ordered)?,
ListItemBeg { bullet } => $handler.list_beg_item($writer, bullet)?,
ListItemEnd => $handler.list_end_item($writer)?,
Call { value } => $handler.call($writer, value)?,