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 #607, I hope: remove erroneous bits of text from version URL #608

Merged
merged 4 commits into from
Sep 30, 2023

Conversation

sydb
Copy link
Member

@sydb sydb commented May 1, 2023

With @trishaoconnor, change the "makeTEIVersion" template in odds/teiodds.xsl so that
a) it does not output the string “P5 Version ” (or “Version ”) as part of the version URL; and
b) it outputs the version information on 1 line instead of two.

The good news is that I am quite confident that the new code works, in that it generates the expected output. The bad news is I have no idea if the expected output (since it is slightly different from the previous output) might break something that the build process did not test. (I have fixed the actual Test procedure, and Test2 passed without any problem.)

Warning to reviewers: I have also changed a whole bunch of whitespace, so be sure to ask GitHub to hide whitespace changes when you examine the changes. And I daresay the only file you really want to examine is teiodds.xsl. (All other changes are just fallout from changes to that file.)

sydb added 2 commits May 1, 2023 12:09
With @trishaoconnor, change the "makeTEIVersion" template in odds/teiodds.xsl so that
 a) it does not output the string "P5 Version
" as part of the version URL; and
 b) it outputs the version information on 1 line instead of two.
Get output to pass tests:
 * Update routine so that it deals with both “P5 Version …” and “Version …”
 * Update Makefile so that test35.rnc has these comments stripped out correctly
 * Update some expected results because of *slight* comment differences that should be ignored
@sydb sydb added this to the Release 7.56.0 milestone May 1, 2023
Copy link
Member

@jamescummings jamescummings left a comment

Choose a reason for hiding this comment

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

I've not tested it directly, not had time ATM, merely read through the changed files. But it all looks good to me. I suggest another reviewer test it out.

Copy link
Contributor

@martindholmes martindholmes left a comment

Choose a reason for hiding this comment

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

Both sets of tests pass. I don't pretend to understand what was being done in the Makefile, but everything else makes sense.

@trishaoconnor trishaoconnor merged commit ce346af into dev Sep 30, 2023
4 checks passed
@raffazizzi raffazizzi added this to the Release 7.56.0 milestone Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants