mirror of
https://github.com/xi-editor/xi-mac.git
synced 2024-10-06 03:58:19 +03:00
Bundle Inconsolata with Xi-Mac
This commit is contained in:
parent
d3fffffe33
commit
623c99c591
@ -8,6 +8,7 @@
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
28F1ED4A1EC4C735008839BE /* Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28F1ED491EC4C735008839BE /* Search.swift */; };
|
||||
4DCB4AF020576A6F00476F75 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 4DCB4AEF20576A6E00476F75 /* fonts */; };
|
||||
50370A2B1D4209F300EA1B18 /* Dispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50370A2A1D4209F300EA1B18 /* Dispatcher.swift */; };
|
||||
6038770720057B4500AABF17 /* XiDocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6038770620057B4500AABF17 /* XiDocumentController.swift */; };
|
||||
6B0C298B2033C39500EA07AF /* XiWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B0C298A2033C39500EA07AF /* XiWindow.swift */; };
|
||||
@ -71,6 +72,7 @@
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
28F1ED491EC4C735008839BE /* Search.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = "<group>"; };
|
||||
4DCB4AEF20576A6E00476F75 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fonts; sourceTree = "<group>"; };
|
||||
50370A2A1D4209F300EA1B18 /* Dispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Dispatcher.swift; sourceTree = "<group>"; };
|
||||
6038770620057B4500AABF17 /* XiDocumentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XiDocumentController.swift; sourceTree = "<group>"; };
|
||||
6B0C298A2033C39500EA07AF /* XiWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XiWindow.swift; sourceTree = "<group>"; };
|
||||
@ -143,6 +145,7 @@
|
||||
AE499DC31C82BB2B002D68AF = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
4DCB4AEF20576A6E00476F75 /* fonts */,
|
||||
D023DA021CD071B40087EC0A /* xicore */,
|
||||
AE499DCE1C82BB2B002D68AF /* XiEditor */,
|
||||
AE499DDE1C82BB2B002D68AF /* XiEditorTests */,
|
||||
@ -366,6 +369,7 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4DCB4AF020576A6F00476F75 /* fonts in Resources */,
|
||||
F53EA2AD1DCAA8110071ACFD /* Main.storyboard in Resources */,
|
||||
AE228F5D1C897CE7000E9B0F /* xi-core in Resources */,
|
||||
AED22D841FE84B4B0096E7C3 /* text.f.glsl in Resources */,
|
||||
|
@ -82,8 +82,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, XiClient {
|
||||
var dispatcher: Dispatcher?
|
||||
var documentController: XiDocumentController!
|
||||
|
||||
// This is set to 'InconsolataGo' in the user preferences; this value is a fallback.
|
||||
let fallbackFont = CTFontCreateWithName(("Menlo" as CFString?)!, 14, nil)
|
||||
// Inconsolata is included with the Xi Editor app bundle.
|
||||
let fallbackFont = CTFontCreateWithName(("Inconsolata" as CFString?)!, 14, nil)
|
||||
|
||||
lazy fileprivate var _textMetrics = TextDrawingMetrics(font: self.fallbackFont,
|
||||
textColor: self.theme.foreground)
|
||||
|
@ -45,5 +45,7 @@
|
||||
<string>Main</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
<key>ATSApplicationFontsPath</key>
|
||||
<string>fonts</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@ -61,7 +61,7 @@ class TextPlaneDemo: NSView, TextPlaneDelegate {
|
||||
renderer.drawSolidRect(x: GLfloat(dirtyRect.maxX - 10), y: GLfloat(dirtyRect.maxY - 10), width: 10, height: 10, argb: 0xff00ff00)
|
||||
|
||||
let text = "Now is the time for all good people to come to the aid of their country. This is a very long string because I really want to fill up the window and see if we can get 60Hz"
|
||||
let font = NSFont(name: "InconsolataGo", size: 14) ?? NSFont(name: "Monaco", size: 14)!
|
||||
let font = NSFont(name: "Inconsolata", size: 14) ?? NSFont(name: "Menlo", size: 14)!
|
||||
let builder = TextLineBuilder(text, font: font)
|
||||
builder.addFgSpan(range: 7..<10, argb: 0xffff0000)
|
||||
let tl = builder.build(fontCache: renderer.atlas.fontCache)
|
||||
|
BIN
fonts/Inconsolata-Bold.ttf
Executable file
BIN
fonts/Inconsolata-Bold.ttf
Executable file
Binary file not shown.
BIN
fonts/Inconsolata-Regular.ttf
Executable file
BIN
fonts/Inconsolata-Regular.ttf
Executable file
Binary file not shown.
93
fonts/OFL.txt
Executable file
93
fonts/OFL.txt
Executable file
@ -0,0 +1,93 @@
|
||||
Copyright 2006 The Inconsolata Project Authors
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
Loading…
Reference in New Issue
Block a user