chris/orgize
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(element): rename Headline with Title struct

Browse source
This commit is contained in:
PoiScript 2019-07-31 15:09:01 +08:00
parent e835103ac6
commit 53d8f9dc90
10 changed files with 268 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/export/html.rs
View file

@ -35,17 +35,10 @@ pub trait HtmlHandler<E: From<Error>> {
match element {
// container elements
Block(_block) => write!(w, "<div>")?,
Bold { .. } => write!(w, "<b>")?,
Document { .. } => write!(w, "<main>")?,
Bold => write!(w, "<b>")?,
Document => write!(w, "<main>")?,
DynBlock(_dyn_block) => (),
Headline(headline) => {
let level = if headline.level <= 6 {
headline.level
} else {
6
};
write!(w, "<h{0}>{1}</h{0}>", level, Escape(headline.title))?;
}
Headline => (),
List(list) => {
if list.ordered {
write!(w, "<ol>")?;
@ -53,12 +46,12 @@ pub trait HtmlHandler<E: From<Error>> {
write!(w, "<ul>")?;
}
}
Italic { .. } => write!(w, "<i>")?,
ListItem { .. } => write!(w, "<li>")?,
Paragraph { .. } => write!(w, "<p>")?,
Section { .. } => write!(w, "<section>")?,
Strike { .. } => write!(w, "<s>")?,
Underline { .. } => write!(w, "<u>")?,
Italic => write!(w, "<i>")?,
ListItem(_) => write!(w, "<li>")?,
Paragraph => write!(w, "<p>")?,
Section => write!(w, "<section>")?,
Strike => write!(w, "<s>")?,
Underline => write!(w, "<u>")?,
// non-container elements
BabelCall(_babel_call) => (),
InlineSrc(inline_src) => write!(w, "<code>{}</code>", Escape(inline_src.body))?,
@ -91,6 +84,7 @@ pub trait HtmlHandler<E: From<Error>> {
Drawer(_drawer) => (),
Rule => write!(w, "<hr>")?,
Cookie(_cookie) => (),
Title(title) => write!(w, "<h{}>", if title.level <= 6 { title.level } else { 6 })?,
}
Ok(())
@ -101,10 +95,10 @@ pub trait HtmlHandler<E: From<Error>> {
match element {
// container elements
Block(_block) => write!(w, "</div>")?,
Bold { .. } => write!(w, "</b>")?,
Document { .. } => write!(w, "</main>")?,
Bold => write!(w, "</b>")?,
Document => write!(w, "</main>")?,
DynBlock(_dyn_block) => (),
Headline(_headline) => (),
Headline => (),
List(list) => {
if list.ordered {
write!(w, "</ol>")?;
@ -112,14 +106,15 @@ pub trait HtmlHandler<E: From<Error>> {
write!(w, "</ul>")?;
}
}
Italic { .. } => write!(w, "</i>")?,
ListItem { .. } => write!(w, "</li>")?,
Paragraph { .. } => write!(w, "</p>")?,
Section { .. } => write!(w, "</section>")?,
Strike { .. } => write!(w, "</s>")?,
Underline { .. } => write!(w, "</u>")?,
Italic => write!(w, "</i>")?,
ListItem(_) => write!(w, "</li>")?,
Paragraph => write!(w, "</p>")?,
Section => write!(w, "</section>")?,
Strike => write!(w, "</s>")?,
Underline => write!(w, "</u>")?,
Title(title) => write!(w, "</h{}>", if title.level <= 6 { title.level } else { 6 })?,
// non-container elements
_ => (),
_ => debug_assert!(!element.is_container()),
}
Ok(())