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.

Sign up for GitHub

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

Jump to bottom

feat(schematron): skip step 1 and/or step 2 if #none #1371

Merged
merged 12 commits into from
Mar 16, 2021
Merged

feat(schematron): skip step 1 and/or step 2 if #none #1371

merged 12 commits into from
Mar 16, 2021

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Mar 4, 2021 •
edited
Loading

Closes #1369

With this change, setting #none as a Schematron implementation file path skips its corresponding INCLUDE or EXPAND step.

A typical use case would be pipeline-for-svrl.xsl of SchXslt:

C:\xspec\xspec>set "SCHEMATRON_XSLT_INCLUDE=#none"

C:\xspec\xspec>set "SCHEMATRON_XSLT_EXPAND=#none"

C:\xspec\xspec>set "SCHEMATRON_XSLT_COMPILE=https://github.com/schxslt/schxslt/raw/v1.6.2/core/src/main/resources/xslt/2.0/pipeline-for-svrl.xsl"

C:\xspec\xspec>bin\xspec.bat -s test\issue-396_schxslt.xspec
...
passed: 1 / pending: 0 / failed: 0 / total: 1
...

#none can be specified in these places:

  • SCHEMATRON_XSLT_INCLUDE and/or SCHEMATRON_XSLT_EXPAND environment variables (in case of xspec.bat and xspec.sh)
  • xspec.schematron.preprocessor.step1 and/or xspec.schematron.preprocessor.step2 properties (in case of Ant).

You can't skip COMPILE step.

@AirQuick AirQuick added this to the v2.1 milestone Mar 4, 2021
@AirQuick AirQuick mentioned this pull request Mar 4, 2021
Closed
@AirQuick AirQuick changed the title feat(schematron): skip step 1 and step 2 if #none feat(schematron): skip step 1 and/or step 2 if #none Mar 4, 2021
@AirQuick
Merge branch 'master' into skip-sch-step-1-2
84762fb
@AirQuick
test(schematron): test Ant by run-xspec-tests-ant.*
701bffe
@AirQuick
Merge branch 'master' into skip-sch-step-1-2
f64aa46
@AirQuick
refactor(schematron): suppy $x:schematron-uri as a transform parameter
6f1a661
@AirQuick
Merge branch 'master' into skip-sch-step-1-2
0ad24ae 
# Conflicts:
#	src/schematron/schut-to-xslt.xsl
@AirQuick
Merge branch 'master' into skip-sch-step-1-2
97a11a8
@AirQuick
Merge branch 'master' into skip-sch-step-1-2
63b7d69 
# Conflicts:
#	src/schematron/generate-step3-wrapper.xsl
#	test/generate-step3-wrapper_custom.xspec
#	test/generate-step3-wrapper_default.xspec
#	test/issue-396_schxslt.xspec
#	test/schematron/schxslt/base-uri.xsl
#	test/schematron/schxslt/compile-for-svrl.xsl
#	test/schematron/schxslt/expand.xsl
#	test/schematron/schxslt/include.xsl
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
docs(schematron): generalize a comment in schut-to-xslt.xsl
11d314d
@AirQuick
Merge branch 'master' into skip-sch-step-1-2
d711caf
@AirQuick
refactor(schematron): simplify Ant build.xml
c14ce73
@AirQuick AirQuick merged commit ad82d2c into xspec:master Mar 16, 2021
@AirQuick AirQuick deleted the skip-sch-step-1-2 branch March 16, 2021 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
v2.1
Development

Successfully merging this pull request may close these issues.

Suggestion: allow SchXslt compilation parameters
1 participant
@AirQuick