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

Attempt to restore the schema changes from PR 124 #172

Merged
merged 1 commit into from Oct 2, 2017
Merged

Conversation

ndw
Copy link
Contributor

@ndw ndw commented Oct 2, 2017

The schema changes from PR #124 were accidentally lost. This PR applies a slightly different set of changes to achieve the same purpose.

  1. Now that we allow p;variable in between steps, I think it's a mistake to allow it inside p:choose as a sibling of p:when/p:otherwise. A user can simply put it before the choose if they want it to be available to all of the conditional branches.

  2. I chose a slightly different content model that makes it clear that at least one of p:when or p:otherwise is required.

Hopefully this is seen as a friendly amendment to the original PR.

Copy link
Member

@xml-project xml-project left a comment

Choose a reason for hiding this comment

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

The syntax is now much clearer - Thanks!

@ndw ndw merged commit f7b01a3 into xproc:master Oct 2, 2017
@ndw ndw deleted the refix-124 branch October 2, 2017 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants