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

Use last-token-of-class att rather than local name to check target el… #3264

Merged

Conversation

drmacro
Copy link
Member

@drmacro drmacro commented Mar 25, 2019

…ement

Signed-off-by: Eliot Kimber ekimber@contrext.com


name: Pull request
about: Correct conref processing to resolve conrefs to specializations of the referencing element


Description

Updates conrefImpl.xsl to use last token of @Class attribute of referencing element in place of local name to select target element.

Motivation and Context

Make behavior correct per DITA spec.

How Has This Been Tested?

Tested with dita-test-case tests for this-topic references:

https://github.com/dita-community/dita-test-cases/tree/master/this-topic-fragment-ids

Type of Changes

  • Bug fix

Checklist

…ement

Added unit test for conref to specialization

Signed-off-by: Eliot Kimber <ekimber@contrext.com>
@drmacro drmacro force-pushed the feature/fix-conref-to-specialization branch from 13e5708 to 181d60e Compare March 25, 2019 17:56
@Test
public void testconref_to_specialization() throws Throwable {
builder().name("conref_to_specialization")
.transtype(XHTML)
Copy link
Member

Choose a reason for hiding this comment

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

We could save a bit of time on the integration test process if we only run PREPROCESS (since this is testing something that's only part of preprocessing) -- or possibly just add this conref test into an existing integration test for conref. I'm not sure if any of the existing tests are a good fit though.

Copy link
Member Author

Choose a reason for hiding this comment

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

I just used an existing conref test as a model. They seemed to be very narrow in their focus.

Limiting it to preprocess makes sense though.

@jelovirt jelovirt added bug preprocess/conref priority/medium Medium (or unknown) priority issue labels May 7, 2019
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt jelovirt changed the base branch from develop to release/3.4 November 2, 2019 12:53
@jelovirt jelovirt added this to In progress in 3.4 via automation Nov 2, 2019
@jelovirt jelovirt moved this from In progress to Reviewer approved in 3.4 Nov 2, 2019
@jelovirt jelovirt merged commit decc7d0 into dita-ot:release/3.4 Nov 2, 2019
3.4 automation moved this from Reviewer approved to Done Nov 2, 2019
@jelovirt jelovirt added this to the 3.4 milestone Nov 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug preprocess/conref priority/medium Medium (or unknown) priority issue
Projects
No open projects
3.4
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants