Compare commits
5 Commits
b12cdb2cd1
...
6a8d07c22b
| Author | SHA1 | Date |
|---|---|---|
 Samuel Zielke
|
6a8d07c22b | 2 weeks ago |
|
Samuel Zielke
|
9ba821ecb2 | 2 weeks ago |
|
Samuel Zielke
|
c7fcd670cc | 2 weeks ago |
|
Samuel Zielke
|
4276d6feb3 | 2 weeks ago |
|
Samuel Zielke
|
8547621cac | 2 weeks ago |
@ -0,0 +1,33 @@
|
||||
import AppKit
|
||||
import UniformTypeIdentifiers
|
||||
|
||||
enum FileImport {
|
||||
/// Dateiauswahl für Videos, startet im Quellordner. Leer = abgebrochen.
|
||||
@MainActor
|
||||
static func chooseVideos(startingAt sourceFolder: URL?) -> [URL] {
|
||||
let panel = NSOpenPanel()
|
||||
panel.allowsMultipleSelection = true
|
||||
panel.canChooseDirectories = false
|
||||
panel.canChooseFiles = true
|
||||
panel.allowedContentTypes = [.movie, .quickTimeMovie, .mpeg4Movie]
|
||||
if let sourceFolder { panel.directoryURL = sourceFolder }
|
||||
guard panel.runModal() == .OK else { return [] }
|
||||
return panel.urls
|
||||
}
|
||||
|
||||
/// Liest die Datei-URLs aus einem Drop und liefert sie gesammelt auf dem Main-Thread.
|
||||
static func loadURLs(from providers: [NSItemProvider], completion: @escaping ([URL]) -> Void) {
|
||||
let group = DispatchGroup()
|
||||
var urls: [URL] = []
|
||||
for provider in providers {
|
||||
group.enter()
|
||||
_ = provider.loadObject(ofClass: URL.self) { url, _ in
|
||||
if let url {
|
||||
DispatchQueue.main.async { urls.append(url) }
|
||||
}
|
||||
group.leave()
|
||||
}
|
||||
}
|
||||
group.notify(queue: .main) { completion(urls) }
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
import AppKit
|
||||
|
||||
enum FolderPicker {
|
||||
/// Ordnerauswahl, startet bei `current`. nil = abgebrochen.
|
||||
@MainActor
|
||||
static func choose(startingAt current: URL?, prompt: String = String(localized: "Wählen")) -> URL? {
|
||||
let panel = NSOpenPanel()
|
||||
panel.canChooseDirectories = true
|
||||
panel.canChooseFiles = false
|
||||
panel.canCreateDirectories = true
|
||||
panel.allowsMultipleSelection = false
|
||||
panel.prompt = prompt
|
||||
if let current { panel.directoryURL = current }
|
||||
guard panel.runModal() == .OK else { return nil }
|
||||
return panel.url
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
import AppKit
|
||||
import SwiftUI
|
||||
|
||||
/// Gestaltung: ein normales Mac-Fenster in Systemfarben. Gold ist der einzige
|
||||
/// Akzent (README, "Gestaltung") und markiert nur zwei Dinge: die Hauptaktion
|
||||
/// und den Ausschnitt.
|
||||
extension Color {
|
||||
/// #C8A96A im Dunkeln; im Hellen dunkler, damit Text darauf lesbar bleibt.
|
||||
static let gold = Color(nsColor: NSColor(name: nil) { appearance in
|
||||
appearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua
|
||||
? NSColor(srgbRed: 0.784, green: 0.663, blue: 0.416, alpha: 1)
|
||||
: NSColor(srgbRed: 0.604, green: 0.482, blue: 0.235, alpha: 1)
|
||||
})
|
||||
/// Schrift auf Gold: dunkel auf hellem Gold, weiß auf dunklem Gold.
|
||||
static let onGold = Color(nsColor: NSColor(name: nil) { appearance in
|
||||
appearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua
|
||||
? NSColor(srgbRed: 0.043, green: 0.043, blue: 0.047, alpha: 1)
|
||||
: .white
|
||||
})
|
||||
static let attention = Color(nsColor: .systemOrange)
|
||||
}
|
||||
|
||||
/// Die eine Hauptaktion eines Fensters (Start, Übernehmen).
|
||||
struct ProminentButtonStyle: ButtonStyle {
|
||||
@Environment(\.isEnabled) private var isEnabled
|
||||
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
configuration.label
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.foregroundStyle(isEnabled ? Color.onGold : Color.secondary)
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 4)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 6, style: .continuous)
|
||||
.fill(isEnabled ? Color.gold.opacity(configuration.isPressed ? 0.8 : 1) : Color.secondary.opacity(0.15))
|
||||
)
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
import Combine
|
||||
import Sparkle
|
||||
|
||||
/// Sparkle-Updates gegen `SUFeedURL` aus der Info.plist: automatische Prüfung
|
||||
/// im Hintergrund plus „Nach Updates suchen …“ im App-Menü.
|
||||
final class Updater: ObservableObject {
|
||||
@Published private(set) var canCheckForUpdates = false
|
||||
|
||||
private let controller = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
|
||||
private var cancellable: AnyCancellable?
|
||||
|
||||
init() {
|
||||
cancellable = controller.updater.publisher(for: \.canCheckForUpdates)
|
||||
.receive(on: DispatchQueue.main)
|
||||
.sink { [weak self] in self?.canCheckForUpdates = $0 }
|
||||
}
|
||||
|
||||
func checkForUpdates() {
|
||||
controller.checkForUpdates(nil)
|
||||
}
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
import SwiftUI
|
||||
import UniformTypeIdentifiers
|
||||
|
||||
struct DropZoneView: View {
|
||||
@EnvironmentObject private var settings: AppSettings
|
||||
@EnvironmentObject private var coordinator: ConversionCoordinator
|
||||
@State private var isTargeted = false
|
||||
|
||||
var body: some View {
|
||||
VStack(spacing: 12) {
|
||||
Image(systemName: "arrow.down.doc")
|
||||
.font(.system(size: 36))
|
||||
.foregroundStyle(.secondary)
|
||||
Text("9:16-Dateien hierher ziehen")
|
||||
.font(.headline)
|
||||
Button("Datei(en) wählen…", action: chooseFiles)
|
||||
}
|
||||
.frame(maxWidth: .infinity, minHeight: 140)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 12)
|
||||
.strokeBorder(style: StrokeStyle(lineWidth: 2, dash: [6]))
|
||||
.foregroundStyle(isTargeted ? Color.accentColor : Color.secondary.opacity(0.35))
|
||||
)
|
||||
.onDrop(of: [.fileURL], isTargeted: $isTargeted, perform: handleDrop)
|
||||
}
|
||||
|
||||
private func chooseFiles() {
|
||||
let panel = NSOpenPanel()
|
||||
panel.allowsMultipleSelection = true
|
||||
panel.canChooseDirectories = false
|
||||
panel.canChooseFiles = true
|
||||
panel.allowedContentTypes = [.movie, .quickTimeMovie, .mpeg4Movie]
|
||||
if let sourceFolder = settings.sourceFolder {
|
||||
panel.directoryURL = sourceFolder
|
||||
}
|
||||
guard panel.runModal() == .OK else { return }
|
||||
coordinator.addFiles(panel.urls)
|
||||
}
|
||||
|
||||
private func handleDrop(providers: [NSItemProvider]) -> Bool {
|
||||
guard !providers.isEmpty else { return false }
|
||||
let group = DispatchGroup()
|
||||
var urls: [URL] = []
|
||||
for provider in providers {
|
||||
group.enter()
|
||||
_ = provider.loadObject(ofClass: URL.self) { url, _ in
|
||||
if let url { urls.append(url) }
|
||||
group.leave()
|
||||
}
|
||||
}
|
||||
group.notify(queue: .main) {
|
||||
coordinator.addFiles(urls)
|
||||
}
|
||||
return true
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
import CoreGraphics
|
||||
import Foundation
|
||||
|
||||
/// Wo der 4:5-Ausschnitt über die Laufzeit eines Clips sitzt. Eine Liste von
|
||||
/// Positionsmarken: jede Marke gilt ab ihrem Zeitpunkt bis zur nächsten —
|
||||
/// harte Schnitte, keine Kamerafahrt dazwischen. Gedacht für Clips mit ein,
|
||||
/// zwei Szenen, in denen das Framing jeweils anders sitzen muss.
|
||||
///
|
||||
/// Invariante: Es gibt immer mindestens eine Marke, und die erste liegt bei 0.
|
||||
/// Ein Plan mit genau einer Marke ist damit schlicht ein fester Offset für
|
||||
/// die ganze Datei.
|
||||
public struct CropPlan: Equatable, Sendable {
|
||||
public struct Keyframe: Equatable, Sendable, Identifiable {
|
||||
public let id: UUID
|
||||
/// Sekunden ab Clip-Beginn.
|
||||
public var time: Double
|
||||
/// -1 = Ausschnitt ganz oben, 0 = mittig, 1 = ganz unten.
|
||||
public var offset: CGFloat
|
||||
|
||||
public init(id: UUID = UUID(), time: Double, offset: CGFloat) {
|
||||
self.id = id
|
||||
self.time = time
|
||||
self.offset = offset
|
||||
}
|
||||
}
|
||||
|
||||
/// Zwei Marken näher beieinander als das gelten als dieselbe Stelle.
|
||||
/// Fängt auch Rundungsrauschen zwischen Player-Zeit und Frame-PTS ab.
|
||||
public static let timeTolerance: Double = 0.001
|
||||
|
||||
public private(set) var keyframes: [Keyframe]
|
||||
|
||||
public init(offset: CGFloat = 0) {
|
||||
keyframes = [Keyframe(time: 0, offset: Self.clamp(offset))]
|
||||
}
|
||||
|
||||
/// Baut einen Plan aus beliebigen Marken: sortiert, Offsets geklemmt, die
|
||||
/// früheste Marke auf 0 gezogen. Leere Liste = mittig.
|
||||
public init(keyframes: [Keyframe]) {
|
||||
var sorted = keyframes
|
||||
.map { Keyframe(id: $0.id, time: max($0.time, 0), offset: Self.clamp($0.offset)) }
|
||||
.sorted { $0.time < $1.time }
|
||||
if sorted.isEmpty {
|
||||
sorted = [Keyframe(time: 0, offset: 0)]
|
||||
}
|
||||
sorted[0].time = 0
|
||||
self.keyframes = sorted
|
||||
}
|
||||
|
||||
/// true = mittig, keine Marken — also genau das bisherige Verhalten.
|
||||
public var isDefault: Bool {
|
||||
keyframes.count == 1 && keyframes[0].offset == 0
|
||||
}
|
||||
|
||||
/// Index der Marke, die zum Zeitpunkt `seconds` gilt.
|
||||
public func keyframeIndex(at seconds: Double) -> Int {
|
||||
keyframes.lastIndex { $0.time <= seconds + Self.timeTolerance } ?? 0
|
||||
}
|
||||
|
||||
public func offset(at seconds: Double) -> CGFloat {
|
||||
keyframes[keyframeIndex(at: seconds)].offset
|
||||
}
|
||||
|
||||
/// Verschiebt den Ausschnitt der Marke, die zum Zeitpunkt `seconds` gilt —
|
||||
/// also des ganzen Abschnitts bis zur nächsten Marke.
|
||||
public mutating func setOffset(_ offset: CGFloat, at seconds: Double) {
|
||||
keyframes[keyframeIndex(at: seconds)].offset = Self.clamp(offset)
|
||||
}
|
||||
|
||||
/// Setzt eine neue Marke bei `seconds`; sie übernimmt den Offset, der dort
|
||||
/// bisher galt, damit sich am Bild erst mal nichts ändert. Liegt dort schon
|
||||
/// eine Marke, passiert nichts.
|
||||
@discardableResult
|
||||
public mutating func addKeyframe(at seconds: Double) -> Keyframe? {
|
||||
let time = max(seconds, 0)
|
||||
guard !keyframes.contains(where: { abs($0.time - time) <= Self.timeTolerance }) else {
|
||||
return nil
|
||||
}
|
||||
let keyframe = Keyframe(time: time, offset: offset(at: time))
|
||||
keyframes.append(keyframe)
|
||||
keyframes.sort { $0.time < $1.time }
|
||||
return keyframe
|
||||
}
|
||||
|
||||
/// Die erste Marke (bei 0) bleibt immer erhalten.
|
||||
public mutating func removeKeyframe(id: Keyframe.ID) {
|
||||
guard let index = keyframes.firstIndex(where: { $0.id == id }), index > 0 else { return }
|
||||
keyframes.remove(at: index)
|
||||
}
|
||||
|
||||
private static func clamp(_ offset: CGFloat) -> CGFloat {
|
||||
min(max(offset, -1), 1)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
import XCTest
|
||||
@testable import DropTwoCore
|
||||
|
||||
final class CropPlanTests: XCTestCase {
|
||||
func testDefaultPlanIsCenteredWithSingleKeyframe() {
|
||||
let plan = CropPlan()
|
||||
|
||||
XCTAssertTrue(plan.isDefault)
|
||||
XCTAssertEqual(plan.keyframes.count, 1)
|
||||
XCTAssertEqual(plan.offset(at: 0), 0)
|
||||
XCTAssertEqual(plan.offset(at: 100), 0)
|
||||
}
|
||||
|
||||
func testOffsetIsClamped() {
|
||||
XCTAssertEqual(CropPlan(offset: 3).offset(at: 0), 1)
|
||||
XCTAssertEqual(CropPlan(offset: -3).offset(at: 0), -1)
|
||||
}
|
||||
|
||||
func testKeyframeHoldsUntilNextOne() {
|
||||
var plan = CropPlan(offset: -1)
|
||||
plan.addKeyframe(at: 2)
|
||||
plan.setOffset(1, at: 2)
|
||||
|
||||
XCTAssertEqual(plan.offset(at: 0), -1)
|
||||
XCTAssertEqual(plan.offset(at: 1.99), -1)
|
||||
XCTAssertEqual(plan.offset(at: 2), 1)
|
||||
XCTAssertEqual(plan.offset(at: 10), 1)
|
||||
XCTAssertFalse(plan.isDefault)
|
||||
}
|
||||
|
||||
func testNewKeyframeTakesOverCurrentOffset() {
|
||||
var plan = CropPlan(offset: 0.4)
|
||||
let keyframe = plan.addKeyframe(at: 3)
|
||||
|
||||
XCTAssertEqual(keyframe?.offset, 0.4)
|
||||
}
|
||||
|
||||
func testKeyframeAtExistingTimeIsIgnored() {
|
||||
var plan = CropPlan()
|
||||
plan.addKeyframe(at: 2)
|
||||
|
||||
XCTAssertNil(plan.addKeyframe(at: 2.0005))
|
||||
XCTAssertNil(plan.addKeyframe(at: 0))
|
||||
XCTAssertEqual(plan.keyframes.count, 2)
|
||||
}
|
||||
|
||||
func testKeyframesStaySorted() {
|
||||
var plan = CropPlan()
|
||||
plan.addKeyframe(at: 5)
|
||||
plan.addKeyframe(at: 1)
|
||||
plan.addKeyframe(at: 3)
|
||||
|
||||
XCTAssertEqual(plan.keyframes.map(\.time), [0, 1, 3, 5])
|
||||
}
|
||||
|
||||
func testFirstKeyframeCannotBeRemoved() {
|
||||
var plan = CropPlan()
|
||||
let second = plan.addKeyframe(at: 2)!
|
||||
|
||||
plan.removeKeyframe(id: plan.keyframes[0].id)
|
||||
XCTAssertEqual(plan.keyframes.count, 2)
|
||||
|
||||
plan.removeKeyframe(id: second.id)
|
||||
XCTAssertEqual(plan.keyframes.count, 1)
|
||||
}
|
||||
|
||||
func testInitFromKeyframesPullsEarliestToZero() {
|
||||
let plan = CropPlan(keyframes: [
|
||||
.init(time: 4, offset: 1),
|
||||
.init(time: 1.5, offset: -1)
|
||||
])
|
||||
|
||||
XCTAssertEqual(plan.keyframes.map(\.time), [0, 4])
|
||||
XCTAssertEqual(plan.offset(at: 0), -1)
|
||||
}
|
||||
|
||||
func testToleranceAbsorbsPlayerRoundingNoise() {
|
||||
var plan = CropPlan()
|
||||
plan.addKeyframe(at: 1.0)
|
||||
plan.setOffset(1, at: 1.0)
|
||||
|
||||
// Frame-PTS minimal vor der Marke, wie es aus CMTime-Rundung kommt.
|
||||
XCTAssertEqual(plan.offset(at: 0.9999), 1)
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,192 @@
|
||||
Kanit
|
||||
=====
|
||||
Copyright 2020 The Kanit Project Authors (https://github.com/cadsondemak/kanit)
|
||||
|
||||
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.
|
||||
|
||||
|
||||
Instrument Serif
|
||||
================
|
||||
Copyright 2022 The Instrument Serif Project Authors (https://github.com/Instrument/instrument-serif)
|
||||
|
||||
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:
|
||||
https://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.
|
||||
@ -0,0 +1,92 @@
|
||||
/* Kanit and Instrument Serif (SIL Open Font License 1.1), self-hosted:
|
||||
no requests to Google. Latin and Latin Extended only. */
|
||||
/* latin-ext */
|
||||
@font-face {
|
||||
font-family: 'Instrument Serif';
|
||||
font-style: italic;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url(InstrumentSerif-400-italic-latin-ext.woff2) format('woff2');
|
||||
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
||||
}
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Instrument Serif';
|
||||
font-style: italic;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url(InstrumentSerif-400-italic-latin.woff2) format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||
}
|
||||
/* latin-ext */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 300;
|
||||
font-display: swap;
|
||||
src: url(Kanit-300-latin-ext.woff2) format('woff2');
|
||||
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
||||
}
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 300;
|
||||
font-display: swap;
|
||||
src: url(Kanit-300-latin.woff2) format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||
}
|
||||
/* latin-ext */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url(Kanit-400-latin-ext.woff2) format('woff2');
|
||||
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
||||
}
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: swap;
|
||||
src: url(Kanit-400-latin.woff2) format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||
}
|
||||
/* latin-ext */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 500;
|
||||
font-display: swap;
|
||||
src: url(Kanit-500-latin-ext.woff2) format('woff2');
|
||||
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
||||
}
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 500;
|
||||
font-display: swap;
|
||||
src: url(Kanit-500-latin.woff2) format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||
}
|
||||
/* latin-ext */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 600;
|
||||
font-display: swap;
|
||||
src: url(Kanit-600-latin-ext.woff2) format('woff2');
|
||||
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
||||
}
|
||||
/* latin */
|
||||
@font-face {
|
||||
font-family: 'Kanit';
|
||||
font-style: normal;
|
||||
font-weight: 600;
|
||||
font-display: swap;
|
||||
src: url(Kanit-600-latin.woff2) format('woff2');
|
||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||
}
|
||||
|
After Width: | Height: | Size: 108 KiB |
Loading…
Reference in new issue