Fix toc not using plain text

Signed-off-by: trivernis <trivernis@protonmail.com>
pull/8/head
trivernis 4 years ago
parent 4db1f27315
commit d0186cc90e
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45

@ -252,7 +252,7 @@ pub struct Placeholder {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct RefLink { pub struct RefLink {
pub(crate) description: Box<Line>, pub(crate) description: TextLine,
pub(crate) reference: String, pub(crate) reference: String,
} }
@ -352,7 +352,7 @@ impl Document {
list.ordered = ordered; list.ordered = ordered;
self.elements.iter().for_each(|e| match e { self.elements.iter().for_each(|e| match e {
Block::Section(sec) => { Block::Section(sec) => {
if !sec.get_hide_in_toc() { if !sec.is_hidden_in_toc() {
let mut item = let mut item =
ListItem::new(Line::RefLink(sec.header.get_anchor()), 1, ordered); ListItem::new(Line::RefLink(sec.header.get_anchor()), 1, ordered);
item.children.append(&mut sec.get_toc_list(ordered).items); item.children.append(&mut sec.get_toc_list(ordered).items);
@ -486,9 +486,10 @@ impl Section {
pub fn get_toc_list(&self, ordered: bool) -> List { pub fn get_toc_list(&self, ordered: bool) -> List {
let mut list = List::new(); let mut list = List::new();
self.elements.iter().for_each(|e| { self.elements.iter().for_each(|e| {
if let Block::Section(sec) = e { if let Block::Section(sec) = e {
if !sec.get_hide_in_toc() { if !sec.is_hidden_in_toc() {
let mut item = let mut item =
ListItem::new(Line::RefLink(sec.header.get_anchor()), 1, ordered); ListItem::new(Line::RefLink(sec.header.get_anchor()), 1, ordered);
item.children.append(&mut sec.get_toc_list(ordered).items); item.children.append(&mut sec.get_toc_list(ordered).items);
@ -500,7 +501,7 @@ impl Section {
list list
} }
pub(crate) fn get_hide_in_toc(&self) -> bool { pub(crate) fn is_hidden_in_toc(&self) -> bool {
if let Some(meta) = &self.metadata { if let Some(meta) = &self.metadata {
meta.get_bool("toc-hidden") meta.get_bool("toc-hidden")
} else { } else {
@ -556,7 +557,7 @@ impl Header {
pub fn get_anchor(&self) -> RefLink { pub fn get_anchor(&self) -> RefLink {
RefLink { RefLink {
description: Box::new(self.line.clone()), description: self.line.as_raw_text().as_plain_line(),
reference: self.anchor.clone(), reference: self.anchor.clone(),
} }
} }
@ -612,6 +613,16 @@ impl TextLine {
pub fn add_subtext(&mut self, subtext: Inline) { pub fn add_subtext(&mut self, subtext: Inline) {
self.subtext.push(subtext) self.subtext.push(subtext)
} }
pub fn as_plain_line(&self) -> TextLine {
TextLine {
subtext: self
.subtext
.iter()
.map(|s| Inline::Plain(s.as_plain_text()))
.collect(),
}
}
} }
impl Table { impl Table {
@ -814,3 +825,71 @@ impl MetadataValue {
} }
} }
} }
impl Line {
pub fn as_raw_text(&self) -> TextLine {
match self {
Line::Text(t) => t.clone(),
Line::Ruler(_) => TextLine::new(),
Line::RefLink(r) => r.description.clone(),
Line::Anchor(a) => a.inner.as_raw_text().as_plain_line(),
Line::Centered(c) => c.line.clone(),
Line::BibEntry(_) => TextLine::new(),
}
}
}
impl Inline {
pub fn as_plain_text(&self) -> PlainText {
match self {
Inline::Plain(p) => p.clone(),
Inline::Bold(b) => b.value.iter().fold(
PlainText {
value: String::new(),
},
|a, b| PlainText {
value: format!("{} {}", a.value, b.as_plain_text().value),
},
),
Inline::Italic(i) => i.value.iter().fold(
PlainText {
value: String::new(),
},
|a, b| PlainText {
value: format!("{} {}", a.value, b.as_plain_text().value),
},
),
Inline::Underlined(u) => u.value.iter().fold(
PlainText {
value: String::new(),
},
|a, b| PlainText {
value: format!("{} {}", a.value, b.as_plain_text().value),
},
),
Inline::Striked(s) => s.value.iter().fold(
PlainText {
value: String::new(),
},
|a, b| PlainText {
value: format!("{} {}", a.value, b.as_plain_text().value),
},
),
Inline::Monospace(m) => PlainText {
value: m.value.clone(),
},
Inline::Superscript(s) => s.value.iter().fold(
PlainText {
value: String::new(),
},
|a, b| PlainText {
value: format!("{} {}", a.value, b.as_plain_text().value),
},
),
Inline::Colored(c) => c.value.as_plain_text(),
_ => PlainText {
value: String::new(),
},
}
}
}

@ -78,6 +78,7 @@ impl ParseBlock for Parser {
fn parse_section(&mut self) -> ParseResult<Section> { fn parse_section(&mut self) -> ParseResult<Section> {
let start_index = self.ctm.get_index(); let start_index = self.ctm.get_index();
self.ctm.seek_whitespace(); self.ctm.seek_whitespace();
if self.ctm.check_char(&HASH) { if self.ctm.check_char(&HASH) {
let mut size = 1; let mut size = 1;
while let Some(_) = self.ctm.next_char() { while let Some(_) = self.ctm.next_char() {

Loading…
Cancel
Save