From 610707c802b07380d8a6c94649d5bf0a559c0208 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <copypaste@kittens.ph>
Date: Wed, 13 Dec 2023 01:16:08 -0500
Subject: [PATCH] rebase on top of master

---
 Cargo.lock | 18 ++----------------
 Cargo.toml |  4 ++--
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8eba921..d58014b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,7 @@ version = 3
 name = "MFEKglif"
 version = "2.0.1-beta1"
 dependencies = [
- "MFEKmath 0.1.2",
+ "MFEKmath",
  "arboard",
  "atty",
  "backtrace",
@@ -62,20 +62,6 @@ dependencies = [
  "xmltree",
 ]
 
-[[package]]
-name = "MFEKmath"
-version = "0.1.2"
-dependencies = [
- "flo_curves",
- "glifparser",
- "kurbo 0.9.5",
- "log",
- "plist",
- "skia-safe",
- "spline 0.3.0",
- "xmltree",
-]
-
 [[package]]
 name = "MFEKmath"
 version = "0.1.2"
@@ -1589,7 +1575,7 @@ name = "glifrenderer"
 version = "0.1.2"
 source = "git+https://github.com/MFEK/glifrenderer.rlib#1e4243bb78f1f1252cafa92558b4be1afc132f54"
 dependencies = [
- "MFEKmath 0.1.2 (git+https://github.com/MFEK/math.rlib?branch=main)",
+ "MFEKmath",
  "derive_more",
  "enum-iterator",
  "enum-unitary",
diff --git a/Cargo.toml b/Cargo.toml
index 34ff501..fd03d6e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -91,8 +91,8 @@ ctrlc = "3.2"
 glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master", features=["skia", "mfek"] }
 #glifparser = { path = "../glifparser.rlib", features=["skia", "mfek"] } # for development
 
-#MFEKmath = { git = "https://github.com/MFEK/math.rlib", branch = "main" }
-MFEKmath = { path = "../math.rlib", features=["skia"]} # for development
+MFEKmath = { git = "https://github.com/MFEK/math.rlib", branch = "main" }
+#MFEKmath = { path = "../math.rlib", features=["skia"]} # for development
 
 pub-mod = { git = "https://github.com/MFEK/pub_mod.rlib" }