docs: copy click-to-enlarge images, not just displayed ones#4106
Open
grandixximo wants to merge 1 commit into
Open
docs: copy click-to-enlarge images, not just displayed ones#4106grandixximo wants to merge 1 commit into
grandixximo wants to merge 1 commit into
Conversation
Member
|
@grandixximo Did you notice the merge conflict? |
Contributor
|
This needs to be rebased after merging #4081 and then fixed. |
Member
|
#4081 is already merged (by you 😄 ) |
Contributor
|
Yes, #4081 needed to be merged before other things according to @grandixximo. I had no more objections or comments to the docs build reorg, so it got merged. This PR getting conflicts is fallout and not too bad considering the complexity of changes we are making to the docs structure. |
The HTML image-copy step scanned only src="..." attributes, so images referenced solely as a link target (image:thumb[link="images/full.png"], rendered as <a href="...full.png">) were never copied and 404'd when the reader clicked to enlarge. gui/gmoccapy and gui/gstat had nine such images. Also scan href="...", filtered to image extensions so page and anchor links are left out.
grandixximo
force-pushed
the
docs/copy-linked-images
branch
from
1e8eae5 to
48bbfa0
Compare
Contributor
Author
|
Yes, rebased, merges clean now, the other PRs I sent today live in a similar situation, they can kind of live in parallel, and merging should not be too bad, just some conflicts on the submake file I believe. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The HTML image-copy step (
.html-images-stamp) scanned onlysrc="..."attributes when deciding which images to copy intodocs/html. Images referenced solely as a link target,image:thumb[link="images/full.png"], which asciidoctor renders as<a href="images/full.png"><img src="thumb"></a>, were never copied, so clicking the thumbnail to enlarge gave a 404.gui/gmoccapy(7 images) andgui/gstat(2) were affected.The fix also scans
href="...", filtered to image extensions so page and anchor links are left out.Surfaced by the now-working link checker (#4104), which reports these as missing-file 404s.
Verified with a full English
make htmldocs: build completes cleanly, all 9 images are now copied, and both pages report 0 missing-file 404s.