-
-
Notifications
You must be signed in to change notification settings - Fork 30.3k
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-38022: IDLE: upgrade help.html to sphinx 2.x HTML5 output #15664
bpo-38022: IDLE: upgrade help.html to sphinx 2.x HTML5 output #15664
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for this. I compared new output to 3.8 and the only change is the fix of not double spacing after code (pre) blocks. The code change is clear. I will merge and backport.
# I will follow with a separate no-issue, no-news PR to fix comments with caps and periods.
Thanks @taleinat for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8. |
I'm having trouble backporting to |
GH-15667 is a backport of this pull request to the 3.7 branch. |
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
Thanks @taleinat for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8. |
GH-15668 is a backport of this pull request to the 3.8 branch. |
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
Thanks @taleinat for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8. |
The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks.
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks.
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks.
This is done by making
HelpParser
properly handle the slightly different HTML. This required two changes:<p>
tags inside list items (e.g.<li>
). This is achieved by avoiding starting a new block of text for<p>
tags if they come after an opening tag.<pre>
tags. This is requried because<pre>
tags need a newline at the end for them to be displayed properly. Achieved by adding only a single newline if the previous line is empty or entirely white-space.Also, note the removal of the
class_ != 'first'
check for<p>
tags. This is because the new HTML output no longer includes "first" classes on tags.https://bugs.python.org/issue38022