From 8b3a2c4c136b069bdad458c101d60778b12145c4 Mon Sep 17 00:00:00 2001
From: 1024jp <1024jp@wolfrosch.com>
Date: Tue, 2 Jul 2024 19:07:03 +0900
Subject: [PATCH 1/2] Update Sparkle to 2.6.4
---
CHANGELOG.md | 1 +
.../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70848bcb1..6a792ea3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
### Improvements
- Update the Lisp, Lua, Scheme, and Tcl syntaxes to update interpreters (thanks to Renfei!).
+- [non-AppStore ver.] Update Sparkle from 2.6.3 to 2.6.4.
### Fixes
diff --git a/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index b3195dd0d..0dccc75f9 100644
--- a/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/sparkle-project/Sparkle",
"state" : {
- "revision" : "b456fd404954a9e13f55aa0c88cd5a40b8399638",
- "version" : "2.6.3"
+ "revision" : "0ef1ee0220239b3776f433314515fd849025673f",
+ "version" : "2.6.4"
}
},
{
From 558d3d153a5cd3a0c9267283bb47302e18da1e01 Mon Sep 17 00:00:00 2001
From: 1024jp <1024jp@wolfrosch.com>
Date: Tue, 2 Jul 2024 19:07:11 +0900
Subject: [PATCH 2/2] Add U+2061..U+2065 to invisible characters (close #1662)
---
CHANGELOG.md | 1 +
.../Resources/en.lproj/pgs/howto_display_invisibles.html | 1 +
.../Resources/ja.lproj/pgs/howto_display_invisibles.html | 1 +
CotEditor/Sources/Invisible.swift | 3 ++-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a792ea3d..48cf66b6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
### Improvements
+- Draw invisible symbols for invisible operators (U+2061, U+2062, U+2063, and U+2064).
- Update the Lisp, Lua, Scheme, and Tcl syntaxes to update interpreters (thanks to Renfei!).
- [non-AppStore ver.] Update Sparkle from 2.6.3 to 2.6.4.
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_display_invisibles.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_display_invisibles.html
index 285faf629..05f971662 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_display_invisibles.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_display_invisibles.html
@@ -134,6 +134,7 @@
U+2060 (WORD JOINER)
U+FEFF (ZERO WIDTH NO-BREAK SPACE)
U+061C, U+200E..U+200F, U+202A..U+202E, U+2066..U+206F (bidi-text controls)
+ U+2061..U+2065 (invisible operators)
U+FFF9..U+FFFB (interlinear annotations)
| Special characters that are not printed as a graphic character but used for controlling or formatting documents. They correspond to all of Unicode category Cc (control) and some of Cf (format). |
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_display_invisibles.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_display_invisibles.html
index d4ea813c9..e155a1dc6 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_display_invisibles.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_display_invisibles.html
@@ -135,6 +135,7 @@
U+2060 (WORD JOINER)
U+FEFF (ZERO WIDTH NO-BREAK SPACE)
U+061C, U+200E..U+200F, U+202A..U+202E, U+2066..U+206F (bidi制御文字群)
+ U+2061..U+2065 (不可視演算子群)
U+FFF9..U+FFFB (ルビ制御文字群)
通常の文字として表示されず文書のフォーマットなどに用いられる特殊な文字です。UnicodeのカテゴリCcすべてと一部のCfに対応しています。 |
diff --git a/CotEditor/Sources/Invisible.swift b/CotEditor/Sources/Invisible.swift
index 5b69c13d0..788735963 100644
--- a/CotEditor/Sources/Invisible.swift
+++ b/CotEditor/Sources/Invisible.swift
@@ -8,7 +8,7 @@
//
// ---------------------------------------------------------------------------
//
-// © 2014-2023 1024jp
+// © 2014-2024 1024jp
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -68,6 +68,7 @@ enum Invisible {
0x2060, // WORD JOINER (Cf)
0xFEFF, // ZERO WIDTH NO-BREAK SPACE a.k.a. BOM (Cf)
0x061C, 0x200E...0x200F, 0x202A...0x202E, 0x2066...0x206F, // bidi controls (Cf)
+ 0x2061...0x2065, // invisible operators (Cf)
0xFFF9...0xFFFB: // interlinear annotations, controls for ruby (Cf)
self = .otherControl
default: