diff options
author | Jovansonlee Cesar <ivanceras@gmail.com> | 2022-01-23 20:43:52 +0800 |
---|---|---|
committer | Jovansonlee Cesar <ivanceras@gmail.com> | 2022-01-23 20:43:52 +0800 |
commit | 2208804bd5e85d2c23a693cda2fb25304855130a (patch) | |
tree | fba75e9d2e29580a65be0111e1ea57fa387a09f1 | |
parent | 277f28b337a2d00a61cf342247060cf5fbf88d50 (diff) |
refactor: move Settings to the top level of this crate
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | packages/cli/.gitignore | 1 | ||||
-rw-r--r-- | packages/cli/Cargo.toml | 7 | ||||
-rw-r--r-- | packages/svgbob/.gitignore | 3 | ||||
-rw-r--r-- | packages/svgbob/Cargo.toml | 4 | ||||
-rw-r--r-- | packages/svgbob/src/buffer.rs | 2 | ||||
-rw-r--r-- | packages/svgbob/src/buffer/cell_buffer.rs | 3 | ||||
-rw-r--r-- | packages/svgbob/src/buffer/fragment_buffer.rs | 3 | ||||
-rw-r--r-- | packages/svgbob/src/lib.rs | 4 | ||||
-rw-r--r-- | packages/svgbob/src/map/ascii_map.rs | 4 | ||||
-rw-r--r-- | packages/svgbob/src/settings.rs (renamed from packages/svgbob/src/buffer/cell_buffer/settings.rs) | 2 |
11 files changed, 21 insertions, 15 deletions
@@ -1,8 +1,7 @@ target/ *.sw* *.bk -Cargo.lock - +/Cargo.lock .DS_Store public/ parts/ diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/packages/cli/.gitignore @@ -0,0 +1 @@ +/target diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 6d3ae53..d4252bf 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -14,7 +14,8 @@ svgbob = { path = "../svgbob", version = "0.6" } clap = "2.16" -[[bin]] -name = "svgbob" -path = "src/main.rs" +#[[bin]] +#name = "svgbob" +#path = "src/main.rs" + diff --git a/packages/svgbob/.gitignore b/packages/svgbob/.gitignore new file mode 100644 index 0000000..d14f13d --- /dev/null +++ b/packages/svgbob/.gitignore @@ -0,0 +1,3 @@ +target/ +out/ +Cargo.lock diff --git a/packages/svgbob/Cargo.toml b/packages/svgbob/Cargo.toml index a81790c..078afed 100644 --- a/packages/svgbob/Cargo.toml +++ b/packages/svgbob/Cargo.toml @@ -13,8 +13,8 @@ license = "Apache-2.0" nalgebra = "0.29" parry2d = "0.7" lazy_static = "1.3.0" -sauron = { version = "0.43.4", default-features = false} -#sauron = { version = "0.43", default-features = false, path = "../../../sauron"} +sauron = { version = "0.43.10", default-features = false} +#sauron = { version = "0.43.10", default-features = false, path = "../../../sauron"} unicode-width = "0.1.5" itertools = "0.8.0" pom = { version = "3.1.0" } diff --git a/packages/svgbob/src/buffer.rs b/packages/svgbob/src/buffer.rs index 867bd3c..30921f1 100644 --- a/packages/svgbob/src/buffer.rs +++ b/packages/svgbob/src/buffer.rs @@ -1,4 +1,4 @@ -pub use cell_buffer::{Cell, CellBuffer, CellGrid, Contacts, Settings, Span}; +pub use cell_buffer::{Cell, CellBuffer, CellGrid, Contacts, Span}; pub use fragment_buffer::Direction; pub use fragment_buffer::{fragment, fragment::Fragment, FragmentBuffer}; pub use property_buffer::{Property, PropertyBuffer, Signal}; diff --git a/packages/svgbob/src/buffer/cell_buffer.rs b/packages/svgbob/src/buffer/cell_buffer.rs index c1f4421..4f968f3 100644 --- a/packages/svgbob/src/buffer/cell_buffer.rs +++ b/packages/svgbob/src/buffer/cell_buffer.rs @@ -1,4 +1,5 @@ use crate::fragment::CellText; +use crate::Settings; use crate::{ buffer::{fragment_buffer::FragmentTree, Fragment, StringBuffer}, util::parser, @@ -12,7 +13,6 @@ use sauron::{ svg::{attributes::*, *}, Node, }; -pub use settings::Settings; pub use span::Span; use std::{ collections::BTreeMap, @@ -24,7 +24,6 @@ use unicode_width::UnicodeWidthStr; mod cell; mod contacts; mod endorse; -mod settings; mod span; /// The simplest buffer. diff --git a/packages/svgbob/src/buffer/fragment_buffer.rs b/packages/svgbob/src/buffer/fragment_buffer.rs index a550b0f..95ed8b1 100644 --- a/packages/svgbob/src/buffer/fragment_buffer.rs +++ b/packages/svgbob/src/buffer/fragment_buffer.rs @@ -1,4 +1,5 @@ -use crate::{buffer::Settings, Cell}; +use crate::Cell; +use crate::Settings; pub use direction::Direction; pub use fragment::Fragment; pub use fragment_tree::FragmentTree; diff --git a/packages/svgbob/src/lib.rs b/packages/svgbob/src/lib.rs index 5f64f6e..8874f29 100644 --- a/packages/svgbob/src/lib.rs +++ b/packages/svgbob/src/lib.rs @@ -5,17 +5,19 @@ pub mod buffer; pub mod map; mod point; +mod settings; pub mod util; pub use buffer::{ fragment, fragment::Fragment, Cell, CellBuffer, Direction, FragmentBuffer, - Property, Settings, Signal, + Property, Signal, }; pub use nalgebra; pub use point::Point; /// reexport sauron pub use sauron; pub use sauron::{Node, Render}; +pub use settings::Settings; pub fn to_svg(ascii: &str) -> String { to_svg_string_pretty(ascii) diff --git a/packages/svgbob/src/map/ascii_map.rs b/packages/svgbob/src/map/ascii_map.rs index 1d6ee2d..f4c0450 100644 --- a/packages/svgbob/src/map/ascii_map.rs +++ b/packages/svgbob/src/map/ascii_map.rs @@ -4,10 +4,10 @@ use crate::{ ArrowBottom, ArrowBottomLeft, ArrowBottomRight, ArrowLeft, ArrowRight, ArrowTop, ArrowTopLeft, ArrowTopRight, DiamondBullet, }, - Cell, CellGrid, Settings, + Cell, CellGrid, }, fragment::{arc, broken_line, circle, line, polygon, rect}, - Fragment, Property, + Fragment, Property, Settings, Signal::{self, Medium, Strong, Weak}, }; use lazy_static::lazy_static; diff --git a/packages/svgbob/src/buffer/cell_buffer/settings.rs b/packages/svgbob/src/settings.rs index de4cb40..22c2085 100644 --- a/packages/svgbob/src/buffer/cell_buffer/settings.rs +++ b/packages/svgbob/src/settings.rs @@ -37,7 +37,7 @@ impl Default for Settings { fn default() -> Self { Settings { font_size: 14, - font_family: "monospace".into(), + font_family: "Iosevka Fixed, monospace".into(), fill_color: "black".into(), background: "white".into(), stroke_color: "black".into(), |