From 91fa1656600a52eddf650ea550e7cbd69d72903e Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Fri, 18 Apr 2025 21:27:00 +0300 Subject: Gtk/win32: fixed fonts and therefore pango warnings on startup (closes #7) * The default womanpage font is the abstract "Serif" now, so that should be more portable. "Times" wasn't found on Windows. * Win32 distributions include a custom .teco_css now, which removes the small-caps font attribute from the type label. The default Gtk theme on Windows references the "Segoe UI" font and it doesn't have a small-caps variant. In fact no default Windows font appears to have one. * We could add a custom .teco_ini to win32 distributions as well, but there is currently no need for it. * Do not distribute the /win32 files. They are used only for building Win32/64 packages. There is no point in distributing them in the tarball if the /debian and /freebsd directories aren't distributed as well. --- .github/workflows/nightly.yml | 4 +--- Makefile.am | 4 ---- lib/lexers/woman.tes | 2 +- win32/.teco_css | 12 ++++++++++++ 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 win32/.teco_css diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 961a246..c136b54 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -329,10 +329,8 @@ jobs: cp /mingw64/bin/{sciteco.exe,grosciteco.tes,tedoc.tes} ./ # datadir is relative to bindir cp -r /mingw64/bin/{lib,*.tmac} ./ - # FIXME: Maybe there should be a separate win32/.teco_ini with - # a few pre-enabled settings? cp /mingw64/bin/fallback.teco_ini .teco_ini - cp /mingw64/bin/fallback.css .teco_css + cp /mingw64/bin/fallback.css ../win32/.teco_css . cp -r /mingw64/share/doc/sciteco/* ./ cp ../COPYING ../ChangeLog ./ cp /mingw64/bin/gspawn-win64-helper*.exe ./ diff --git a/Makefile.am b/Makefile.am index f6bcf86..0a9f23b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,10 +20,6 @@ dist_scitecodata_DATA += ico/sciteco-16.png ico/sciteco-32.png \ endif EXTRA_DIST += ico/sciteco-256.png ico/sciteco.ico -EXTRA_DIST += win32/loaders.cache - -EXTRA_DIST += contrib/mingw-bundledlls - # Distribute entire Scintilla/Scinterm/Lexilla directory and # do some manual cleanup. dist-hook: diff --git a/lib/lexers/woman.tes b/lib/lexers/woman.tes index 7a1201f..86580f3 100644 --- a/lib/lexers/woman.tes +++ b/lib/lexers/woman.tes @@ -14,7 +14,7 @@ 1ESSETWRAPMODE 1ESSETWRAPINDENTMODE 10,1#4ESSETYCARETPOLICY - 0EJ-1"> 32ESSTYLESETFONTTimes :M[color.init] ' + 0EJ-1"> 32ESSTYLESETFONTSerif :M[color.init] ' 1:EN*Q*.tec"S EMQ*.tec ' } diff --git a/win32/.teco_css b/win32/.teco_css new file mode 100644 index 0000000..9a02919 --- /dev/null +++ b/win32/.teco_css @@ -0,0 +1,12 @@ +@import "fallback.css"; + +/* + * Windows distributions use the default Gtk theme which + * references the Segoe UI font. + * It doesn't have a small-caps variant and there are apparently no native + * small-caps fonts preinstalled on Windows. + * This avoids warnings on startup. + */ +.type-label { + font-variant: normal; +} -- cgit v1.2.3