Support root level grouping topicrefs #2092 #2648 #2614 #2683
Conversation
This file contains 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
robander
added
bug
priority/medium
jelovirt
requested changes
May 10, 2017
| @@ -240,6 +238,19 @@ See the accompanying LICENSE file for applicable license. | |||
| <xsl:call-template name="createBackCover"/> | |||
| </xsl:template> | |||
|
|
|||
| <xsl:template match="*[contains(@class,' map/topicref ')]" mode="generatePageSequenceFromTopicref"> | |||
| <xsl:choose> | |||
| <xsl:when test="empty(key('topic-id', @id))"> | |||
There was a problem hiding this comment.
Save key('topic-id', @id) into a variable since it's used twice in this template.
| <xsl:call-template name="processTopicChapter"/> | ||
| </xsl:for-each> | ||
| <xsl:choose> | ||
| <xsl:when test="empty(key('topic-id', @id))"> |
There was a problem hiding this comment.
Same as previous comment, save key('topic-id', @id) into e.g. $topic variable. Applies to all cases below.
robander
force-pushed
the
hotfix/2092
branch
2 times, most recently
from
574120b
to
2b10b12
Compare
Signed-off-by: Robert D Anderson <robander@us.ibm.com>
|
Now updated based on review comments from @jelovirt |
robander
changed the title
jelovirt
approved these changes
May 14, 2017
This was referenced May 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 current PDF2 process assumes that if a root branch of a map has any real content, the root
topicrefof the branch will have either a title or reference a topic (or both). When that is not the case, the PDF is broken. If there is only the one root branch, FOP will crash (as reported in #2648). If there are "valid" root branches, the branch with a root grouping element will appear in the TOC + contents but not in the actual content.Related, the much older issue #2092 has the same root cause -- it assumes that in a bookmap, any
chapter,appendix,appendices,preface, ortopicref(as child of front/back matter container) will either have a title or reference a topic. When that is not the case, results are the same as above.In all of these cases, the code assumes that the container elements will reference a topic, and try to process the topic with
<xsl:for-each select="key('topic-id', @id)">(note that when there is only a title in thetopicref/chapter/ etc, the merge process generates a topic with that title, so the key-lookup still works). When thetopic-idlookup fails, no page sequence is generated, and children are not processed.The fix here checks to see if the
topic-idreturns anything. If the result is empty, it continues to anytopicrefchildren with the same mode. Additional groupingtopicrefelements do the same. If a topic is eventually found, a valid page sequence is generated, and normal processing continues at that point.Just realized that this also addresses #2614.
Signed-off-by: Robert D Anderson robander@us.ibm.com