qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-28 08:13:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into update-neovim

Browse Source
This commit is contained in:
Tae Won Ha 2017-08-17 10:14:06 +02:00
commit 22c64271d7
15 changed files with 114 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cartfile
View File

@ -1,8 +1,8 @@
github "ReactiveX/RxSwift" "3.5.0"
github "ReactiveX/RxSwift" "3.6.1"
github "PureLayout/PureLayout" == 3.0.2
github "eonil/FileSystemEvents" "master"
github "sparkle-project/Sparkle" == 1.17.0
github "sparkle-project/Sparkle" == 1.18.1
github "qvacua/CocoaFontAwesome" "master"
github "qvacua/CocoaMarkdown" "master"
github "sindresorhus/github-markdown-css" == 2.6.0
github "sindresorhus/github-markdown-css" == 2.8.0
github "httpswift/swifter" == 1.3.3

2
Cartfile.private
View File

@ -1 +1 @@
github "Quick/Nimble" == 7.0.0
github "Quick/Nimble" == 7.0.1

8
Cartfile.resolved
View File

@ -1,9 +1,9 @@
github "PureLayout/PureLayout" "v3.0.2"
github "Quick/Nimble" "v7.0.0"
github "ReactiveX/RxSwift" "3.5.0"
github "Quick/Nimble" "v7.0.1"
github "ReactiveX/RxSwift" "3.6.1"
github "eonil/FileSystemEvents" "85a089104af37f04a6bf7f2d07d7a93cac0b4fe1"
github "httpswift/swifter" "1.3.3"
github "qvacua/CocoaFontAwesome" "71865fc2c0275ebc5c8601edc23290e85aca9979"
github "qvacua/CocoaMarkdown" "5d1c1e3dd74486dfc358c9cc3ddd7e993842113d"
github "sindresorhus/github-markdown-css" "v2.6.0"
github "sparkle-project/Sparkle" "1.17.0"
github "sindresorhus/github-markdown-css" "v2.8.0"
github "sparkle-project/Sparkle" "1.18.1"

4
MacNeovim/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-218</string>
<string>SNAPSHOT-219</string>
<key>CFBundleVersion</key>
<string>218</string>
<string>219</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

4
SwiftNeoVim/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-218</string>
<string>SNAPSHOT-219</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>218</string>
<string>219</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

2
SwiftNeoVim/NeoVimView+UiBridge.swift
View File

@ -92,7 +92,7 @@ extension NeoVimView {
let curPos = self.grid.position
// self.bridgeLogger.debug("\(curPos) -> \(string)")
self.grid.put(string)
self.grid.put(string.precomposedStringWithCanonicalMapping)
if self.usesLigatures {
if string == " " {

33
SwiftNeoVim/TextDrawer.m
View File

@ -184,7 +184,38 @@ static CGColorRef color_for(NSInteger value) {
CTFontRef fontWithTraits = [self fontWithTrait:fontTrait];
CGContextSetFillColorWithColor(context, color_for(foreground));
recurseDraw(unichars, glyphs, positions, unilength, context, fontWithTraits, _fontLookupCache, _usesLigatures);
CGGlyph *g = glyphs;
CGPoint *p = positions;
const UniChar *b = unichars;
const UniChar *bStart = unichars;
const UniChar *bEnd = unichars + unilength;
UniCharCount choppedLength;
bool wide;
bool pWide = NO;
while (b < bEnd) {
wide = CFStringIsSurrogateHighCharacter(*b) || CFStringIsSurrogateLowCharacter(*b);
if ((b > unichars) && (wide != pWide)) {
choppedLength = b - bStart;
// NSString *logged = [NSString stringWithCharacters:bStart length:choppedLength];
// NSLog(@"C(%d,%p..%p)[%@]", pWide, bStart, b, logged);
recurseDraw(bStart, glyphs, p, choppedLength, context, fontWithTraits, _fontLookupCache, _usesLigatures);
UniCharCount step = pWide ? choppedLength / 2 : choppedLength;
p += step;
g += step;
bStart = b;
}
pWide = wide;
b++;
}
if (bStart < bEnd) {
choppedLength = b - bStart;
// NSString *logged = [NSString stringWithCharacters:bStart length:choppedLength];
// NSLog(@"T(%d,%p..%p)[%@]", pWide, bStart, b, logged);
recurseDraw(bStart, glyphs, p, choppedLength, context, fontWithTraits, _fontLookupCache, _usesLigatures);
}
// NSLog(@"S(-,%p..%p)[%@]", unichars, unichars + unilength, string);
CFRelease(fontWithTraits);
free(glyphs);

4
SwiftNeoVimTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-218</string>
<string>SNAPSHOT-219</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>218</string>
<string>219</string>
</dict>
</plist>

4
VimR-Workspace-Demo/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-218</string>
<string>SNAPSHOT-219</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>218</string>
<string>219</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
VimR.xcodeproj/project.pbxproj
View File

@ -1803,7 +1803,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 218;
DYLIB_CURRENT_VERSION = 219;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1828,7 +1828,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 218;
DYLIB_CURRENT_VERSION = 219;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -2065,7 +2065,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 218;
CURRENT_PROJECT_VERSION = 219;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -2115,7 +2115,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 218;
CURRENT_PROJECT_VERSION = 219;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

4
VimR/Info.plist
View File

@ -32,7 +32,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-218</string>
<string>SNAPSHOT-219</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -49,7 +49,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>218</string>
<string>219</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

78
VimR/markdown/github-markdown.css
View File

@ -8,37 +8,37 @@
-webkit-text-size-adjust: 100%;
line-height: 1.5;
color: #24292e;
font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 16px;
line-height: 1.5;
word-wrap: break-word;
}
.markdown-body .pl-c {
color: #969896;
color: #6a737d;
}
.markdown-body .pl-c1,
.markdown-body .pl-s .pl-v {
color: #0086b3;
color: #005cc5;
}
.markdown-body .pl-e,
.markdown-body .pl-en {
color: #795da3;
color: #6f42c1;
}
.markdown-body .pl-smi,
.markdown-body .pl-s .pl-s1 {
color: #333;
color: #24292e;
}
.markdown-body .pl-ent {
color: #63a35c;
color: #22863a;
}
.markdown-body .pl-k {
color: #a71d5d;
color: #d73a49;
}
.markdown-body .pl-s,
@ -48,26 +48,26 @@
.markdown-body .pl-sr .pl-cce,
.markdown-body .pl-sr .pl-sre,
.markdown-body .pl-sr .pl-sra {
color: #183691;
color: #032f62;
}
.markdown-body .pl-v,
.markdown-body .pl-smw {
color: #ed6a43;
color: #e36209;
}
.markdown-body .pl-bu {
color: #b52a1d;
color: #b31d28;
}
.markdown-body .pl-ii {
color: #f8f8f8;
background-color: #b52a1d;
color: #fafbfc;
background-color: #b31d28;
}
.markdown-body .pl-c2 {
color: #f8f8f8;
background-color: #b52a1d;
color: #fafbfc;
background-color: #d73a49;
}
.markdown-body .pl-c2::before {
@ -76,74 +76,66 @@
.markdown-body .pl-sr .pl-cce {
font-weight: bold;
color: #63a35c;
color: #22863a;
}
.markdown-body .pl-ml {
color: #693a17;
color: #735c0f;
}
.markdown-body .pl-mh,
.markdown-body .pl-mh .pl-en,
.markdown-body .pl-ms {
font-weight: bold;
color: #1d3e81;
}
.markdown-body .pl-mq {
color: #008080;
color: #005cc5;
}
.markdown-body .pl-mi {
font-style: italic;
color: #333;
color: #24292e;
}
.markdown-body .pl-mb {
font-weight: bold;
color: #333;
color: #24292e;
}
.markdown-body .pl-md {
color: #bd2c00;
background-color: #ffecec;
color: #b31d28;
background-color: #ffeef0;
}
.markdown-body .pl-mi1 {
color: #55a532;
background-color: #eaffea;
color: #22863a;
background-color: #f0fff4;
}
.markdown-body .pl-mc {
color: #ef9700;
background-color: #ffe3b4;
color: #e36209;
background-color: #ffebda;
}
.markdown-body .pl-mi2 {
color: #d8d8d8;
background-color: #808080;
color: #f6f8fa;
background-color: #005cc5;
}
.markdown-body .pl-mdr {
font-weight: bold;
color: #795da3;
}
.markdown-body .pl-mo {
color: #1d3e81;
color: #6f42c1;
}
.markdown-body .pl-ba {
color: #595e62;
color: #586069;
}
.markdown-body .pl-sg {
color: #c0c0c0;
color: #959da5;
}
.markdown-body .pl-corl {
text-decoration: underline;
color: #183691;
color: #032f62;
}
.markdown-body .octicon {
@ -677,11 +669,11 @@
line-height: 10px;
color: #444d56;
vertical-align: middle;
background-color: #fcfcfc;
border: solid 1px #c6cbd1;
border-bottom-color: #959da5;
background-color: #fafbfc;
border: solid 1px #d1d5da;
border-bottom-color: #c6cbd1;
border-radius: 3px;
box-shadow: inset 0 -1px 0 #959da5;
box-shadow: inset 0 -1px 0 #c6cbd1;
}
.markdown-body :checked+.radio-label {

4
VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-218</string>
<string>SNAPSHOT-219</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>218</string>
<string>219</string>
</dict>
</plist>

24
appcast_snapshot.xml
View File

@ -7,22 +7,30 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>SNAPSHOT-218</title>
<title>SNAPSHOT-219</title>
<description><![CDATA[
<ul>
<li>GH-492: Improve <code>Control</code> key handling: e.g. <code>Ctrl-6</code> works now. (thanks @nhtzr for the PR)</li>
<li>GH-482, GH-283 Improve Emoji + CJK + Greek text rendering. (thanks @nhtzr for the PR)</li>
<li>Dependencies updates:<ul>
<li>ReactiveX/RxSwift@3.6.1</li>
<li>sparkle-project/Sparkle@1.18.1</li>
<li>sindresorhus/github-markdown-css@2.8.0</li>
<li>Quick/Nimble@7.0.1</li>
</ul>
</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/snapshot/218
https://github.com/qvacua/vimr/releases/tag/snapshot/219
</releaseNotesLink>
<pubDate>2017-08-16T17:50:59.561679</pubDate>
<pubDate>2017-08-17T08:59:02.471009</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/218/VimR-SNAPSHOT-218.tar.bz2"
sparkle:version="218"
sparkle:shortVersionString="SNAPSHOT-218"
sparkle:dsaSignature="MC4CFQDe/hsRbcyet99lbrWnixj3UtYilwIVAIghLm6PmfF/jwnepWgzch3HwSPf"
length="10703484"
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/219/VimR-SNAPSHOT-219.tar.bz2"
sparkle:version="219"
sparkle:shortVersionString="SNAPSHOT-219"
sparkle:dsaSignature="MC4CFQCMZ5FoxgdwmGJ5tQlv5D10kOcBXAIVAN7+bZB4LHB/wd0K2WAp14zWjqVz"
length="10709960"
type="application/octet-stream"/>
</item>
</channel>

7
resources/release-notes.md
View File

@ -1,7 +1,12 @@
# next
* GH-492: Improve `Control` key handling: e.g. `Ctrl-6` works now. (thanks @nhtzr for the PR)
* ...
* GH-482, GH-283 Improve Emoji + CJK + Greek text rendering. (thanks @nhtzr for the PR)
* Dependencies updates:
- ReactiveX/RxSwift@3.6.1
- sparkle-project/Sparkle@1.18.1
- sindresorhus/github-markdown-css@2.8.0
- Quick/Nimble@7.0.1
# 0.18.0-217