mirror of
https://github.com/coteditor/CotEditor.git
synced 2024-09-11 11:25:57 +03:00
Replace DifferenceKit with native CollectionDifference
This commit is contained in:
parent
ae1ff9b1c8
commit
9798d6cbba
@ -15,6 +15,7 @@ Change Log
|
||||
- Change default settings of items to display in toolbar/status bar.
|
||||
- Change the UI of the Unicode code point input to display the input field just above the insertion point.
|
||||
- [trivial] Optimize the line number calculation in vertical text orientation.
|
||||
- [dev] Replace DifferenceKit package with native CollectionDifference.
|
||||
|
||||
|
||||
|
||||
|
@ -1,15 +1,6 @@
|
||||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
{
|
||||
"package": "DifferenceKit",
|
||||
"repositoryURL": "https://github.com/ra1028/DifferenceKit",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "14c66681e12a38b81045f44c6c29724a0d4b0e72",
|
||||
"version": "1.1.5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "ColorCode",
|
||||
"repositoryURL": "https://github.com/1024jp/WFColorCode",
|
||||
|
@ -478,8 +478,6 @@
|
||||
2AAD61F91D2BA3F5008FE772 /* SyntaxHighlightParseOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61F71D2BA3F5008FE772 /* SyntaxHighlightParseOperation.swift */; };
|
||||
2AAD61FC1D2BD102008FE772 /* String+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61FB1D2BD102008FE772 /* String+Additions.swift */; };
|
||||
2AAD61FD1D2BD102008FE772 /* String+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61FB1D2BD102008FE772 /* String+Additions.swift */; };
|
||||
2AAF1E3E23DA671A00164CBF /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2AAF1E3D23DA671A00164CBF /* DifferenceKit */; };
|
||||
2AAF1E4023DA672F00164CBF /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2AAF1E3F23DA672F00164CBF /* DifferenceKit */; };
|
||||
2AB2241421A7CDEF00F6201F /* SyntaxInfoEditView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AB2241221A7CDEF00F6201F /* SyntaxInfoEditView.storyboard */; };
|
||||
2AB2241D21A7CFC900F6201F /* SyntaxFileMappingEditView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AB2241B21A7CFC900F6201F /* SyntaxFileMappingEditView.storyboard */; };
|
||||
2AB2242921A7D51800F6201F /* SyntaxCompletionsEditView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AB2242721A7D51800F6201F /* SyntaxCompletionsEditView.storyboard */; };
|
||||
@ -1478,7 +1476,6 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
2AAF1E4023DA672F00164CBF /* DifferenceKit in Frameworks */,
|
||||
2ACD02BF22A87F0400893051 /* ColorCode in Frameworks */,
|
||||
2AA2C6FC24399A920017D1EC /* Yams in Frameworks */,
|
||||
);
|
||||
@ -1489,7 +1486,6 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
2ACD68251D6B0F0700496B47 /* Sparkle.framework in Frameworks */,
|
||||
2AAF1E3E23DA671A00164CBF /* DifferenceKit in Frameworks */,
|
||||
2ACD02BD22A87EFD00893051 /* ColorCode in Frameworks */,
|
||||
2AA2C6FE24399AA20017D1EC /* Yams in Frameworks */,
|
||||
);
|
||||
@ -2398,7 +2394,6 @@
|
||||
name = CotEditor;
|
||||
packageProductDependencies = (
|
||||
2ACD02BE22A87F0400893051 /* ColorCode */,
|
||||
2AAF1E3F23DA672F00164CBF /* DifferenceKit */,
|
||||
2AA2C6FB24399A920017D1EC /* Yams */,
|
||||
);
|
||||
productInstallPath = "$(HOME)/Applications";
|
||||
@ -2445,7 +2440,6 @@
|
||||
name = "CotEditor -Sparkle";
|
||||
packageProductDependencies = (
|
||||
2ACD02BC22A87EFD00893051 /* ColorCode */,
|
||||
2AAF1E3D23DA671A00164CBF /* DifferenceKit */,
|
||||
2AA2C6FD24399AA20017D1EC /* Yams */,
|
||||
);
|
||||
productInstallPath = "$(HOME)/Applications";
|
||||
@ -2527,7 +2521,6 @@
|
||||
mainGroup = 2A37F4AAFDCFA73011CA2CEA /* CotEditor */;
|
||||
packageReferences = (
|
||||
2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */,
|
||||
2AAF1E3C23DA671A00164CBF /* XCRemoteSwiftPackageReference "DifferenceKit" */,
|
||||
2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */,
|
||||
);
|
||||
projectDirPath = "";
|
||||
@ -4465,14 +4458,6 @@
|
||||
minimumVersion = 3.0.0;
|
||||
};
|
||||
};
|
||||
2AAF1E3C23DA671A00164CBF /* XCRemoteSwiftPackageReference "DifferenceKit" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/ra1028/DifferenceKit";
|
||||
requirement = {
|
||||
kind = upToNextMajorVersion;
|
||||
minimumVersion = 1.1.5;
|
||||
};
|
||||
};
|
||||
2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/1024jp/WFColorCode";
|
||||
@ -4494,16 +4479,6 @@
|
||||
package = 2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */;
|
||||
productName = Yams;
|
||||
};
|
||||
2AAF1E3D23DA671A00164CBF /* DifferenceKit */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 2AAF1E3C23DA671A00164CBF /* XCRemoteSwiftPackageReference "DifferenceKit" */;
|
||||
productName = DifferenceKit;
|
||||
};
|
||||
2AAF1E3F23DA672F00164CBF /* DifferenceKit */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 2AAF1E3C23DA671A00164CBF /* XCRemoteSwiftPackageReference "DifferenceKit" */;
|
||||
productName = DifferenceKit;
|
||||
};
|
||||
2ACD02BC22A87EFD00893051 /* ColorCode */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */;
|
||||
|
@ -258,7 +258,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingHolder {
|
||||
// otherwise, just cut extra ranges off.
|
||||
let string = self.textStorage.string
|
||||
let range = self.textStorage.range
|
||||
let maxLength = 50_000 // takes ca. 1.3 sec. with MacBook Pro 13-inch late 2016 (3.3 GHz)
|
||||
let maxLength = 20_000 // takes ca. 1.3 sec. with MacBook Pro 13-inch late 2016 (3.3 GHz)
|
||||
let considersDiff = lastString.length < maxLength || string.length < maxLength
|
||||
|
||||
for state in editorStates {
|
||||
|
@ -25,7 +25,6 @@
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import DifferenceKit
|
||||
|
||||
final class IncompatibleCharacter: NSObject { // -> inherit NSObject for NSArrayController
|
||||
|
||||
@ -61,8 +60,6 @@ final class IncompatibleCharacter: NSObject { // -> inherit NSObject for NSArra
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension Character: Differentiable { }
|
||||
|
||||
extension String {
|
||||
|
||||
/// list-up characters cannot be converted to the passed-in encoding
|
||||
@ -75,17 +72,14 @@ extension String {
|
||||
let convertedString = String(data: data, encoding: encoding)
|
||||
else { assertionFailure(); return [] }
|
||||
|
||||
// detect incompatible chars using DifferenceKit
|
||||
return StagedChangeset(source: self, target: convertedString)
|
||||
.flatMap(\.elementDeleted)
|
||||
.map(\.element)
|
||||
.compactMap { (offset) in
|
||||
let index = self.index(self.startIndex, offsetBy: offset)
|
||||
let location = index.utf16Offset(in: self)
|
||||
let character = self[index]
|
||||
return convertedString.difference(from: self).removals
|
||||
.map { (change) in
|
||||
guard case let .remove(offset, character, _) = change else { preconditionFailure() }
|
||||
|
||||
let converted: String? = String(character)
|
||||
.data(using: encoding, allowLossyConversion: true)
|
||||
.flatMap { String(data: $0, encoding: encoding) }
|
||||
let location = self.index(self.startIndex, offsetBy: offset).utf16Offset(in: self)
|
||||
|
||||
return IncompatibleCharacter(character: character,
|
||||
convertedCharacter: converted,
|
||||
|
@ -24,7 +24,6 @@
|
||||
//
|
||||
|
||||
import struct Foundation.NSRange
|
||||
import DifferenceKit
|
||||
|
||||
extension StringProtocol {
|
||||
|
||||
@ -37,7 +36,9 @@ extension StringProtocol {
|
||||
func equivalentRanges(to ranges: [NSRange], in other: Self) -> [NSRange] {
|
||||
|
||||
// -> Use UTF16View instead of Character due to a performance issue.
|
||||
let diff = StagedChangeset(source: Array(other.utf16), target: Array(self.utf16))
|
||||
let diff = self.utf16.difference(from: other.utf16)
|
||||
|
||||
guard !diff.isEmpty else { return ranges }
|
||||
|
||||
return ranges.map { NSRange(diff.move($0.lowerBound)..<diff.move($0.upperBound)) }
|
||||
}
|
||||
@ -48,18 +49,27 @@ extension StringProtocol {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension String.UTF16View.Element: Differentiable { }
|
||||
|
||||
private extension StagedChangeset {
|
||||
private extension CollectionDifference {
|
||||
|
||||
func move(_ index: Int) -> Int {
|
||||
|
||||
let insertionCount = self.flatMap(\.elementInserted)
|
||||
.countPrefix { $0.element < index }
|
||||
let removalCount = self.flatMap(\.elementDeleted)
|
||||
.countPrefix { $0.element < index }
|
||||
let insertionCount = self.insertions.countPrefix { $0.offset < index }
|
||||
let removalCount = self.removals.countPrefix { $0.offset < index }
|
||||
|
||||
return index + insertionCount - removalCount
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
private extension CollectionDifference.Change {
|
||||
|
||||
var offset: Int {
|
||||
|
||||
switch self {
|
||||
case .insert(let offset, _, _), .remove(let offset, _, _):
|
||||
return offset
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>Drittanbieter-Code</h2>
|
||||
<p>Yams von JP Simard</p>
|
||||
<p>DifferenceKit von Ryo Aoyama</p>
|
||||
<p class="Sparkle">Sparkle von Andy Matuschak et al.</p>
|
||||
<p></p>
|
||||
|
||||
|
@ -81,50 +81,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>DifferenceKit</h3>
|
||||
<p><a href="https://github.com/ra1028/DifferenceKit">https://github.com/ra1028/DifferenceKit</a></p>
|
||||
<p>Thanks to DifferenceKit framework by Ryo Aoyama, which CotEditor uses to detect incompatible characters. DifferenceKit framework is distributed under the <em>Apache 2.0 License</em>.</p>
|
||||
|
||||
<details>
|
||||
<summary>Apache 2.0 license</summary>
|
||||
<blockquote><pre>
|
||||
© 2018-2020 Ryo Aoyama
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
1. Definitions.
|
||||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
|
||||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
|
||||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
|
||||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
|
||||
a. You must give any other recipients of the Work or Derivative Works a copy of this License; and
|
||||
b. You must cause any modified files to carry prominent notices stating that You changed the files; and
|
||||
c. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
|
||||
d. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
|
||||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
|
||||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
|
||||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
|
||||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
|
||||
END OF TERMS AND CONDITIONS
|
||||
</pre></blockquote>
|
||||
</details>
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>Solarized</h3>
|
||||
<p><a href="https://ethanschoonover.com/solarized">https://ethanschoonover.com/solarized</a></p>
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>Third Party Code</h2>
|
||||
<p>Yams by JP Simard</p>
|
||||
<p>DifferenceKit by Ryo Aoyama</p>
|
||||
<p class="Sparkle">Sparkle by Andy Matuschak et al.</p>
|
||||
<p></p>
|
||||
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>Code de tiers</h2>
|
||||
<p>Yams de JP Simard</p>
|
||||
<p>DifferenceKit de Ryo Aoyama</p>
|
||||
<p class="Sparkle">Sparkle de Andy Matuschak et al.</p>
|
||||
<p></p>
|
||||
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>Codice di terze parti</h2>
|
||||
<p>Yams di JP Simard</p>
|
||||
<p>DifferenceKit di Ryo Aoyama</p>
|
||||
<p class="Sparkle">Sparkle di Andy Matuschak et al.</p>
|
||||
<p></p>
|
||||
|
||||
|
@ -81,50 +81,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>DifferenceKit</h3>
|
||||
<p><a href="https://github.com/ra1028/DifferenceKit">https://github.com/ra1028/DifferenceKit</a></p>
|
||||
<p>Ryo AoyamaによるDifferenceKitフレームワークを非互換文字の検出に使用させて頂きました。DifferenceKitフレームワークは<em>Apache 2.0ライセンス</em>で配布されています。</p>
|
||||
|
||||
<details>
|
||||
<summary>Apache 2.0 license</summary>
|
||||
<blockquote><pre>
|
||||
© 2018-2020 Ryo Aoyama
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
1. Definitions.
|
||||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
|
||||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
|
||||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
|
||||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
|
||||
a. You must give any other recipients of the Work or Derivative Works a copy of this License; and
|
||||
b. You must cause any modified files to carry prominent notices stating that You changed the files; and
|
||||
c. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
|
||||
d. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
|
||||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
|
||||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
|
||||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
|
||||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
|
||||
END OF TERMS AND CONDITIONS
|
||||
</pre></blockquote>
|
||||
</details>
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>Solarized</h3>
|
||||
<p><a href="https://ethanschoonover.com/solarized">https://ethanschoonover.com/solarized</a></p>
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>サードパーティコード</h2>
|
||||
<p>Yams by JP Simard</p>
|
||||
<p>DifferenceKit by Ryo Aoyama</p>
|
||||
<p class="Sparkle">Sparkle by Andy Matuschak et al.</p>
|
||||
<p></p>
|
||||
|
||||
|
@ -81,50 +81,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>DifferenceKit</h3>
|
||||
<p><a href="https://github.com/ra1028/DifferenceKit">https://github.com/ra1028/DifferenceKit</a></p>
|
||||
<p>Obrigado ao DifferenceKit framework de Ryo Aoyama, o qual o CotEditor usa para detectar caracteres incompatíveis. O DifferenceKit framework é distribuído sob a <em>licença Apache 2.0</em>.</p>
|
||||
|
||||
<details>
|
||||
<summary>Apache 2.0 license</summary>
|
||||
<blockquote><pre>
|
||||
© 2018-2020 Ryo Aoyama
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
1. Definitions.
|
||||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
|
||||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
|
||||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
|
||||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
|
||||
a. You must give any other recipients of the Work or Derivative Works a copy of this License; and
|
||||
b. You must cause any modified files to carry prominent notices stating that You changed the files; and
|
||||
c. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
|
||||
d. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
|
||||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
|
||||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
|
||||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
|
||||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
|
||||
END OF TERMS AND CONDITIONS
|
||||
</pre></blockquote>
|
||||
</details>
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>Solarized</h3>
|
||||
<p><a href="https://ethanschoonover.com/solarized">https://ethanschoonover.com/solarized</a></p>
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>Programas de Terceiros</h2>
|
||||
<p>Yams de JP Simard</p>
|
||||
<p>DifferenceKit de Ryo Aoyama</p>
|
||||
<p class="Sparkle">Sparkle de Andy Matuschak e outros</p>
|
||||
<p></p>
|
||||
|
||||
|
@ -81,50 +81,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>DifferenceKit</h3>
|
||||
<p><a href="https://github.com/ra1028/DifferenceKit">https://github.com/ra1028/DifferenceKit</a></p>
|
||||
<p>感谢 Ryo Aoyama 的 DifferenceKit 框架,CotEditor 使用 DifferenceKit 对不适配的字符进行检测。DifferenceKit 框架是遵循如下 <em>Apache 2.0 许可证</em>发布的。</p>
|
||||
|
||||
<details>
|
||||
<summary>Apache 2.0 license</summary>
|
||||
<blockquote><pre>
|
||||
© 2018-2020 Ryo Aoyama
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
1. Definitions.
|
||||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
|
||||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
|
||||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
|
||||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
|
||||
a. You must give any other recipients of the Work or Derivative Works a copy of this License; and
|
||||
b. You must cause any modified files to carry prominent notices stating that You changed the files; and
|
||||
c. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
|
||||
d. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
|
||||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
|
||||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
|
||||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
|
||||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
|
||||
END OF TERMS AND CONDITIONS
|
||||
</pre></blockquote>
|
||||
</details>
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<h3>Solarized</h3>
|
||||
<p><a href="https://ethanschoonover.com/solarized">https://ethanschoonover.com/solarized</a></p>
|
||||
|
@ -20,7 +20,6 @@
|
||||
|
||||
<h2>第三方代码</h2>
|
||||
<p>JP Simard 的 Yams</p>
|
||||
<p>Ryo Aoyama 的 DifferenceKit</p>
|
||||
<p class="Sparkle">Andy Matuschak 等人的 Sparkle</p>
|
||||
<p></p>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user