[proxy] web.archive.org← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public
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

bpo-34006: Set SPHINXOPTS for htmlhelp #8051

Merged
merged 6 commits into from Jul 2, 2018

Conversation

Copy link
Member

zware commented Jul 2, 2018

Specifically, set html_theme_options.body_max_width=none

https://bugs.python.org/issue34006

Specifically, set html_theme_options.body_max_width=none
Doc/make.bat Outdated
@@ -152,6 +152,7 @@ goto end
if NOT "%2" EQU "" (
echo.Can't specify filenames to build with htmlview target, ignoring.
)
set SPHINXOPTS=-D html_theme_options.body_max_width=none %SPHINXOPTS%
Copy link
Member

terryjreedy Jul 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

htmlview is the wrong target; it makes html in the default location and views the result in the default browser.
But the new line works in that the line limit is gone in the resulting html. So the new line just needs to go somewhere else.

I tried moving the new line up under 136 if "%1" EQU "htmlhelp" ( but that failed. I believe this is because the html has already been built by Sphinx with the line limit and the next step just compresses the html as is into the .chm. I will try putting the addition guarded by the same if somewhere up above.

Copy link
Member

terryjreedy Jul 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found the right place, a couple of line up, before cmd.... Preparing blurb.

Copy link
Member Author

zware Jul 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that, I managed to misread pretty terribly. Fixed; still not tested.

Copy link
Member

terryjreedy commented Jul 2, 2018

Does the news item look ok to you? also as commit message?

Copy link
Member Author

zware commented Jul 2, 2018

Looks fine to me.

terryjreedy merged commit d824ca7 into python:master Jul 2, 2018
Copy link
Contributor

miss-islington commented Jul 2, 2018

Thanks @zware for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒🤖 I'm not a witch! I'm not a witch!

Copy link

bedevere-bot commented Jul 2, 2018

GH-8053 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 2, 2018
)

 The line-length limit is not needed because the pages appear in a separate app rather
 than on a browser tab.  It can also interact badly with the DPI setting.
(cherry picked from commit d824ca7)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
Copy link

bedevere-bot commented Jul 2, 2018

GH-8054 is a backport of this pull request to the 3.6 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 2, 2018
)

 The line-length limit is not needed because the pages appear in a separate app rather
 than on a browser tab.  It can also interact badly with the DPI setting.
(cherry picked from commit d824ca7)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
miss-islington added a commit that referenced this pull request Jul 2, 2018
 The line-length limit is not needed because the pages appear in a separate app rather
 than on a browser tab.  It can also interact badly with the DPI setting.
(cherry picked from commit d824ca7)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
miss-islington added a commit that referenced this pull request Jul 2, 2018
 The line-length limit is not needed because the pages appear in a separate app rather
 than on a browser tab.  It can also interact badly with the DPI setting.
(cherry picked from commit d824ca7)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
yahya-abou-imran pushed a commit to yahya-abou-imran/cpython that referenced this pull request Nov 2, 2018
)

 The line-length limit is not needed because the pages appear in a separate app rather
 than on a browser tab.  It can also interact badly with the DPI setting.
zware deleted the htmlhelp-sphinxopts branch May 7, 2021
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

5 participants