Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

installation fixes #5

Merged
merged 7 commits into from
Apr 12, 2021
Merged

installation fixes #5

merged 7 commits into from
Apr 12, 2021

Conversation

owaddell
Copy link
Collaborator

  • Abort make if unable to determine machine-type. This happens when we can't find the scheme executable specified by Scheme=filename, perhaps due to an invalid PREFIX=dir.
  • Remove sed for Mf-stex install. v1.2.1 removed LIB from Mf-stex, so we don't need to sed.
  • Fix issue where html-prep can't find html-prep.tex when STEXLIB is set to something like ~/projects/stex.
  • Support non-root install where LIB=dir specifies a directory that is writable by the current user. Set STEXLIB to the installation directory in the installed Makefile.template. Remove stray whitespace in Mf-stex.
  • Add --help to make fixbibtex consistent with the other binaries.
  • Add --version to binaries. Move VERSION into the filesystem to expose the dependency to make. We could instead export the make variable and use getenv in script.ss, but that makes it easier to get the version wrong in the installed binaries.
  • Convert STEXLIB to absolute path in TEXINPUTS so $(x).mathrun finds the stex inputs. Fixes missing scheme.sty during stex.mathrun.

Abort make if unable to determine machine-type. This happens when we
can't find the scheme executable specified by Scheme=<filename>, perhaps
due to an invalid PREFIX=<dir>.
  Makefile, Mf-stex
v1.2.1 removed LIB from Mf-stex, so we don't need to sed it.
  Makefile
Fix issue where html-prep can't find html-prep.tex when STEXLIB is set
to something like ~/projects/stex.
  src/preplib.ss
Support non-root install where LIB=<dir> specifies a directory that is
writable by the current user. Set STEXLIB to the installation directory
in the installed Makefile.template. Remove stray whitespace in Mf-stex.
  Makefile, Mf-stex, doc/stex.html, doc/stex.pdf, doc/stex.stex
Add --help to make fixbibtex consistent with the other binaries.
  Makefile, src/fixbibtex.ss
Add --version to binaries. Move VERSION into the filesystem to expose
the dependency to make. We could instead export the make variable and
use getenv in script.ss, but that makes it easier to get the version
wrong in the installed binaries.
  Makefile, Makefile.template, doc/Makefile, src/VERSION,
  src/fixbibtex.ss, src/html-prep.ss, src/scheme-prep.ss, src/script.ss
Convert STEXLIB to absolute path in TEXINPUTS so $(x).mathrun finds
the stex inputs. Fixes missing scheme.sty during stex.mathrun.
  Mf-stex
@dybvig
Copy link
Owner

dybvig commented Apr 11, 2021

This looks good to me.

@owaddell owaddell merged commit afa6075 into dybvig:master Apr 12, 2021
@owaddell owaddell deleted the owaddell/fixes branch April 12, 2021 12:06
LiberalArtist added a commit to LiberalArtist/stex that referenced this pull request Nov 18, 2023
 This is a combination of 33 commits.
 This is the 1st commit message:

[DRAFT] use <!DOCTYPE html>

 This is the commit message dybvig#2:

[WIP] katex

 This is the commit message dybvig#3:

[FIXUP] katex/fonts

 This is the commit message dybvig#4:

fixup

 This is the commit message dybvig#5:

tar --dereference

Otherwise, it would archive katex/fonts as a symlink,
and chmod would fail.

The long option `--dereference` is portable to at least GNU tar and
FreeBSD tar, but the short versions of the option are incompatible:
GNU says `-h`, FreeBSD says `-L`.

 This is the commit message dybvig#6:

fixup tar --dereference

 This is the commit message dybvig#7:

link katexmacros; try explicit `make KATEX=$(KATEX)`

 This is the commit message #8:

no $

touch csug.hthirdrun
echo -n gifs= > math/csug/mathfiles
(cd math/csug; echo *.tex | sed -e "s/\.tex/.gif/g") >> math/csug/mathfiles
echo -n htmls= >> math/csug/mathfiles
(cd math/csug; echo *.katex | sed -e "s/\.katex/.html/g") >> math/csug/mathfiles
make[2]: Entering directory '/home/philip/code/racket/Chez-stex-tmp/csug/math/csug'
/gnu/store/kn10fd3x3fxw714f5p2zfq3ch8qnhm74-profile/bin/katex -i 0.katex -o 0.html --macro-file katexmacros
/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:13212
        throw error;
        ^

ParseError: KaTeX parse error: Can't use function '$' in math mode at position 1: $̲\Rightarrow$
    at new ParseError (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:153:22)
    at _Parser.parseFunction (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:12776:17)
    at _Parser.parseGroup (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:13013:25)
    at _Parser.parseAtom (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:12679:27)
    at _Parser.parseExpression (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:12598:29)
    at _Parser.parse (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:12562:30)
    at parseTree (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:13172:25)
    at renderToDomTree (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:13222:22)
    at Object.renderToString (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/guix-node-cjs/katex.js:13203:22)
    at writeOutput (/gnu/store/xa79qcdvp7xan4iwc8023082x1j22ypk-katex-0.16.9/lib/node_modules/katex/cli.js:94:26) {
  position: 0,
  length: 1,
  rawMessage: "Can't use function '$' in math mode"
}

Node.js v18.18.2

 This is the commit message #9:

katexmacros for csug

 This is the commit message #10:

fixup punt-to-latex

 This is the commit message #11:

fixup --katex-finished

 This is the commit message #12:

fixup

 This is the commit message #13:

really fixup

 This is the commit message #14:

mostly documentation things (don't check in doc/katex for now)

 This is the commit message #15:

stex.stex build nicely; handled schemeghostRightarrow

 This is the commit message #16:

fixup KATEX_CSS default

 This is the commit message #17:

fixup for eof from get-string-all

 This is the commit message #18:

KATEX_FLAGS

 This is the commit message #19:

make variable propagation works

 This is the commit message #20:

tweak

 This is the commit message #21:

[TMP] seek smathdisplay

 This is the commit message #22:

export KATEX KATEX_FLAGS

 This is the commit message #23:

Revert "[TMP] seek smathdisplay"

This reverts commit ff169c9.

 This is the commit message #24:

note lack of epsfbox; add comment about display mode

 This is the commit message #25:

tweaks

 This is the commit message #26:

should have been in previous commit

 This is the commit message #27:

revert some probably unnecessary html updates

 This is the commit message #28:

[TMP] revert td nowrap

 This is the commit message #29:

[TMP] revert mdash ndash

 This is the commit message #30:

revert self-closing img for non-katex mode

 This is the commit message #31:

use old doctype unless katex

 This is the commit message #32:

revert gratuitous change to self-closing for (style-sheet)

 This is the commit message #33:

increment version to 1.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants