Skip to content
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 for spaces in file/dir name #3213 #3229

Merged
merged 1 commit into from Feb 20, 2019

Conversation

Projects
3 participants
@robander
Copy link
Member

commented Feb 20, 2019

Signed-off-by: Robert D Anderson robander@us.ibm.com

Fixes #3213

When a TOC is added into the <nav> section of HTML5 output, it is done by matching the file name (passed into XSLT as $FILENAME) against @href values in the map. When the operating system passes in $FILENAME with backslashes, we already normalize those to / to match expected entries in the map.

When the file name (or directory name) contains spaces, $FILENAME or $FILEDIR can be passed in with a space value in place of %20, but the map uses the URI value %20, so we need to do the same normalization here.

I've updated the matching code so that $current-file adds an additional normalization for spaces to the existing normalization for \. Also moved this into a general function for HTML5 in case more normalization is needed in the future; this also makes it easy to set up an XSPEC test for normalization.

Fix for spaces in file/dir name #3214
Signed-off-by: Robert D Anderson <robander@us.ibm.com>

@robander robander added this to In progress in 3.3 via automation Feb 20, 2019

@robander robander moved this from In progress to Needs review in 3.3 Feb 20, 2019

@plus-

This comment has been minimized.

Copy link

commented Feb 20, 2019

It's #3213 :)

@robander

This comment has been minimized.

Copy link
Member Author

commented Feb 20, 2019

@plus- thanks, fixed that in the description.

@robander robander requested a review from jelovirt Feb 20, 2019

@robander robander changed the title Fix for spaces in file/dir name #3214 Fix for spaces in file/dir name #3213 Feb 20, 2019

3.3 automation moved this from Needs review to Reviewer approved Feb 20, 2019

@robander robander merged commit 75c416d into develop Feb 20, 2019

4 checks passed

DCO DCO
Details
WIP Ready for review
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

3.3 automation moved this from Reviewer approved to Done Feb 20, 2019

@robander robander deleted the hotfix/3213 branch Feb 20, 2019

@robander robander added this to the 3.3 milestone Feb 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.