ef3d0c3e/nml
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better lists offset

Browse source
This commit is contained in:
ef3d0c3e 2024-08-26 20:50:23 +02:00
parent 860fc785ac
commit 822c3e3b66
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/elements/list.rs
View file

@ -79,7 +79,16 @@ impl Element for ListEntry {
fn compile(&self, compiler: &Compiler, document: &dyn Document, cursor: usize) -> Result<String, String> {
match compiler.target() {
Target::HTML => {
let mut result = "<li>".to_string();
let mut result = String::new();
if let Some((numbered, number)) = self.numbering.last()
{
if *numbered {
result += format!("<li value=\"{number}\">").as_str();
}
else {
result += "<li>";
}
}
for elem in &self.content {
result += elem.compile(compiler, document, cursor+result.len())?.as_str();
}
@ -198,14 +207,13 @@ impl ListRule {
fn parse_depth(depth: &str, document: &dyn Document, offset: usize) -> Vec<(bool, usize)> {
let mut parsed = vec![];
// FIXME: Previous iteration used to recursively retrieve the list indent
let prev_entry = document
.last_element::<ListEntry>()
.and_then(|entry| Ref::filter_map(entry, |e| Some(&e.numbering)).ok());
let mut continue_match = true;
depth.chars().enumerate().for_each(|(idx, c)| {
let number = if offset == 0 {
let number = if offset == usize::MAX {
prev_entry
.as_ref()
.and_then(|v| {
@ -312,7 +320,7 @@ impl Rule for ListRule {
let depth = ListRule::parse_depth(
captures.get(1).unwrap().as_str(),
document,
offset.unwrap_or(0),
offset.unwrap_or(usize::MAX),
);
// Content