kamov/website
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: render bibliography as raw HTML

Browse source
This commit is contained in:
Maciej Jur 2024-04-30 23:43:22 +02:00
parent 700a93a5ee
commit 3a82e64901
Signed by: kamov
GPG key ID: 191CBFF5F72ECAFD
2 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/html/misc.rs
View file

@ -1,4 +1,4 @@
use hypertext::{html_elements, maud_move, GlobalAttributes, Renderable};
use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
use crate::gen::{Sack, TreePage};
use crate::text::md::Outline;
@ -36,7 +36,7 @@ pub fn show_bibliography(bib: Vec<String>) -> impl Renderable {
ol .bibliography {
@for item in bib {
li {
(item)
(Raw(item))
}
}
}

37
src/text/md.rs
View file

@ -1,6 +1,6 @@
use std::collections::HashMap;
use hayagriva::{archive::ArchivedStyle, citationberg::{IndependentStyle, Locale, Style}, BibliographyDriver, BibliographyRequest, CitationItem, CitationRequest, Library};
use hayagriva::{archive::ArchivedStyle, citationberg::{IndependentStyle, Locale, Style}, BibliographyDriver, BibliographyRequest, BufWriteFormat, CitationItem, CitationRequest, Library};
use hypertext::Renderable;
use once_cell::sync::Lazy;
use pulldown_cmark::{CodeBlockKind, Event, Options, Parser, Tag, TagEnd, TextMergeStream};
@ -93,32 +93,29 @@ fn make_bib<'a, 'b>(stream: Vec<Event<'a>>, lib: &'b Library) -> (Vec<Event<'a>>
let mut n = 0;
let stream = stream.into_iter()
.map(|event| match event {
Event::InlineMath(_) => {
let rf = match res.citations.get(n) {
Some(rf) => rf,
None => return event,
Event::InlineMath(name) => {
let mut buffer = String::from("<cite>");
match res.citations.get(n) {
Some(rf) => rf.citation.write_buf(&mut buffer, BufWriteFormat::Html).unwrap(),
None => buffer.push_str(&name),
};
let rf = rf.citation.to_string().replace("\u{1b}[0m", "");
let rf = format!("<cite>{}</cite>", rf);
buffer.push_str("</cite>");
n += 1;
Event::InlineHtml(rf.into())
Event::InlineHtml(buffer.into())
},
_ => event
})
.collect();
let bib = match res.bibliography {
Some(ref bib) => {
let test = bib.items.iter()
.map(|x| x.content.to_string()
.replace("\u{1b}[0m", "")
.replace("\u{01b}[3mA", "")
)
.collect::<Vec<_>>();
Some(test)
},
None => None,
};
let bib = res.bibliography.map(|bib|
bib.items.iter()
.map(|x| {
let mut buffer = String::new();
x.content.write_buf(&mut buffer, BufWriteFormat::Html).unwrap();
buffer
})
.collect::<Vec<_>>()
);
(stream, bib)
}