-
Notifications
You must be signed in to change notification settings - Fork 2k
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
Fix #5453 and move LaTeX \pagestyle
to template
#5455
Conversation
914fe78
to
384b652
Compare
384b652
to
f1b7969
Compare
sphinx/texinputs/sphinx.sty
Outdated
@@ -517,17 +533,24 @@ | |||
% define chaptermark with \@chappos when \@chappos is available for Japanese | |||
\ltx@ifundefined{@chappos}{} | |||
{\def\chaptermark##1{\markboth{\@chapapp\space\thechapter\space\@chappos\space ##1}{}}} | |||
} | |||
} | |||
% Update the plain style so we get the page number & footer line, | |||
% but not a chapter or section title. This is to keep the first | |||
% page of a chapter and the blank page between chapters `clean.' |
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.
I do not understand the "blank page between chapters" bit from this legacy comment. In report class (used by 'manual'), the \chapter
command does indeed issue \thispagestyle{plain}
after having done \cleardoublepage
, but there is no modification of the header/footer style for the last page of previous chapter, if the latter has no contents. Only the first page of new chapter is re-styled via the \thispagestyle{plain}
arising from \chapter
.
Thus I should probably remove this old comment which I believe to be misleading.
Codecov Report
@@ Coverage Diff @@
## 1.8 #5455 +/- ##
==========================================
+ Coverage 82.05% 82.05% +<.01%
==========================================
Files 305 299 -6
Lines 40341 40002 -339
Branches 6235 6181 -54
==========================================
- Hits 33100 32822 -278
+ Misses 5857 5804 -53
+ Partials 1384 1376 -8
Continue to review full report at Codecov.
|
3 similar comments
Codecov Report
@@ Coverage Diff @@
## 1.8 #5455 +/- ##
==========================================
+ Coverage 82.05% 82.05% +<.01%
==========================================
Files 305 299 -6
Lines 40341 40002 -339
Branches 6235 6181 -54
==========================================
- Hits 33100 32822 -278
+ Misses 5857 5804 -53
+ Partials 1384 1376 -8
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## 1.8 #5455 +/- ##
==========================================
+ Coverage 82.05% 82.05% +<.01%
==========================================
Files 305 299 -6
Lines 40341 40002 -339
Branches 6235 6181 -54
==========================================
- Hits 33100 32822 -278
+ Misses 5857 5804 -53
+ Partials 1384 1376 -8
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## 1.8 #5455 +/- ##
==========================================
+ Coverage 82.05% 82.05% +<.01%
==========================================
Files 305 299 -6
Lines 40341 40002 -339
Branches 6235 6181 -54
==========================================
- Hits 33100 32822 -278
+ Misses 5857 5804 -53
+ Partials 1384 1376 -8
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## 1.8 #5455 +/- ##
==========================================
- Coverage 82.05% 82.05% -0.01%
==========================================
Files 306 306
Lines 40350 40350
Branches 6236 6236
==========================================
- Hits 33109 33108 -1
Misses 5858 5858
- Partials 1383 1384 +1
Continue to review full report at Codecov.
|
Codecov seems to have gone beserk (perhaps due to me force pushing twice shortly after having already made PR). If there is one more Codecov report soon I will close and reopen to try to stop the flood... |
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.
+1
Thanks for review @tk0miya. I will push a commit to remove the legacy comment about "keeping clean the blank page between chapters" which I find misleading and to add a CHANGES entry, then I will merge. |
Bugfix: #5453
No change for 'manual' class (or Japanese documents), but the
\sphinxtableofcontents
for 'manual' has been modified: the\pagestyle
commands therein have been moved to LaTeX template.Overall this changes nothing to 'manual' documents except for those users who have customized
\sphinxtableofcontents
in their own way and perhaps don't want the\pagestyle
now in LaTeX templates: I expect very few if any project have done that, and in that case the user only needs to use custom LaTeX template to suppress the\pagestyle
inserted from it.