Skip to content

Commit 2afa60e

Browse files
committed
Linegap fonts will be deleted upon install (#14)
1 parent e7feeb3 commit 2afa60e

File tree

3 files changed

+44
-11
lines changed

3 files changed

+44
-11
lines changed

src/Data.ini

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ UniqueID=HackWindowsInstaller
1010

1111
[Version]
1212
;Version of the Setup (*NOT* for the Font release).
13-
Version=1.4.1
13+
Version=1.4.2
1414
;This value can be overwritten by an CI tool during build like this (param EXTERNAL_VERSION):
1515
;iscc.exe /DEXTERNAL_VERSION=%APPVEYOR_BUILD_VERSION% src/YourScriptFile.iss
1616

@@ -93,7 +93,7 @@ Name.4=Hack Italic
9393
;Use this section to remove fonts upon installation, e.g. old versions of your files
9494
;that had different file names or font names. The Count for this section can be zero.
9595
[RemoveFonts]
96-
Count=4
96+
Count=8
9797

9898
;These files are left overs from Hack 2.10 which used different names for italic
9999

@@ -110,5 +110,16 @@ Name.3=Hack Bold Oblique
110110
File.4=Hack-RegularOblique.otf
111111
Name.4=Hack Oblique
112112

113+
;Remove lingegap fonts, they were causing issues for Java based programs (see https://github.com/source-foundry/Hack/issues/345)
114+
115+
File.5=Hack-Regular-linegap*.*
116+
Name.5=Hack Linegap
117+
118+
File.6=Hack-Bold-linegap*.*
119+
Name.6=Hack Bold Linegap
113120

121+
File.7=Hack-Italic-linegap*.*
122+
Name.7=Hack Italic linegap
114123

124+
File.8=Hack-BoldItalic-linegap*.*
125+
Name.8=Hack Bold Italic linegap

src/HackWindowsInstaller.iss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,10 +1013,9 @@ begin
10131013
SendBroadcastMessage(29, 0, 0);
10141014
//HWND_BROADCAST = -1
10151015
//WM_FONTCHANGE = 0x1D = 29
1016-
1017-
customProgressPage.SetText('Storing font data...','');
10181016
}
10191017
1018+
customProgressPage.SetText('Storing font data...','');
10201019
10211020
//Write the buffer to disk. We better make sure that {app} exists.
10221021
appDestinationFolder:=ExpandConstant('{app}');

src/zz_Preprocessor_Result.iss

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,22 @@
9696
; Hack-RegularOblique.otf
9797
; Hack Oblique
9898

99+
; INI position #5
100+
; Hack-Regular-linegap*.*
101+
; Hack Linegap
102+
103+
; INI position #6
104+
; Hack-Bold-linegap*.*
105+
; Hack Bold Linegap
106+
107+
; INI position #7
108+
; Hack-Italic-linegap*.*
109+
; Hack Italic linegap
110+
111+
; INI position #8
112+
; Hack-BoldItalic-linegap*.*
113+
; Hack Bold Italic linegap
114+
99115

100116

101117

@@ -136,8 +152,8 @@ SetupMutex=HackWindowsInstaller_Mutex
136152

137153
AppName=Hack Windows Installer
138154

139-
AppVersion=1.4.1
140-
VersionInfoVersion=1.4.1
155+
AppVersion=1.4.2
156+
VersionInfoVersion=1.4.2
141157

142158
AppPublisher=Michael Hex / Source Foundry
143159
AppCopyright=Copyright © 2016 Michael Hex / Source Foundry
@@ -208,7 +224,7 @@ AllowCancelDuringInstall=False
208224
SetupAppTitle=Hack Windows Installer
209225

210226
;SetupWindowsTitle is displayed in the setup window itself so we better include the version
211-
SetupWindowTitle=Hack Windows Installer 1.4.1
227+
SetupWindowTitle=Hack Windows Installer 1.4.2
212228

213229
;Messages for the "Read to install" wizard page
214230
;NOT USED - "Ready To Install" - below title bar
@@ -264,6 +280,10 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
264280
Type: files; Name: "{fonts}\Hack-RegularOblique.ttf";
265281
Type: files; Name: "{fonts}\Hack-BoldOblique.otf";
266282
Type: files; Name: "{fonts}\Hack-RegularOblique.otf";
283+
Type: files; Name: "{fonts}\Hack-Regular-linegap*.*";
284+
Type: files; Name: "{fonts}\Hack-Bold-linegap*.*";
285+
Type: files; Name: "{fonts}\Hack-Italic-linegap*.*";
286+
Type: files; Name: "{fonts}\Hack-BoldItalic-linegap*.*";
267287
;------------------------
268288

269289

@@ -274,6 +294,10 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
274294
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Oblique (TrueType)"; ValueType: none; Flags: deletevalue;
275295
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Bold Oblique (TrueType)"; ValueType: none; Flags: deletevalue;
276296
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Oblique (TrueType)"; ValueType: none; Flags: deletevalue;
297+
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Linegap (TrueType)"; ValueType: none; Flags: deletevalue;
298+
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Bold Linegap (TrueType)"; ValueType: none; Flags: deletevalue;
299+
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Italic linegap (TrueType)"; ValueType: none; Flags: deletevalue;
300+
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"; ValueName: "Hack Bold Italic linegap (TrueType)"; ValueType: none; Flags: deletevalue;
277301
;------------------------
278302

279303
;------------------------
@@ -287,7 +311,7 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
287311

288312
[INI]
289313
;Create an ini to make detection for enterprise deployment tools easy
290-
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.4.1"
314+
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.4.2"
291315
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "Hack Windows Installer"
292316

293317

@@ -671,7 +695,7 @@ begin
671695
LogAsImportant('--------------------------------');
672696
LogAsImportant('Font name.....: Hack fonts');
673697
LogAsImportant('Script version: 2.03');
674-
LogAsImportant('Setup version.: 1.4.1');
698+
LogAsImportant('Setup version.: 1.4.2');
675699
LogAsImportant('Font version..: 3.000');
676700
LogAsImportant('Local time....: ' + GetDateTimeString('yyyy-dd-mm hh:nn', '-', ':'));
677701
LogAsImportant('Fonts folder..: ' + ExpandConstant('{fonts}'));
@@ -767,10 +791,9 @@ begin
767791
customProgressPage.SetText('Informing Windows that fonts have changed...','');
768792
769793
SendBroadcastMessage(29, 0, 0);
770-
771-
customProgressPage.SetText('Storing font data...','');
772794
}
773795
796+
customProgressPage.SetText('Storing font data...','');
774797
775798
appDestinationFolder:=ExpandConstant('{app}');
776799
appDestinationFolder:=AddBackslash(appDestinationFolder);

0 commit comments

Comments
 (0)