Revert "Merge branch 'main' into cite-box"

This reverts commit 4c5eeb0, reversing changes made to 9d064a9.
unimarkup · Dec 11, 2023 · 2746775 · 2746775
1 parent 4c5eeb0
commit 2746775
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 689 deletions.
diff --git a/cli/src/compiler.rs b/cli/src/compiler.rs
@@ -52,14 +52,6 @@ pub fn compile(config: Config) -> Result<(), GeneralError> {
                 &out_path,
                 OutputFormatKind::Html.extension(),
             )?,
-            OutputFormatKind::Umi => write_file(
-                &um.render_umi()
-                    .map_err(|_| GeneralError::Render)?
-                    .create_workbook()
-                    .to_string(),
-                &out_path,
-                OutputFormatKind::Umi.extension(),
-            )?,
         }
     }
 

diff --git a/cli/tests/test_files/supported.umi b/cli/tests/test_files/supported.umi
diff --git a/cli/tests/umi.rs b/cli/tests/umi.rs
diff --git a/commons/src/config/output.rs b/commons/src/config/output.rs
@@ -70,15 +70,13 @@ impl ConfigFns for Output {
 pub enum OutputFormatKind {
     #[default]
     Html,
-    Umi,
 }
 
 impl OutputFormatKind {
     /// Returns the associated file extension for an output format.
     pub fn extension(&self) -> &str {
         match self {
             OutputFormatKind::Html => "html",
-            OutputFormatKind::Umi => "umi",
         }
     }
 }
@@ -89,7 +87,6 @@ impl FromStr for OutputFormatKind {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.to_lowercase().as_str() {
             "html" => Ok(OutputFormatKind::Html),
-            "umi" => Ok(OutputFormatKind::Umi),
             o => Err(format!("Bad output format: {}", o)),
         }
     }

diff --git a/commons/src/config/preamble.rs b/commons/src/config/preamble.rs
@@ -44,15 +44,11 @@ impl ConfigFns for Preamble {
     }
 }
 
-pub fn default_locale() -> Locale {
-    icu_locid::locale!("en")
-}
-
 #[derive(Args, Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct I18n {
-    #[arg(long, value_parser = locale::clap::parse_locale, default_value = "en")]
-    #[serde(with = "locale::serde::single", default = "self::default_locale")]
-    pub lang: Locale,
+    #[arg(long, value_parser = locale::clap::parse_locale)]
+    #[serde(with = "locale::serde::optional", default)]
+    pub lang: Option<Locale>,
 
     #[arg(long, value_parser = parse_to_hashset::<Locale>, required = false, default_value = "")]
     #[serde(with = "locale::serde::multiple", default)]

diff --git a/commons/src/lexer/position.rs b/commons/src/lexer/position.rs
@@ -3,13 +3,11 @@
 
 use std::ops::{Add, AddAssign, Sub, SubAssign};
 
-use serde::{Deserialize, Serialize};
-
 use super::span::SpanLen;
 
 /// Indicates position of a symbol or token in a Unimarkup document. Both line and column
 /// counting starts from 1.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Position {
     /// Line the symbol or token is found at
     pub line: usize,

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -10,8 +10,6 @@ use crate::render::html::render::HtmlRenderer;
 use crate::render::html::Html;
 use crate::render::log_id::RenderError;
 use crate::render::render::{OutputFormat, Renderer};
-use crate::render::umi::render::UmiRenderer;
-use crate::render::umi::Umi;
 
 pub struct Unimarkup {
     doc: Document,
@@ -45,8 +43,4 @@ impl Unimarkup {
     pub fn render_html(&self) -> Result<Html, RenderError> {
         self.render(HtmlRenderer::default())
     }
-
-    pub fn render_umi(&self) -> Result<Umi, RenderError> {
-        self.render(UmiRenderer::default())
-    }
 }
diff --git a/parser/src/elements/atomic/heading.rs b/parser/src/elements/atomic/heading.rs
@@ -60,12 +60,12 @@ impl HeadingLevel {
     /// The `str` representation of the [`HeadingLevel`].
     pub fn as_str(&self) -> &'static str {
         match self {
-            HeadingLevel::Level1 => "#",
-            HeadingLevel::Level2 => "##",
-            HeadingLevel::Level3 => "###",
-            HeadingLevel::Level4 => "####",
-            HeadingLevel::Level5 => "#####",
-            HeadingLevel::Level6 => "######",
+            HeadingLevel::Level1 => "# ",
+            HeadingLevel::Level2 => "## ",
+            HeadingLevel::Level3 => "### ",
+            HeadingLevel::Level4 => "#### ",
+            HeadingLevel::Level5 => "##### ",
+            HeadingLevel::Level6 => "###### ",
         }
     }
 }

diff --git a/render/Cargo.toml b/render/Cargo.toml
@@ -22,7 +22,3 @@ unimarkup-inline = { path = "../inline/", version = "0" }
 unimarkup-parser = { path = "../parser/", version = "0" }
 syntect = "5.0"
 rustyscript = "0.1.1"
-spreadsheet-ods = "0.17.0"
-serde.workspace = true
-serde_json.workspace = true
-serde_yaml.workspace = true
diff --git a/render/src/lib.rs b/render/src/lib.rs
@@ -7,4 +7,3 @@ mod csl_json;
 pub mod html;
 pub mod log_id;
 pub mod render;
-pub mod umi;
diff --git a/render/src/render.rs b/render/src/render.rs
@@ -4,7 +4,6 @@ use crate::html::citeproc::CiteprocWrapper;
 use logid::log;
 use serde_json::Value;
 use std::path::PathBuf;
-use unimarkup_commons::config::Config;
 use unimarkup_commons::{
     config::icu_locid::{locale, Locale},
     lexer::span::Span,
@@ -139,10 +138,6 @@ impl<'a> Context<'a> {
             bibliography,
         }
     }
-
-    pub fn get_config(&self) -> &Config {
-        &self.doc.config
-    }
 }
 
 pub fn render<T: OutputFormat>(