diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-03-08 13:06:47 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-11 20:00:36 -0500 |
| commit | 5932247cda7a782a3d1325b9715095a7d25e8571 (patch) | |
| tree | ad208adf1ce990c26068d9e5d146eef387ba63c9 | |
| parent | c98e8332e4a4d806ec53a69b57f38a15e9fab9d4 (diff) | |
| download | haskell-5932247cda7a782a3d1325b9715095a7d25e8571.tar.gz | |
users guide: Eliminate spurious \spxentry mentions
We were failing to pass the style file to `makeindex`, as is done by
the mklatex configuration generated by Sphinx.
Fixes #20913.
| -rw-r--r-- | hadrian/src/Settings/Builders/Xelatex.hs | 10 | ||||
| -rw-r--r-- | rules/sphinx.mk | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/hadrian/src/Settings/Builders/Xelatex.hs b/hadrian/src/Settings/Builders/Xelatex.hs index 5623284ed5..a39c68705f 100644 --- a/hadrian/src/Settings/Builders/Xelatex.hs +++ b/hadrian/src/Settings/Builders/Xelatex.hs @@ -3,5 +3,11 @@ module Settings.Builders.Xelatex (xelatexBuilderArgs) where import Settings.Builders.Common xelatexBuilderArgs :: Args -xelatexBuilderArgs = builder Xelatex ? mconcat [ arg "-halt-on-error" - , arg =<< getInput ] +xelatexBuilderArgs = mconcat + [ builder Xelatex ? mconcat [ arg "-halt-on-error" + , arg =<< getInput ] + + -- this fixes #20913 although is a bit of a hack given that this is + -- specific to the user-guide. + , builder Makeindex ? mconcat [ arg "-s", arg "python.ist" ] + ] diff --git a/rules/sphinx.mk b/rules/sphinx.mk index 2e24e50385..38692a8cdb 100644 --- a/rules/sphinx.mk +++ b/rules/sphinx.mk @@ -66,7 +66,7 @@ $1/$2.pdf: $1/conf.py $$($1_RST_SOURCES) cd $1/build-pdf/$2 ; $(XELATEX) -halt-on-error $2.tex 2>/dev/null >/dev/null || true cd $1/build-pdf/$2 ; $(XELATEX) -halt-on-error $2.tex 2>/dev/null >/dev/null || true cd $1/build-pdf/$2 ; $(XELATEX) -halt-on-error $2.tex 2>/dev/null >/dev/null || true - cd $1/build-pdf/$2 ; $(MAKEINDEX) $2.idx + cd $1/build-pdf/$2 ; $(MAKEINDEX) -s python.ist $2.idx cd $1/build-pdf/$2 ; $(XELATEX) -halt-on-error $2.tex 2>/dev/null >/dev/null || true cd $1/build-pdf/$2 ; $(XELATEX) -halt-on-error $2.tex cp $1/build-pdf/$2/$2.pdf $1/$2.pdf |