From 9497a6161a8572d2567a21ac57e5cb4603655346 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Wed, 22 Nov 2023 13:45:33 -0500 Subject: [PATCH] [SQUASH] partial update re https://github.com/dybvig/stex/pull/7#issuecomment-1820971301 --- build.zuo | 5 ++++- csug/scheme.hsty | 33 --------------------------------- makefiles/Makefile-csug.in | 2 +- release_notes/releasenotes.css | 2 ++ stex | 2 +- 5 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 csug/scheme.hsty diff --git a/build.zuo b/build.zuo index 0e1aa92cc..146c0a9a0 100644 --- a/build.zuo +++ b/build.zuo @@ -233,12 +233,15 @@ ;; in parallel to doc-project-names '(InstallCSUG InstallReleaseNotes)) (define (targets-for-doc name install-dir-key) - (define doc-dir (at-dir ".." name)) + (define doc-dir (at-dir ".." name)) ;; ".." goes out of the workarea (define mf-in (at-source "makefiles" (~a "Makefile-" name ".in"))) (define mf-out (build-path doc-dir "Makefile")) (define name-sym (string->symbol name)) (define (run-make target) (check-not-kernel-only) + ;; Note: build.bat on Windows does not currently configure these + ;; settings, so only evaluate (hash-ref config ...) when trying to + ;; build a target, not while merely generating the list of targets. (define install-dir (hash-ref config install-dir-key)) (define other-install-dir-key diff --git a/csug/scheme.hsty b/csug/scheme.hsty deleted file mode 100644 index c8281c851..000000000 --- a/csug/scheme.hsty +++ /dev/null @@ -1,33 +0,0 @@ -\def\transerr#1{\raw{}} -\def\transin#1{\raw{}} -\def\transout#1{\raw{}} -\def\endtranserr#1{\raw{}} -\def\endtransin#1{\raw{}} -\def\endtransout#1{\raw{}} - -\def\schemeblankline{{\\\\}} -\def\schemelinestart{} -%%% handle numbered lines in scheme.sty and scheme.hsty -%%% ---have scheme-prep produce only \schemelinestart -% following is probably broken until we have tables, I suspect. -% Actually, the right way to fix this may be to use CSS -\def\schemelinestartnumbered#1{\raw{
}#1\raw{
}} - -\def\scheme#1{{\tt #1}} -\def\longcode\schemedisplay{\schemedisplay} -\def\noskip\schemedisplay{\schemedisplay} -\def\schemedisplay{\par\begingroup\tt\hardspaces} -\def\endschemedisplay{\endgroup\par} -\def\schemeindent{} -\def\schatsign{\raw{@}} -\def\schbackslash{\raw{\}} -\def\schcarat{\raw{^}} -\def\schdot{\raw{.}} -\def\schlbrace{\raw{&##123;}} -\def\schrbrace{\raw{&##125;}} -\def\schtilde{\raw{~}} -\def\schunderscore{\raw{_}} -\def\becomes{$\rightarrow$} -\def\is{$\Rightarrow$} -\def\si{\raw{}} -\def\var#1{\emph{#1}} diff --git a/makefiles/Makefile-csug.in b/makefiles/Makefile-csug.in index 8a1abb23d..a2d29ccd7 100644 --- a/makefiles/Makefile-csug.in +++ b/makefiles/Makefile-csug.in @@ -1,7 +1,7 @@ srcdir=oops-missing-srcdir installdir=oops-missing-installdir InstallReleaseNotes=oops-missing-InstallReleaseNotes -relInstallReleaseNotes=oops-missing-InstallReleaseNotes +relInstallReleaseNotes=oops-missing-relInstallReleaseNotes m=oops-missing-m STEXLIB=oops-missing-stexlib # Zuo overrides the above variables when running `make` diff --git a/release_notes/releasenotes.css b/release_notes/releasenotes.css index ef7507d2c..a3958eeb8 100644 --- a/release_notes/releasenotes.css +++ b/release_notes/releasenotes.css @@ -55,3 +55,5 @@ table.indent {margin-left: 20px} .tag{ color: navy; font-weight: bold; } .entity{ color: purple; font-weight: bold; } .errflag{ color: red; font-weight: bold; } +.schemedisplay { line-height: 1.0625; } +.schemedisplay .katex { font-size: 1em; } diff --git a/stex b/stex index 5d73fbfae..188d0ea67 160000 --- a/stex +++ b/stex @@ -1 +1 @@ -Subproject commit 5d73fbfaeb0a1970bb5ac40c7f548e8c7aae7d33 +Subproject commit 188d0ea6789dc512f1925bae8d25ecbfcee75c8a