feat(export): update html render
This commit is contained in:
PoiScript
parent
33f78ee207
commit
0a876e2f2b
10 changed files with 213 additions and 358 deletions
|
|
@ -1,15 +1,13 @@
|
|||
#![allow(unused_variables)]
|
||||
#![allow(unused_mut)]
|
||||
|
||||
use crate::{elements::*, headline::Headline, objects::*, Event, Parser};
|
||||
use crate::elements::*;
|
||||
use crate::iter::Container;
|
||||
use jetscii::bytes;
|
||||
use std::{
|
||||
convert::From,
|
||||
io::{Error, Write},
|
||||
marker::PhantomData,
|
||||
};
|
||||
use std::io::{Error, Write};
|
||||
|
||||
pub trait HtmlHandler<W: Write, E: From<Error>> {
|
||||
fn escape(&mut self, w: &mut W, text: &str) -> Result<(), E> {
|
||||
pub trait HtmlHandler<E: From<Error>> {
|
||||
fn escape<W: Write>(&mut self, mut w: W, text: &str) -> Result<(), E> {
|
||||
let mut pos = 0;
|
||||
let bytes = text.as_bytes();
|
||||
while let Some(off) = bytes!(b'<', b'>', b'&', b'\'', b'"').find(&bytes[pos..]) {
|
||||
|
|
@ -29,261 +27,138 @@ pub trait HtmlHandler<W: Write, E: From<Error>> {
|
|||
|
||||
Ok(w.write_all(&bytes[pos..])?)
|
||||
}
|
||||
fn event(&mut self, w: &mut W, event: Event) -> Result<(), E> {
|
||||
handle_event!(event, self, w);
|
||||
Ok(())
|
||||
}
|
||||
fn headline_beg(&mut self, w: &mut W, hdl: Headline) -> Result<(), E> {
|
||||
let level = if hdl.level <= 6 { hdl.level } else { 6 };
|
||||
write!(w, "<h{}>", level)?;
|
||||
self.text(w, hdl.title)?;
|
||||
write!(w, "</h{}>", level)?;
|
||||
Ok(())
|
||||
}
|
||||
fn headline_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn section_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<section>")?)
|
||||
}
|
||||
fn section_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</section>")?)
|
||||
}
|
||||
fn drawer_beg(&mut self, w: &mut W, name: &str) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn drawer_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn paragraph_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<p>")?)
|
||||
}
|
||||
fn paragraph_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</p>")?)
|
||||
}
|
||||
fn ctr_block_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, r#"<div style="text-align: center">"#)?)
|
||||
}
|
||||
fn ctr_block_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</div>")?)
|
||||
}
|
||||
fn qte_block_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<blockquote>")?)
|
||||
}
|
||||
fn qte_block_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</blockquote>")?)
|
||||
}
|
||||
fn spl_block_beg(&mut self, w: &mut W, name: &str, args: Option<&str>) -> Result<(), E> {
|
||||
Ok(write!(w, "<div>")?)
|
||||
}
|
||||
fn spl_block_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</div>")?)
|
||||
}
|
||||
fn comment_block(&mut self, w: &mut W, cont: &str, args: Option<&str>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn example_block(&mut self, w: &mut W, cont: &str, args: Option<&str>) -> Result<(), E> {
|
||||
write!(w, "<pre><code>")?;
|
||||
self.escape(w, cont)?;
|
||||
write!(w, "</pre></code>")?;
|
||||
Ok(())
|
||||
}
|
||||
fn export_block(&mut self, w: &mut W, cont: &str, args: Option<&str>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn src_block(&mut self, w: &mut W, cont: &str, args: Option<&str>) -> Result<(), E> {
|
||||
write!(w, "<pre><code>")?;
|
||||
self.escape(w, cont)?;
|
||||
write!(w, "</pre></code>")?;
|
||||
Ok(())
|
||||
}
|
||||
fn verse_block(&mut self, w: &mut W, cont: &str, args: Option<&str>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn dyn_block_beg(&mut self, w: &mut W, name: &str, args: Option<&str>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn dyn_block_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
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, _indent: usize, ordered: bool) -> Result<(), E> {
|
||||
if ordered {
|
||||
Ok(write!(w, "</ol>")?)
|
||||
} else {
|
||||
Ok(write!(w, "</ul>")?)
|
||||
}
|
||||
}
|
||||
fn list_beg_item(&mut self, w: &mut W, bullet: &str) -> Result<(), E> {
|
||||
Ok(write!(w, "<li>")?)
|
||||
}
|
||||
fn list_end_item(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</li>")?)
|
||||
}
|
||||
fn call(&mut self, w: &mut W, value: &str) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn clock(&mut self, w: &mut W, clock: Clock<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn comment(&mut self, w: &mut W, cont: &str) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn fixed_width(&mut self, w: &mut W, cont: &str) -> Result<(), E> {
|
||||
for line in cont.lines() {
|
||||
// remove leading colon
|
||||
write!(w, "<pre>")?;
|
||||
self.escape(w, &line[1..])?;
|
||||
write!(w, "</pre>")?;
|
||||
fn start<W: Write>(&mut self, mut w: W, container: Container) -> Result<(), E> {
|
||||
match container {
|
||||
Container::Block(block) => write!(w, "<div>")?,
|
||||
Container::Bold => write!(w, "<b>")?,
|
||||
Container::Document => write!(w, "<main>")?,
|
||||
Container::DynBlock(_) => (),
|
||||
Container::Headline(hdl) => {
|
||||
let level = if hdl.level <= 6 { hdl.level } else { 6 };
|
||||
write!(&mut w, "<h{}>", level)?;
|
||||
self.text(&mut w, hdl.title)?;
|
||||
write!(&mut w, "</h{}>", level)?;
|
||||
}
|
||||
Container::Italic => write!(w, "<i>")?,
|
||||
Container::List(list) => {
|
||||
if list.ordered {
|
||||
write!(w, "<ol>")?;
|
||||
} else {
|
||||
write!(w, "<ul>")?;
|
||||
}
|
||||
}
|
||||
Container::ListItem(_) => write!(w, "<li>")?,
|
||||
Container::Paragraph => write!(w, "<p>")?,
|
||||
Container::Section => write!(w, "<section>")?,
|
||||
Container::Strike => write!(w, "<s>")?,
|
||||
Container::Underline => write!(w, "<u>")?,
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
fn table_start(&mut self, w: &mut W) -> Result<(), E> {
|
||||
fn end<W: Write>(&mut self, mut w: W, container: Container) -> Result<(), E> {
|
||||
match container {
|
||||
Container::Block(block) => write!(w, "</div>")?,
|
||||
Container::Bold => write!(w, "</b>")?,
|
||||
Container::Document => write!(w, "</main>")?,
|
||||
Container::DynBlock(_) => (),
|
||||
Container::Headline(_) => (),
|
||||
Container::Italic => write!(w, "</i>")?,
|
||||
Container::List(list) => {
|
||||
if list.ordered {
|
||||
write!(w, "</ol>")?;
|
||||
} else {
|
||||
write!(w, "</ul>")?;
|
||||
}
|
||||
}
|
||||
Container::ListItem(_) => write!(w, "</li>")?,
|
||||
Container::Paragraph => write!(w, "</p>")?,
|
||||
Container::Section => write!(w, "</section>")?,
|
||||
Container::Strike => write!(w, "</s>")?,
|
||||
Container::Underline => write!(w, "</u>")?,
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
fn table_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
fn keyword<W: Write>(&mut self, mut w: W, keyword: &Keyword<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn table_cell(&mut self, w: &mut W) -> Result<(), E> {
|
||||
fn drawer<W: Write>(&mut self, mut w: W, drawer: &Drawer<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn latex_env(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn fn_def(&mut self, w: &mut W, label: &str, cont: &str) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn keyword(&mut self, w: &mut W, keyword: Keyword<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn rule(&mut self, w: &mut W) -> Result<(), E> {
|
||||
fn rule<W: Write>(&mut self, mut w: W) -> Result<(), E> {
|
||||
Ok(write!(w, "<hr>")?)
|
||||
}
|
||||
fn cookie(&mut self, w: &mut W, cookie: Cookie) -> Result<(), E> {
|
||||
fn cookie<W: Write>(&mut self, mut w: W, cookie: &Cookie) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn fn_ref(&mut self, w: &mut W, fn_ref: FnRef<'_>) -> Result<(), E> {
|
||||
fn fn_ref<W: Write>(&mut self, mut w: W, fn_ref: &FnRef<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn inline_call(&mut self, w: &mut W, call: InlineCall<'_>) -> Result<(), E> {
|
||||
fn babel_call<W: Write>(&mut self, mut w: W, call: &BabelCall<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn inline_src(&mut self, w: &mut W, src: InlineSrc<'_>) -> Result<(), E> {
|
||||
write!(w, "<code>")?;
|
||||
self.text(w, src.body)?;
|
||||
write!(w, "</code>")?;
|
||||
fn inline_call<W: Write>(&mut self, mut w: W, call: &InlineCall<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn link(&mut self, w: &mut W, link: Link<'_>) -> Result<(), E> {
|
||||
write!(w, r#"<a href=""#)?;
|
||||
self.text(w, link.path)?;
|
||||
write!(w, r#"">"#)?;
|
||||
self.text(w, link.desc.unwrap_or(link.path))?;
|
||||
write!(w, "</a>")?;
|
||||
fn inline_src<W: Write>(&mut self, mut w: W, src: &InlineSrc<'_>) -> Result<(), E> {
|
||||
write!(&mut w, "<code>")?;
|
||||
self.text(&mut w, src.body)?;
|
||||
write!(&mut w, "</code>")?;
|
||||
Ok(())
|
||||
}
|
||||
fn macros(&mut self, w: &mut W, macros: Macros<'_>) -> Result<(), E> {
|
||||
fn link<W: Write>(&mut self, mut w: W, link: &Link<'_>) -> Result<(), E> {
|
||||
write!(&mut w, r#"<a href=""#)?;
|
||||
self.text(&mut w, link.path)?;
|
||||
write!(&mut w, r#"">"#)?;
|
||||
self.text(&mut w, link.desc.unwrap_or(link.path))?;
|
||||
write!(&mut w, "</a>")?;
|
||||
Ok(())
|
||||
}
|
||||
fn radio_target(&mut self, w: &mut W, target: &str) -> Result<(), E> {
|
||||
fn macros<W: Write>(&mut self, mut w: W, macros: &Macros<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn snippet(&mut self, w: &mut W, snippet: Snippet<'_>) -> Result<(), E> {
|
||||
fn radio_target<W: Write>(&mut self, mut w: W, target: &RadioTarget<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn snippet<W: Write>(&mut self, mut w: W, snippet: &Snippet<'_>) -> Result<(), E> {
|
||||
if snippet.name.eq_ignore_ascii_case("HTML") {
|
||||
Ok(write!(w, "{}", snippet.value)?)
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
fn target(&mut self, w: &mut W, target: &str) -> Result<(), E> {
|
||||
fn target<W: Write>(&mut self, mut w: W, target: &Target<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn timestamp(&mut self, w: &mut W, timestamp: Timestamp) -> Result<(), E> {
|
||||
fn timestamp<W: Write>(&mut self, mut w: W, timestamp: &Timestamp) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn bold_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<b>")?)
|
||||
}
|
||||
fn bold_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</b>")?)
|
||||
}
|
||||
fn italic_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<i>")?)
|
||||
}
|
||||
fn italic_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</i>")?)
|
||||
}
|
||||
fn strike_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<s>")?)
|
||||
}
|
||||
fn strike_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</s>")?)
|
||||
}
|
||||
fn underline_beg(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "<u>")?)
|
||||
}
|
||||
fn underline_end(&mut self, w: &mut W) -> Result<(), E> {
|
||||
Ok(write!(w, "</u>")?)
|
||||
}
|
||||
fn verbatim(&mut self, w: &mut W, cont: &str) -> Result<(), E> {
|
||||
write!(w, "<code>")?;
|
||||
self.text(w, cont)?;
|
||||
write!(w, "</code>")?;
|
||||
fn verbatim<W: Write>(&mut self, mut w: W, cont: &str) -> Result<(), E> {
|
||||
write!(&mut w, "<code>")?;
|
||||
self.text(&mut w, cont)?;
|
||||
write!(&mut w, "</code>")?;
|
||||
Ok(())
|
||||
}
|
||||
fn code(&mut self, w: &mut W, cont: &str) -> Result<(), E> {
|
||||
write!(w, "<code>")?;
|
||||
self.text(w, cont)?;
|
||||
write!(w, "</code>")?;
|
||||
fn code<W: Write>(&mut self, mut w: W, cont: &str) -> Result<(), E> {
|
||||
write!(&mut w, "<code>")?;
|
||||
self.text(&mut w, cont)?;
|
||||
write!(&mut w, "</code>")?;
|
||||
Ok(())
|
||||
}
|
||||
fn text(&mut self, w: &mut W, cont: &str) -> Result<(), E> {
|
||||
fn text<W: Write>(&mut self, mut w: W, cont: &str) -> Result<(), E> {
|
||||
self.escape(w, cont)?;
|
||||
Ok(())
|
||||
}
|
||||
fn planning(&mut self, w: &mut W, planning: Planning) -> Result<(), E> {
|
||||
fn planning<W: Write>(&mut self, mut w: W, planning: &Planning) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn clock<W: Write>(&mut self, mut w: W, clock: &Clock<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
fn fn_def<W: Write>(&mut self, mut w: W, fn_def: &FnDef<'_>) -> Result<(), E> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub struct DefaultHtmlHandler;
|
||||
|
||||
impl<W: Write> HtmlHandler<W, Error> for DefaultHtmlHandler {}
|
||||
|
||||
pub struct HtmlRender<'a, W: Write, E: From<Error>, H: HtmlHandler<W, E>> {
|
||||
pub parser: Parser<'a>,
|
||||
pub writer: &'a mut W,
|
||||
handler: H,
|
||||
error_type: PhantomData<E>,
|
||||
}
|
||||
|
||||
impl<'a, W: Write> HtmlRender<'a, W, Error, DefaultHtmlHandler> {
|
||||
pub fn default(writer: &'a mut W, text: &'a str) -> Self {
|
||||
HtmlRender::new(DefaultHtmlHandler, writer, text)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, W: Write, E: From<Error>, H: HtmlHandler<W, E>> HtmlRender<'a, W, E, H> {
|
||||
pub fn new(handler: H, writer: &'a mut W, text: &'a str) -> Self {
|
||||
HtmlRender {
|
||||
parser: Parser::new(text),
|
||||
handler,
|
||||
writer,
|
||||
error_type: PhantomData,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn render(&mut self) -> Result<(), E> {
|
||||
for event in &mut self.parser {
|
||||
self.handler.event(self.writer, event)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
impl HtmlHandler<Error> for DefaultHtmlHandler {}
|
||||
|
|
|
|||
|
|
@ -1,71 +1,3 @@
|
|||
#[macro_use]
|
||||
macro_rules! handle_event {
|
||||
($event:expr, $handler:expr, $writer:expr) => {
|
||||
use crate::parser::Event::*;
|
||||
|
||||
match $event {
|
||||
HeadlineBeg(hdl) => $handler.headline_beg($writer, hdl)?,
|
||||
HeadlineEnd => $handler.headline_end($writer)?,
|
||||
SectionBeg => $handler.section_beg($writer)?,
|
||||
SectionEnd => $handler.section_end($writer)?,
|
||||
ParagraphBeg => $handler.paragraph_beg($writer)?,
|
||||
ParagraphEnd => $handler.paragraph_end($writer)?,
|
||||
DrawerBeg(n) => $handler.drawer_beg($writer, n)?,
|
||||
DrawerEnd => $handler.drawer_end($writer)?,
|
||||
CtrBlockBeg => $handler.ctr_block_beg($writer)?,
|
||||
CtrBlockEnd => $handler.ctr_block_end($writer)?,
|
||||
QteBlockBeg => $handler.qte_block_beg($writer)?,
|
||||
QteBlockEnd => $handler.qte_block_end($writer)?,
|
||||
SplBlockBeg { name, args } => $handler.spl_block_beg($writer, name, args)?,
|
||||
SplBlockEnd => $handler.spl_block_end($writer)?,
|
||||
CommentBlock { cont, args } => $handler.comment_block($writer, cont, args)?,
|
||||
ExampleBlock { cont, args } => $handler.example_block($writer, cont, args)?,
|
||||
ExportBlock { cont, args } => $handler.export_block($writer, cont, args)?,
|
||||
SrcBlock { cont, args } => $handler.src_block($writer, cont, args)?,
|
||||
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 { 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)?,
|
||||
Planning(p) => $handler.planning($writer, p)?,
|
||||
Clock(c) => $handler.clock($writer, c)?,
|
||||
Timestamp(t) => $handler.timestamp($writer, t)?,
|
||||
Comment(c) => $handler.comment($writer, c)?,
|
||||
FixedWidth(f) => $handler.fixed_width($writer, f)?,
|
||||
TableStart => $handler.table_start($writer)?,
|
||||
TableEnd => $handler.table_end($writer)?,
|
||||
TableCell => $handler.table_cell($writer)?,
|
||||
LatexEnv => $handler.latex_env($writer)?,
|
||||
FnDef { label, cont } => $handler.fn_def($writer, label, cont)?,
|
||||
Keyword(keyword) => $handler.keyword($writer, keyword)?,
|
||||
Rule => $handler.rule($writer)?,
|
||||
Cookie(cookie) => $handler.cookie($writer, cookie)?,
|
||||
FnRef(fn_ref) => $handler.fn_ref($writer, fn_ref)?,
|
||||
InlineSrc(src) => $handler.inline_src($writer, src)?,
|
||||
InlineCall(call) => $handler.inline_call($writer, call)?,
|
||||
Link(link) => $handler.link($writer, link)?,
|
||||
Macros(macros) => $handler.macros($writer, macros)?,
|
||||
RadioTarget { target } => $handler.radio_target($writer, target)?,
|
||||
Snippet(snippet) => $handler.snippet($writer, snippet)?,
|
||||
Target { target } => $handler.target($writer, target)?,
|
||||
BoldBeg => $handler.bold_beg($writer)?,
|
||||
BoldEnd => $handler.bold_end($writer)?,
|
||||
ItalicBeg => $handler.italic_beg($writer)?,
|
||||
ItalicEnd => $handler.italic_end($writer)?,
|
||||
StrikeBeg => $handler.strike_beg($writer)?,
|
||||
StrikeEnd => $handler.strike_end($writer)?,
|
||||
UnderlineBeg => $handler.underline_beg($writer)?,
|
||||
UnderlineEnd => $handler.underline_end($writer)?,
|
||||
Verbatim(cont) => $handler.verbatim($writer, cont)?,
|
||||
Code(cont) => $handler.code($writer, cont)?,
|
||||
Text(cont) => $handler.text($writer, cont)?,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
mod html;
|
||||
|
||||
pub use html::*;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue