typopro-dtp 4.2.5 → 4.2.7

package/etc/Windows-System-Install.bat

@@ -0,0 +1,8 @@
+@echo off
+rem ##
+rem ##  Windows-System-Install.bat (shell wrapper)
+rem ##
+
+powershell -command "Set-ExecutionPolicy Unrestricted"
+powershell .\Windows-Util.ps1 -forSystem -doInstall
+

package/etc/Windows-System-Uninstall.bat

@@ -0,0 +1,8 @@
+@echo off
+rem ##
+rem ##  Windows-System-Uninstall.bat (shell wrapper)
+rem ##
+
+powershell -command "Set-ExecutionPolicy Unrestricted"
+powershell .\Windows-Util.ps1 -forSystem -doUninstall
+

package/etc/Windows-User-Install.bat

@@ -0,0 +1,7 @@
+@echo off
+rem ##
+rem ##  Windows-User-Install.bat (shell wrapper)
+rem ##
+
+powershell .\Windows-Util.ps1 -forUser -doInstall
+

package/etc/Windows-User-Uninstall.bat

@@ -0,0 +1,7 @@
+@echo off
+rem ##
+rem ##  Windows-User-Uninstall.bat (shell wrapper)
+rem ##
+
+powershell .\Windows-Util.ps1 -forUser -doUninstall
+

package/etc/Windows-Util.ps1

@@ -0,0 +1,126 @@
+##
+##  Windows-util.ps1 (PowerShell script)
+##
+
+#   determine command-line options
+param (
+    [switch]$forUser     = $false,
+    [switch]$forSystem   = $false,
+    [switch]$doInstall   = $false,
+    [switch]$doUninstall = $false
+)
+
+#   determine administrator privileges
+$theuser = [Security.Principal.WindowsIdentity]::GetCurrent()
+$isAdmin = (New-Object Security.Principal.WindowsPrincipal $theuser).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
+
+#   sanity check execution scenarios
+if ($forSystem -and (-not ($isAdmin))) {
+    Write-Host "** ERROR: installing for system requested as non-administrator"
+    sleep 2
+    exit 1
+}
+if ($forUser -and $isAdmin) {
+    Write-Host "** ERROR: installing for user requested as administrator"
+    sleep 2
+    exit 1
+}
+
+#   determine the system's font folder and corresponding registry tree
+if ($isAdmin) {
+    $fontFilePath     = "$env:SYSTEMROOT\Fonts"
+    $fontRegistryPath = "HKLM:\Software\Microsoft\Windows NT\CurrentVersion\Fonts"
+}
+else {
+    $fontFilePath     = "$env:LOCALAPPDATA\Microsoft\Windows\Fonts"
+    $fontRegistryPath = "HKCU:\Software\Microsoft\Windows NT\CurrentVersion\Fonts"
+}
+
+#   display hint about installation
+if ($doInstall) {
+    Write-Host "## Installing msg Fonts"
+}
+else {
+    Write-Host "## Uninstalling msg Fonts"
+}
+Write-Host "++ Font file tree:     $($fontFilePath)"
+Write-Host "++ Font registry tree: $($fontRegistryPath)"
+
+#   remember if a reboot may be necessary afterwards
+#   (which is the case if a font is re-installed in-place)
+$rebootFlag = $false
+
+#   iterate over all font files
+$FontFiles = Get-ChildItem "..\dtp" -Include "*.ttf" -Recurse
+foreach ($FontFile in $FontFiles) {
+    if (Test-Path $FontFile.FullName -pathType leaf) {
+        #   determine font name
+        $shell = New-Object -COMObject Shell.Application
+        $folder = Split-Path $FontFile
+        $file = Split-Path $FontFile -Leaf
+        $shellfolder = $shell.Namespace($folder)
+        $shellfile = $shellfolder.ParseName($file)
+        $FontName = $shellfolder.getDetailsOf($shellfile, 21)
+
+        #   determine target
+        $FontFullName = "$($FontName) (TrueType)"
+        $targetPath = Join-Path $fontFilePath $FontFile.Name
+
+        #   dispatch according to action
+        if ($doInstall) {
+            Write-Host "-- Installing font ""$($FontName)"""
+
+            #   install font file
+            Write-Host "   File-Source:  $($FontFile.FullName)"
+            if (Test-Path $targetPath) {
+                Write-Host "   File-Target:  $($targetPath) [REPLACE]"
+                Remove-Item $targetPath -Force
+                Copy-Item $FontFile.FullName $targetPath -Force
+                $rebootFlag = $true
+            }
+            else {
+                Write-Host "   File-Target:  $($targetPath) [NEW]"
+                Copy-Item $FontFile.FullName $targetPath
+            }
+
+            #   register font file
+            $regTest = Get-ItemProperty -Path $fontRegistryPath -Name "$FontFullName" -ErrorAction SilentlyContinue
+            if ($regTest) {
+                Write-Host "   Registry-Key: ""$($FontFullName)"" [REPLACE]"
+                Set-ItemProperty -Name $FontFullName -Path $fontRegistryPath -Value $targetPath | out-null
+                $rebootFlag = $true
+            }
+            else {
+                Write-Host "   Registry-Key: ""$($FontFullName)"" [NEW]"
+                New-ItemProperty -Name $FontFullName -Path $fontRegistryPath -PropertyType string -Value $targetPath | out-null
+            }
+        }
+        else {
+            Write-Host "-- Uninstalling font ""$($FontName)"""
+
+            #   unregister font file
+            $regTest = Get-ItemProperty -Path $fontRegistryPath -Name "$FontFullName" -ErrorAction SilentlyContinue
+            if ($regTest) {
+                Write-Host "   Registry-Key: ""$($FontFullName)"" [DELETE]"
+                Remove-ItemProperty -Name $FontFullName -Path $fontRegistryPath -Force | out-null
+                sleep 1
+                $rebootFlag = $true
+            }
+
+            #   uninstall font file
+            if (Test-Path $targetPath) {
+                Write-Host "   File-Target:  $($targetPath) [DELETE]"
+                Remove-Item $targetPath -Force
+                $rebootFlag = $true
+            }
+        }
+    }
+}
+
+#   follow-up message
+if ($rebootFlag) {
+    Write-Host "** NOTICE: At least one existing font file was overwritten or the registry changed."
+    Write-Host "** NOTICE: As a result, a system reboot is now strongly advised!"
+    sleep 1
+}
+

package/etc/macOS-System-Install.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+##
+##  macOS-System-Install.sh
+##
+
+dst="/Library/Fonts"
+echo "++ Installing fonts into system"
+for font in ../dtp/*/*.ttf; do
+    ttf=`echo $font | sed -e 's;^.*/;;'`
+    echo "-- Installing font \"$ttf\""
+    echo "   File-Source: $font"
+    if [ -f "$dst/$ttf" ]; then
+        echo "   File-Target: $dst/$ttf [REPLACE]"
+        sudo rm -f "$dst/$ttf"
+        sudo cp "$font" "$dst/$ttf"
+    else
+        echo "   File-Target: $dst/$ttf [NEW]"
+        sudo cp "$font" "$dst/$ttf"
+    fi
+done
+

package/etc/macOS-System-Uninstall.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+##
+##  macOS-System-Uninstall.sh
+##
+
+dst="/Library/Fonts"
+echo "++ Uninstalling fonts from system"
+for font in ../dtp/*/*.ttf; do
+    ttf=`echo $font | sed -e 's;^.*/;;'`
+    echo "-- Uninstalling font \"$ttf\""
+    if [ -f "$dst/$ttf" ]; then
+        echo "   File-Target: $dst/$ttf [DELETE]"
+        sudo rm -f "$dst/$ttf"
+    fi
+done
+

package/etc/macOS-User-Install.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+##
+##  macOS-User-Install.sh
+##
+
+dst="$HOME/Library/Fonts"
+echo "++ Installing fonts into user"
+for font in ../dtp/*/*.ttf; do
+    ttf=`echo $font | sed -e 's;^.*/;;'`
+    echo "-- Installing font \"$ttf\""
+    echo "   File-Source: $font"
+    if [ -f "$dst/$ttf" ]; then
+        echo "   File-Target: $dst/$ttf [REPLACE]"
+        rm -f "$dst/$ttf"
+        cp "$font" "$dst/$ttf"
+    else
+        echo "   File-Target: $dst/$ttf [NEW]"
+        cp "$font" "$dst/$ttf"
+    fi
+done
+

package/etc/macOS-User-Uninstall.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+##
+##  macOS-User-Uninstall.sh
+##
+
+dst="$HOME/Library/Fonts"
+echo "++ Uninstalling fonts from user"
+for font in ../dtp/*/*.ttf; do
+    ttf=`echo $font | sed -e 's;^.*/;;'`
+    echo "-- Uninstalling font \"$ttf\""
+    if [ -f "$dst/$ttf" ]; then
+        echo "   File-Target: $dst/$ttf [DELETE]"
+        rm -f "$dst/$ttf"
+    fi
+done
+

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":        "typopro-dtp",
-    "version":     "4.2.5",
+    "version":     "4.2.7",
     "description": "Fonts for Professional Typography (DTP)",
     "homepage":    "https://github.com/rse/typopro-dtp",
     "license":     "MIT AND Apache-2.0 AND OFL-1.1 AND CC0-1.0",
@@ -20,8 +20,8 @@
         "url":     "http://github.com/rse/typopro/issues"
     },
     "dependencies": {
-        "npm-install-fetch":  "1.2.6",
-        "shx":                "0.3.3"
+        "npm-install-fetch":  "1.3.12",
+        "shx":                "0.3.4"
     },
     "scripts": {
         "install":            "npm-install-fetch",

package/etc/install-all-fonts-win.bat

@@ -1,8 +0,0 @@
-@echo off
-rem ##
-rem ##  install-all-fonts-win.bat (shell wrapper)
-rem ##
-
-powershell -command "Set-ExecutionPolicy Unrestricted"
-powershell .\install-all-fonts-win.ps1
-

package/etc/install-all-fonts-win.ps1

@@ -1,37 +0,0 @@
-##
-##  install-all-fonts-win.ps1 (PowerShell script)
-##
-
-#   determine the system's font folder
-$Shell = New-Object -ComObject Shell.Application
-$ssfFonts = 0x14
-$SystemFontsFolder = $Shell.Namespace($ssfFonts)
-$SystemFontsPath = $SystemFontsFolder.Self.Path
-
-#   remember if a reboot may be necessary afterwards
-$rebootFlag = $false
-
-#   iterate over all TypoPRO files
-$FontFiles = Get-ChildItem "..\dtp" -Include "*.ttf" -Recurse
-foreach ($FontFile in $FontFiles) {
-    if (Test-Path $FontFile.FullName -pathType leaf) {
-        $targetPath = Join-Path $SystemFontsPath $FontFile.Name
-        if (Test-Path $targetPath) {
-            Write-Host "++ installing $($FontFile.Name) [REPLACE]"
-		    Remove-Item $targetPath -Force
-		    Copy-Item $FontFile.FullName $targetPath -Force
-            $rebootFlag = $true
-        }
-        else {
-            Write-Host "++ installing $($FontFile.Name)"
-            $SystemFontsFolder.CopyHere($FontFile.fullname)
-        }
-    }
-}
-
-#   follow-up message
-if ($rebootFlag) {
-    Write-Host "NOTICE: At least one existing font was overwritten."
-    Write-Host "NOTICE: A reboot may be necessary!"
-}
-