Skip to content

Commit 465147f

Browse files
committed
First release compiled as a universal binary.
New features: - universal binary (but not yet tested on Apple Silicon M1). - add support for `edu.uo.texshop.tex` UTI used by `.tex` files. - `highlight` updated to version 3.59 compiled as universal binary with `lua` 5.4.1 statically linked. - The embedded `lua` library used by the main application is upgraded to version 5.4.1. Bugfix: - fixed a bug for the missing preview in html mode on the settings window. - predefined output mode set to `.rtf` (less expansive that html).
1 parent 83e9952 commit 465147f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+517
-122
lines changed

Application/AppearanceView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class AppearanceView: NSView {
7373
}
7474
}
7575

76-
var renderMode: SCSHBaseSettings.Format = .html {
76+
var renderMode: SCSHBaseSettings.Format = SCSHGlobalBaseSettings.preferredFormat {
7777
didSet {
7878
styleCheckbox.isEnabled = renderMode == .html
7979
styleLabel.isEnabled = renderMode == .html
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.

Application/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
11
{
22
"images" : [
33
{
4-
"filename" : "AppIcon16.png",
54
"idiom" : "mac",
65
"scale" : "1x",
76
"size" : "16x16"
87
},
98
{
10-
"filename" : "AppIcon32-1.png",
9+
"filename" : "Icon-MacOS-16x16@2x.png",
1110
"idiom" : "mac",
1211
"scale" : "2x",
1312
"size" : "16x16"
1413
},
1514
{
16-
"filename" : "AppIcon32.png",
15+
"filename" : "Icon-MacOS-16x16@2x-1.png",
1716
"idiom" : "mac",
1817
"scale" : "1x",
1918
"size" : "32x32"
2019
},
2120
{
22-
"filename" : "AppIcon64.png",
21+
"filename" : "Icon-MacOS-32x32@2x.png",
2322
"idiom" : "mac",
2423
"scale" : "2x",
2524
"size" : "32x32"
2625
},
2726
{
28-
"filename" : "AppIcon128.png",
27+
"filename" : "Icon-MacOS-128x128@1x.png",
2928
"idiom" : "mac",
3029
"scale" : "1x",
3130
"size" : "128x128"
3231
},
3332
{
34-
"filename" : "AppIcon256-1.png",
33+
"filename" : "Icon-MacOS-128x128@2x.png",
3534
"idiom" : "mac",
3635
"scale" : "2x",
3736
"size" : "128x128"
3837
},
3938
{
40-
"filename" : "AppIcon256.png",
39+
"filename" : "Icon-MacOS-128x128@2x-1.png",
4140
"idiom" : "mac",
4241
"scale" : "1x",
4342
"size" : "256x256"
4443
},
4544
{
46-
"filename" : "AppIcon512-1.png",
45+
"filename" : "Icon-MacOS-256x256@2x-1.png",
4746
"idiom" : "mac",
4847
"scale" : "2x",
4948
"size" : "256x256"
5049
},
5150
{
52-
"filename" : "AppIcon512.png",
51+
"filename" : "Icon-MacOS-256x256@2x.png",
5352
"idiom" : "mac",
5453
"scale" : "1x",
5554
"size" : "512x512"
5655
},
5756
{
58-
"filename" : "AppIcon1024.png",
57+
"filename" : "Icon-MacOS-512x512@2x.png",
5958
"idiom" : "mac",
6059
"scale" : "2x",
6160
"size" : "512x512"
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

Application/Base.lproj/Main.storyboard

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="KWJ-lo-l8G">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="KWJ-lo-l8G">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
6-
<plugIn identifier="com.apple.WebKit2IBPlugin" version="17156"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
6+
<plugIn identifier="com.apple.WebKit2IBPlugin" version="17506"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<scenes>
@@ -1457,7 +1457,7 @@ Gw
14571457
</customSpacing>
14581458
</stackView>
14591459
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="APR-hO-BkY">
1460-
<rect key="frame" x="0.0" y="0.0" width="232" height="16"/>
1460+
<rect key="frame" x="0.0" y="0.0" width="321" height="16"/>
14611461
<subviews>
14621462
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dxc-do-OAW">
14631463
<rect key="frame" x="0.0" y="0.0" width="16" height="16"/>
@@ -1468,8 +1468,8 @@ Gw
14681468
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSStatusPartiallyAvailable" id="C7z-I9-gvr"/>
14691469
</imageView>
14701470
<textField horizontalHuggingPriority="251" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3m0-3i-Am4">
1471-
<rect key="frame" x="16" y="1" width="218" height="14"/>
1472-
<textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" title="Supported by `highlight` but unhandled." id="zpu-ry-Yvp">
1471+
<rect key="frame" x="16" y="1" width="307" height="14"/>
1472+
<textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" title="Supported by `highlight` but unhandled by the extension." id="zpu-ry-Yvp">
14731473
<font key="font" metaFont="message" size="11"/>
14741474
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
14751475
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1699,11 +1699,11 @@ Gw
16991699
</popUpButtonCell>
17001700
<prototypeCellViews>
17011701
<tableCellView identifier="action" misplaced="YES" id="FGn-xW-9ja" customClass="ActionTableCellView" customModule="Syntax_Highlight" customModuleProvider="target">
1702-
<rect key="frame" x="0.0" y="1" width="0.0" height="18"/>
1702+
<rect key="frame" x="1" y="1" width="0.0" height="18"/>
17031703
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
17041704
<subviews>
17051705
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="rpV-Kq-3H9">
1706-
<rect key="frame" x="1" y="0.0" width="38" height="18"/>
1706+
<rect key="frame" x="0.0" y="0.0" width="38" height="18"/>
17071707
<popUpButtonCell key="cell" type="inline" bezelStyle="inline" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="9eP-a6-Kp4">
17081708
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
17091709
<font key="font" metaFont="smallSystemBold"/>
@@ -1812,10 +1812,10 @@ Gw
18121812
<autoresizingMask key="autoresizingMask"/>
18131813
<subviews>
18141814
<box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="7r5-6M-ONG">
1815-
<rect key="frame" x="258" y="0.0" width="5" height="395"/>
1815+
<rect key="frame" x="258" y="0.0" width="5" height="387"/>
18161816
</box>
18171817
<visualEffectView blendingMode="behindWindow" material="underWindowBackground" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kpv-4y-tiy">
1818-
<rect key="frame" x="0.0" y="0.0" width="260" height="395"/>
1818+
<rect key="frame" x="0.0" y="0.0" width="260" height="387"/>
18191819
<subviews>
18201820
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="G4d-Ud-cTN">
18211821
<rect key="frame" x="0.0" y="28" width="260" height="5"/>
@@ -1904,13 +1904,13 @@ Gw
19041904
</customSpacing>
19051905
</stackView>
19061906
<scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="103" horizontalPageScroll="10" verticalLineScroll="103" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="niQ-bu-HDe">
1907-
<rect key="frame" x="0.0" y="31" width="260" height="364"/>
1907+
<rect key="frame" x="0.0" y="31" width="260" height="356"/>
19081908
<clipView key="contentView" drawsBackground="NO" id="AxT-XV-sDg">
1909-
<rect key="frame" x="0.0" y="0.0" width="260" height="364"/>
1909+
<rect key="frame" x="0.0" y="0.0" width="260" height="356"/>
19101910
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19111911
<subviews>
19121912
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="100" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="8" autosaveExpandedItems="YES" outlineTableColumn="ROQ-Ow-FIV" id="gqF-5q-802">
1913-
<rect key="frame" x="0.0" y="0.0" width="260" height="364"/>
1913+
<rect key="frame" x="0.0" y="0.0" width="260" height="356"/>
19141914
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19151915
<size key="intercellSpacing" width="2" height="3"/>
19161916
<color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2026,15 +2026,15 @@ Gw
20262026
</constraints>
20272027
</visualEffectView>
20282028
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="H2K-EL-2Mr">
2029-
<rect key="frame" x="405" y="205" width="56" height="16"/>
2029+
<rect key="frame" x="405" y="201" width="56" height="16"/>
20302030
<textFieldCell key="cell" lineBreakMode="clipping" enabled="NO" alignment="center" title="Preview" id="Txd-rC-BU1">
20312031
<font key="font" usesAppearanceFont="YES"/>
20322032
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
20332033
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
20342034
</textFieldCell>
20352035
</textField>
20362036
<wkWebView wantsLayer="YES" allowsLinkPreview="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EpR-xA-UXw">
2037-
<rect key="frame" x="261" y="31" width="344" height="364"/>
2037+
<rect key="frame" x="261" y="31" width="344" height="356"/>
20382038
<wkWebViewConfiguration key="configuration" suppressesIncrementalRendering="YES">
20392039
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
20402040
<wkPreferences key="preferences" javaScriptCanOpenWindowsAutomatically="NO"/>
@@ -2088,19 +2088,19 @@ Gw
20882088
</customSpacing>
20892089
</stackView>
20902090
<box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="tpy-nX-jLP">
2091-
<rect key="frame" x="603" y="0.0" width="5" height="395"/>
2091+
<rect key="frame" x="603" y="0.0" width="5" height="387"/>
20922092
<constraints>
20932093
<constraint firstAttribute="width" constant="1" id="mZv-AU-9VY"/>
20942094
</constraints>
20952095
</box>
20962096
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="25" horizontalPageScroll="10" verticalLineScroll="25" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZnV-SA-vVd">
2097-
<rect key="frame" x="606" y="30" width="299" height="365"/>
2097+
<rect key="frame" x="606" y="30" width="299" height="357"/>
20982098
<clipView key="contentView" drawsBackground="NO" id="pq8-mb-WNU">
2099-
<rect key="frame" x="0.0" y="0.0" width="299" height="365"/>
2099+
<rect key="frame" x="0.0" y="0.0" width="299" height="357"/>
21002100
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
21012101
<subviews>
21022102
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="23" viewBased="YES" floatsGroupRows="NO" id="Kti-Pv-Clb">
2103-
<rect key="frame" x="0.0" y="0.0" width="299" height="365"/>
2103+
<rect key="frame" x="0.0" y="0.0" width="299" height="357"/>
21042104
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
21052105
<size key="intercellSpacing" width="3" height="2"/>
21062106
<color key="backgroundColor" red="0.11764705882352941" green="0.11764705882352941" blue="0.11764705882352941" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>

Application/ExtraSettingsView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ExtraSettingsView: NSView {
6969
}
7070
}
7171

72-
var renderMode: SCSHBaseSettings.Format = .html {
72+
var renderMode: SCSHBaseSettings.Format = SCSHGlobalBaseSettings.preferredFormat {
7373
didSet {
7474
interactiveCheckbox.isEnabled = (isGlobal || interpretsCheckbox.state == .on) && renderMode == .html
7575
interactiveSwitch.isEnabled = interactiveCheckbox.isEnabled

Application/Info.plist

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,9 @@
271271
<key>public.filename-extension</key>
272272
<array>
273273
<string>vb</string>
274+
<string>bas</string>
275+
<string>basic</string>
276+
<string>vbs</string>
274277
</array>
275278
</dict>
276279
</dict>
@@ -649,10 +652,10 @@
649652
<string>dyn.ah62d4rv4ge80y5a</string>
650653
<string>public.data</string>
651654
</array>
652-
<key>UTTypeIdentifier</key>
653-
<string>org.julialang.julia</string>
654655
<key>UTTypeDescription</key>
655656
<string>Julia source file</string>
657+
<key>UTTypeIdentifier</key>
658+
<string>org.julialang.julia</string>
656659
<key>UTTypeTagSpecification</key>
657660
<dict>
658661
<key>public.filename-extension</key>
@@ -1479,6 +1482,24 @@
14791482
</array>
14801483
<key>UTImportedTypeDeclarations</key>
14811484
<array>
1485+
<dict>
1486+
<key>UTTypeConformsTo</key>
1487+
<array>
1488+
<string>public.xml</string>
1489+
<string>dyn.ah62d4rv4ge81g3pvsy</string>
1490+
</array>
1491+
<key>UTTypeDescription</key>
1492+
<string>Adobe Acrobat Sequence</string>
1493+
<key>UTTypeIdentifier</key>
1494+
<string>com.adobe.acrobat.sequ</string>
1495+
<key>UTTypeTagSpecification</key>
1496+
<dict>
1497+
<key>public.filename-extension</key>
1498+
<array>
1499+
<string>sequ</string>
1500+
</array>
1501+
</dict>
1502+
</dict>
14821503
<dict>
14831504
<key>UTTypeConformsTo</key>
14841505
<array>
@@ -1551,6 +1572,27 @@
15511572
</array>
15521573
</dict>
15531574
</dict>
1575+
<dict>
1576+
<key>UTTypeConformsTo</key>
1577+
<array>
1578+
<string>public.plain-text</string>
1579+
</array>
1580+
<key>UTTypeDescription</key>
1581+
<string>TeX File</string>
1582+
<key>UTTypeIdentifier</key>
1583+
<string>edu.uo.texshop.tex</string>
1584+
<key>UTTypeTagSpecification</key>
1585+
<dict>
1586+
<key>public.filename-extension</key>
1587+
<array>
1588+
<string>tex</string>
1589+
</array>
1590+
<key>public.mime-type</key>
1591+
<array>
1592+
<string>application/x-tex</string>
1593+
</array>
1594+
</dict>
1595+
</dict>
15541596
<dict>
15551597
<key>UTTypeConformsTo</key>
15561598
<array>
@@ -1588,10 +1630,10 @@
15881630
</dict>
15891631
</dict>
15901632
<dict>
1591-
<key>UTTypeIdentifier</key>
1592-
<string>dyn.ah62d4rv4ge81a8p</string>
15931633
<key>UTTypeDescription</key>
15941634
<string>Python Bytecode Document</string>
1635+
<key>UTTypeIdentifier</key>
1636+
<string>dyn.ah62d4rv4ge81a8p</string>
15951637
<key>UTTypeTagSpecification</key>
15961638
<dict>
15971639
<key>public.filename-extension</key>

Application/PreferencesViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,9 +418,9 @@ class PreferencesViewController: NSViewController {
418418
/// Initialize gui elements with current global settings.
419419
private func populateSettings() {
420420
// HTML/RTF format
421-
self.appearanceView.renderMode = self.settings?.format ?? .html
422-
self.extraSettingsView.renderMode = self.settings?.format ?? .html
423-
self.previewView.renderMode = self.settings?.format ?? .html
421+
self.appearanceView.renderMode = self.settings?.format ?? SCSHGlobalBaseSettings.preferredFormat
422+
self.extraSettingsView.renderMode = self.settings?.format ?? SCSHGlobalBaseSettings.preferredFormat
423+
self.previewView.renderMode = self.settings?.format ?? SCSHGlobalBaseSettings.preferredFormat
424424

425425
initialized = true
426426

Application/PreviewView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class PreviewView: NSView {
6363
@IBOutlet weak var textView: NSTextView!
6464
@IBOutlet weak var customMenuItem: NSMenuItem!
6565

66-
var renderMode: SCSHBaseSettings.Format = .html {
66+
var renderMode: SCSHBaseSettings.Format = SCSHGlobalBaseSettings.preferredFormat {
6767
didSet {
6868
webView.isHidden = renderMode == .rtf
6969
scrollView.isHidden = !webView.isHidden
@@ -221,7 +221,7 @@ class PreviewView: NSView {
221221
if let url = example {
222222
/// Show a file.
223223
if custom_settings.format == .html {
224-
webView.loadHTMLString("<html><body><p>Waiting…</p></body></html>", baseURL: nil)
224+
webView.loadHTMLString("<html><body><p style='font-family: -apple-system; font-size: 10pt'>Waiting…</p></body></html>", baseURL: nil)
225225
//DispatchQueue.global(qos: .default).async {
226226
self.service?.htmlColorize(url: url, settings: custom_settings.toDictionary() as NSDictionary) { (html, extra, error) in
227227
DispatchQueue.main.async {

0 commit comments

Comments
 (0)