From 6b1c07075f3953ebb4cf74273f1bcaeda61ccca3 Mon Sep 17 00:00:00 2001 From: Enivex Date: Sat, 17 May 2025 17:16:11 -0400 Subject: [PATCH 01/10] circle modifier -> o modifier --- src/modules/sym.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index 43334d5..34f3b31 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -55,6 +55,8 @@ bar .v.double ‖ .v.triple ⦀ .v.broken ¦ + .v.o ⦶ + //Deprecated .v.circle ⦶ .h ― fence @@ -99,15 +101,19 @@ amp & // Punctuation. ast .op ∗ + .op.o ⊛ .basic * .low ⁎ .double ⁑ .triple ⁂ .small ﹡ + //Deprecated .circle ⊛ .square ⧆ at @ backslash \ + .o ⦸ + //Deprecated .circle ⦸ .not ⧷ co ℅ @@ -132,13 +138,19 @@ dash .fig ‒ .wave 〜 .colon ∹ + .o ⊝ + //Deprecated .circle ⊝ .wave.double 〰 dot .op ⋅ .basic U+2E .c · + .o ⊙ + .o.big ⨀ + //Deprecated .circle ⊙ + //Deprecated .circle.big ⨀ .square ⊡ .double ¨ @@ -229,8 +241,14 @@ prime ′ // Arithmetic. plus + + .o ⊕ + .o.arrow ⟴ + .o.big ⨁ + //Deprecated .circle ⊕ + //Deprecated .circle.arrow ⟴ + //Deprecated .circle.big ⨁ .dot ∔ .double ⧺ @@ -240,6 +258,8 @@ plus + .triangle ⨹ .triple ⧻ minus − + .o ⊖ + //Deprecated .circle ⊖ .dot ∸ .plus ∓ @@ -247,10 +267,16 @@ minus − .tilde ≂ .triangle ⨺ div ÷ + .o ⨸ + //Deprecated .circle ⨸ times × .big ⨉ + .o ⊗ + .o.big ⨂ + //Deprecated .circle ⊗ + //Deprecated .circle.big ⨂ .div ⋇ .three.l ⋋ @@ -264,6 +290,8 @@ ratio ∶ // Relations. eq = .star ≛ + .o ⊜ + //Deprecated .circle ⊜ .colon ≕ .dots ≑ @@ -285,6 +313,8 @@ eq = .triple.not ≢ .quad ≣ gt > + .o ⧁ + //Deprecated .circle ⧁ .dot ⋗ .approx ⪆ @@ -311,6 +341,8 @@ gt > .triple ⋙ .triple.nested ⫸ lt < + .o ⧀ + //Deprecated .circle ⧀ .dot ⋖ .approx ⪅ @@ -539,6 +571,8 @@ wreath ≀ // Geometry. parallel ∥ .struck ⫲ + .o ⦷ + //Deprecated .circle ⦷ .eq ⋕ .equiv ⩨ @@ -548,6 +582,8 @@ parallel ∥ .slanted.equiv ⧥ .tilde ⫳ perp ⟂ + .o ⦹ + //Deprecated .circle ⦹ // Miscellaneous Technical. From 37a3b4c0ff50bcacde79fb637a7220603c6d0d16 Mon Sep 17 00:00:00 2001 From: Enivex Date: Sat, 17 May 2025 17:16:31 -0400 Subject: [PATCH 02/10] Add o modifier to compose and convolve --- src/modules/sym.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index 34f3b31..16e7d47 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -551,7 +551,9 @@ qed ∎ mapsto ↦ .long ⟼ compose ∘ + .o ⊚ convolve ∗ + .o ⊛ multimap ⊸ .double ⧟ From 1dc2f1816061ab3945477bfb534bd155c0ccd034 Mon Sep 17 00:00:00 2001 From: Enivex Date: Sat, 17 May 2025 17:17:03 -0400 Subject: [PATCH 03/10] circle.nested is a circled version of circle.stroked.tiny (which is the same as compose) --- src/modules/sym.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index 16e7d47..2177a51 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -699,6 +699,7 @@ bullet • circle .stroked ○ .stroked.tiny ∘ + .stroked.tiny.o ⊚ .stroked.small ⚬ .stroked.big ◯ .filled ● @@ -706,6 +707,7 @@ circle .filled.small ∙ .filled.big ⬤ .dotted ◌ + //Deprecated .nested ⊚ ellipse .stroked.h ⬭ From 0fb94a8d834c3a3fa577f84f253be17974f366f2 Mon Sep 17 00:00:00 2001 From: Enivex Date: Sun, 18 May 2025 17:42:31 -0400 Subject: [PATCH 04/10] Remove circle.stroked.tiny.o --- src/modules/sym.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index 2177a51..f4c6a6a 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -699,7 +699,6 @@ bullet • circle .stroked ○ .stroked.tiny ∘ - .stroked.tiny.o ⊚ .stroked.small ⚬ .stroked.big ◯ .filled ● @@ -707,7 +706,7 @@ circle .filled.small ∙ .filled.big ⬤ .dotted ◌ - //Deprecated + //Deprecated, use compose.o .nested ⊚ ellipse .stroked.h ⬭ From d878bdb838d20e11ee3ac5235558bd33c3a55b33 Mon Sep 17 00:00:00 2001 From: Enivex Date: Mon, 9 Jun 2025 18:32:33 -0400 Subject: [PATCH 05/10] Change slash.circle to slash.o --- src/modules/sym.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index 8935a64..08ef656 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -184,7 +184,7 @@ semi ; .inv ⸵ .rev ⁏ slash / - .circle ⊘ + .o ⊘ .double ⫽ .triple ⫻ .big ⧸ From 5b81b4175c33e439cfd8fc13dfaa265146b1a002 Mon Sep 17 00:00:00 2001 From: Enivex Date: Thu, 12 Jun 2025 12:13:14 -0400 Subject: [PATCH 06/10] Use proper deprecation mechanism for modifiers --- src/modules/sym.txt | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index 0c32515..a26a927 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -56,7 +56,7 @@ bar .v.triple ⦀ .v.broken ¦ .v.o ⦶ - //Deprecated + @deprecated: `bar.v.circle` is deprecated, use `bar.v.o` instead .v.circle ⦶ .h ― fence @@ -108,13 +108,13 @@ ast .low ⁎ .double ⁑ .triple ⁂ - //Deprecated + @deprecated: `ast.circle` is deprecated, use `convolve.o` or `ast.op.o` instead .circle ⊛ .square ⧆ at @ backslash \ .o ⦸ - //Deprecated + @deprecated: `backslash.circle` is deprecated, use `backslash.o` instead .circle ⦸ .not ⧷ co ℅ @@ -142,7 +142,7 @@ dash .wave 〜 .colon ∹ .o ⊝ - //Deprecated + @deprecated: `dash.circle` is deprecated, use `dash.o` instead .circle ⊝ .wave.double 〰 dot @@ -151,9 +151,9 @@ dot .c · .o ⊙ .o.big ⨀ - //Deprecated + @deprecated: `dot.circle` is deprecated, use `dot.o` instead .circle ⊙ - //Deprecated + @deprecated: `dot.circle.big` is deprecated, use `dot.o.big` instead .circle.big ⨀ .square ⊡ .double ¨ @@ -251,11 +251,11 @@ plus + .o ⊕ .o.arrow ⟴ .o.big ⨁ - //Deprecated + @deprecated: `plus.circle` is deprecated, use `plus.o` instead .circle ⊕ - //Deprecated + @deprecated: `plus.circle.arrow` is deprecated, use `plus.o.arrow` instead .circle.arrow ⟴ - //Deprecated + @deprecated: `plus.circle.big` is deprecated, use `plus.o.big` instead .circle.big ⨁ .dot ∔ .double ⧺ @@ -265,7 +265,7 @@ plus + .triple ⧻ minus − .o ⊖ - //Deprecated + @deprecated: `minus.circle` is deprecated, use `minus.o` instead .circle ⊖ .dot ∸ .plus ∓ @@ -274,15 +274,15 @@ minus − .triangle ⨺ div ÷ .o ⨸ - //Deprecated + @deprecated: `div.circle` is deprecated, use `div.o` instead .circle ⨸ times × .big ⨉ .o ⊗ .o.big ⨂ - //Deprecated + @deprecated: `times.circle` is deprecated, use `times.o` instead .circle ⊗ - //Deprecated + @deprecated: `times.circle.big` is deprecated, use `times.o.big` instead .circle.big ⨂ .div ⋇ .three.l ⋋ @@ -297,7 +297,7 @@ ratio ∶ eq = .star ≛ .o ⊜ - //Deprecated + @deprecated: `eq.circle` is deprecated, use `eq.o` instead .circle ⊜ .colon ≕ .dots ≑ @@ -319,7 +319,7 @@ eq = .quad ≣ gt > .o ⧁ - //Deprecated + @deprecated: `gt.circle` is deprecated, use `gt.o` instead .circle ⧁ .dot ⋗ .approx ⪆ @@ -346,7 +346,7 @@ gt > .triple.nested ⫸ lt < .o ⧀ - //Deprecated + @deprecated: `lt.circle` is deprecated, use `lt.o` instead .circle ⧀ .dot ⋖ .approx ⪅ @@ -578,7 +578,7 @@ angzarr ⍼ parallel ∥ .struck ⫲ .o ⦷ - //Deprecated + @deprecated: `parallel.circle` is deprecated, use `parallel.o` instead .circle ⦷ .eq ⋕ .equiv ⩨ @@ -589,7 +589,7 @@ parallel ∥ .tilde ⫳ perp ⟂ .o ⦹ - //Deprecated + @deprecated: `perp.circle` is deprecated, use `perp.o` instead .circle ⦹ // Astronomical. @@ -724,6 +724,8 @@ bullet • circle .stroked ○ .stroked.tiny ∘ + @deprecated: `circled.stroked.tiny.o` is deprecated, use `compose.o` instead + .stroked.tiny.o .stroked.small ⚬ .stroked.big ◯ .filled ● @@ -731,7 +733,7 @@ circle .filled.small ∙ .filled.big ⬤ .dotted ◌ - //Deprecated, use compose.o + @deprecated: `circle.nested` is deprecated, use `compose.o` instead .nested ⊚ ellipse .stroked.h ⬭ From 3865f9902e02c12434bb541723d4de0bec761951 Mon Sep 17 00:00:00 2001 From: Enivex Date: Thu, 12 Jun 2025 19:04:35 -0400 Subject: [PATCH 07/10] Oops --- src/modules/sym.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/sym.txt b/src/modules/sym.txt index a26a927..5433275 100644 --- a/src/modules/sym.txt +++ b/src/modules/sym.txt @@ -724,8 +724,6 @@ bullet • circle .stroked ○ .stroked.tiny ∘ - @deprecated: `circled.stroked.tiny.o` is deprecated, use `compose.o` instead - .stroked.tiny.o .stroked.small ⚬ .stroked.big ◯ .filled ● From 14dae63a40de7a64f711f5f32ebbae1271245d5e Mon Sep 17 00:00:00 2001 From: Enivex Date: Mon, 30 Jun 2025 10:38:28 -0400 Subject: [PATCH 08/10] Change circle to o in test --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 6c35d4e..4f3dc6b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -156,7 +156,7 @@ mod test { #[test] fn random_sample() { for (key, control) in [ - ("backslash", [("", "\\"), ("circle", "⦸"), ("not", "⧷")].as_slice()), + ("backslash", [("", "\\"), ("o", "⦸"), ("not", "⧷")].as_slice()), ("chi", &[("", "χ")]), ("forces", &[("", "⊩"), ("not", "⊮")]), ("interleave", &[("", "⫴"), ("big", "⫼"), ("struck", "⫵")]), From 8c8a847de35758fb32e0a40d37b045fa22430a7c Mon Sep 17 00:00:00 2001 From: Enivex Date: Mon, 30 Jun 2025 10:59:55 -0400 Subject: [PATCH 09/10] Attempt number two --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 4f3dc6b..335d565 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -156,7 +156,7 @@ mod test { #[test] fn random_sample() { for (key, control) in [ - ("backslash", [("", "\\"), ("o", "⦸"), ("not", "⧷")].as_slice()), + ("backslash", [("", "\\"), ("not", "⧷"), ("o", "⦸")].as_slice()), ("chi", &[("", "χ")]), ("forces", &[("", "⊩"), ("not", "⊮")]), ("interleave", &[("", "⫴"), ("big", "⫼"), ("struck", "⫵")]), From aae3388a1f4749760e0c4e96a3e09db50d2f1d88 Mon Sep 17 00:00:00 2001 From: Enivex Date: Mon, 30 Jun 2025 11:01:46 -0400 Subject: [PATCH 10/10] Third attempt.. --- src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 335d565..0c11a5a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -156,7 +156,10 @@ mod test { #[test] fn random_sample() { for (key, control) in [ - ("backslash", [("", "\\"), ("not", "⧷"), ("o", "⦸")].as_slice()), + ( + "backslash", + [("", "\\"), ("circle", "⦸"), ("not", "⧷"), ("o", "⦸")].as_slice(), + ), ("chi", &[("", "χ")]), ("forces", &[("", "⊩"), ("not", "⊮")]), ("interleave", &[("", "⫴"), ("big", "⫼"), ("struck", "⫵")]),