diff --git a/relaxng/all_compact.rnc b/relaxng/all_compact.rnc index 41f71d24..d7182499 100644 --- a/relaxng/all_compact.rnc +++ b/relaxng/all_compact.rnc @@ -89,7 +89,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |= include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed} #include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} #include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} -include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} diff --git a/relaxng/all_ordered.rnc b/relaxng/all_ordered.rnc index 16f7b4d4..3d008ff7 100644 --- a/relaxng/all_ordered.rnc +++ b/relaxng/all_ordered.rnc @@ -104,7 +104,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |= include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed} #include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} #include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} -include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} diff --git a/relaxng/all_unordered.rnc b/relaxng/all_unordered.rnc index 904daad5..c72296ae 100644 --- a/relaxng/all_unordered.rnc +++ b/relaxng/all_unordered.rnc @@ -104,7 +104,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |= include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} #include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} -include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} diff --git a/relaxng/all_unordered_deterministic.rnc b/relaxng/all_unordered_deterministic.rnc index 4763b37c..7fb31a73 100644 --- a/relaxng/all_unordered_deterministic.rnc +++ b/relaxng/all_unordered_deterministic.rnc @@ -104,7 +104,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |= include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed} #include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed} -include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed} diff --git a/relaxng/indep_valid_modules/oriented_default_expansion_module.rnc b/relaxng/indep_valid_modules/oriented_default_expansion_module.rnc index 1e82e919..67e1de5a 100644 --- a/relaxng/indep_valid_modules/oriented_default_expansion_module.rnc +++ b/relaxng/indep_valid_modules/oriented_default_expansion_module.rnc @@ -1,2 +1,2 @@ -include "../modules/oriented_default_expansion_module.rnc" -include "../modules/init_expansion_module.rnc" +include "../modules/oriented_default_expansion_module.rnc" +include "../modules/init_expansion_module.rnc" diff --git a/relaxng/indep_valid_modules/oriented_non-default_expansion_module.rnc b/relaxng/indep_valid_modules/oriented_non-default_expansion_module.rnc index db95dab9..60e60abc 100644 --- a/relaxng/indep_valid_modules/oriented_non-default_expansion_module.rnc +++ b/relaxng/indep_valid_modules/oriented_non-default_expansion_module.rnc @@ -1,2 +1,2 @@ -include "../modules/oriented_non-default_expansion_module.rnc" -include "../modules/init_expansion_module.rnc" +include "../modules/oriented_non-default_expansion_module.rnc" +include "../modules/init_expansion_module.rnc" diff --git a/relaxng/indep_valid_modules/val_non-default_expansion_module.rnc b/relaxng/indep_valid_modules/val_non-default_expansion_module.rnc index 1282be05..011c610b 100644 --- a/relaxng/indep_valid_modules/val_non-default_expansion_module.rnc +++ b/relaxng/indep_valid_modules/val_non-default_expansion_module.rnc @@ -1,2 +1,2 @@ -include "../modules/val_non-default_expansion_module.rnc" -include "../modules/init_expansion_module.rnc" +include "../modules/val_non-default_expansion_module.rnc" +include "../modules/init_expansion_module.rnc" diff --git a/relaxng/indep_valid_modules/xml_lang_expansion_module.rnc b/relaxng/indep_valid_modules/xml_lang_expansion_module.rnc index 3d388adb..8c60bfcd 100644 --- a/relaxng/indep_valid_modules/xml_lang_expansion_module.rnc +++ b/relaxng/indep_valid_modules/xml_lang_expansion_module.rnc @@ -1,2 +1,2 @@ -include "../modules/xml_lang_expansion_module.rnc" -include "../modules/init_expansion_module.rnc" +include "../modules/xml_lang_expansion_module.rnc" +include "../modules/init_expansion_module.rnc" diff --git a/relaxng/modules/val_attrib_expansion_module.rnc b/relaxng/modules/val_attrib_expansion_module.rnc index cb7ddc1e..e1f88a80 100644 --- a/relaxng/modules/val_attrib_expansion_module.rnc +++ b/relaxng/modules/val_attrib_expansion_module.rnc @@ -22,7 +22,7 @@ singlevalued-att.choice |= val.attrib.def val.attrib.def = # - ## This attribute is used to indicate whether a function () is deterministic or non-deterministic. + ## An attribute indicating whether a function () is deterministic or non-deterministic. ## It has two values: "1" (deterministic: exactly one) and "0.." (set-valued: zero or more). ## See http://deliberation.ruleml.org/1.02/glossary/.40val attribute val { val.value } diff --git a/relaxng/naffologeq_compact.rnc b/relaxng/naffologeq_compact.rnc index fec8bea2..1e85ff2e 100644 --- a/relaxng/naffologeq_compact.rnc +++ b/relaxng/naffologeq_compact.rnc @@ -331,9 +331,9 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml { # # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL # -include "modules/val_absence_expansion_module.rnc" inherit = ruleml { - start |= notAllowed -} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml { +# start |= notAllowed +#} # # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED # diff --git a/relaxng/naffologeq_compact4simp.rnc b/relaxng/naffologeq_compact4simp.rnc index 803c5093..9c5a9884 100644 --- a/relaxng/naffologeq_compact4simp.rnc +++ b/relaxng/naffologeq_compact4simp.rnc @@ -327,9 +327,9 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml { # # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL # -include "modules/val_absence_expansion_module.rnc" inherit = ruleml { - start |= notAllowed -} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml { +# start |= notAllowed +#} # # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED # diff --git a/relaxng/naffologeq_compact4xsd.rnc b/relaxng/naffologeq_compact4xsd.rnc index ef6a8f4c..74c96c35 100644 --- a/relaxng/naffologeq_compact4xsd.rnc +++ b/relaxng/naffologeq_compact4xsd.rnc @@ -325,9 +325,9 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml { # # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL # -include "modules/val_absence_expansion_module.rnc" inherit = ruleml { - start |= notAllowed -} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml { +# start |= notAllowed +#} # # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED # diff --git a/relaxng/naffologeq_ifthen-compact.rnc b/relaxng/naffologeq_ifthen-compact.rnc index f18e4a5e..f2d816ee 100644 --- a/relaxng/naffologeq_ifthen-compact.rnc +++ b/relaxng/naffologeq_ifthen-compact.rnc @@ -222,7 +222,7 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {start |= notAllowe # # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL # -include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} # # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED # diff --git a/relaxng/naffologeq_ifthen-compact4xsd.rnc b/relaxng/naffologeq_ifthen-compact4xsd.rnc index 95d3cd7d..33037de4 100644 --- a/relaxng/naffologeq_ifthen-compact4xsd.rnc +++ b/relaxng/naffologeq_ifthen-compact4xsd.rnc @@ -220,7 +220,7 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {start |= notAllowe # # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL # -include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} +#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed} # # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED # diff --git a/relaxng/schema_rnc.php b/relaxng/schema_rnc.php index 934070b8..eefd9d2d 100644 --- a/relaxng/schema_rnc.php +++ b/relaxng/schema_rnc.php @@ -88,7 +88,7 @@ $quantParam = "x".dechex(bindec($bquant)); // $expr = "expr"; -$expr_val_absent = 0; +//$expr_val_absent = 0; $expr_plex = 1; $expr_val_nondefault = 2; $expr_in = 3; @@ -320,7 +320,7 @@ $needResl = extractBit($bquant, $quant_resl); $enableRepo = extractBit($bquant, $quant_repo); - $enableValAbsent = extractBit($bexpr, $expr_val_absent); + //$enableValAbsent = extractBit($bexpr, $expr_val_absent); $enablePlex = extractBit($bexpr, $expr_plex); $enableValND = extractBit($bexpr, $expr_val_nondefault); $NeedValND = $enableValND; @@ -795,11 +795,11 @@ } // Include empty initialization of set-valued attribute if needed - if ( $enableValAbsent ){ - echo "#\n# SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL\n"; - echo "#\n".'include "' . $modulesLocation . - 'val_absence_expansion_module.rnc"'."$end\n"; - } +// if ( $enableValAbsent ){ +// echo "#\n# SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL\n"; +// echo "#\n".'include "' . $modulesLocation . +// 'val_absence_expansion_module.rnc"'."$end\n"; +// } // Include set-valued expression attribute if needed if ($needValAtt){ echo "#\n# SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED\n"; diff --git a/test/rnc-test-suites/web-test-suite/naffologeq_curies_variants.ruleml b/test/rnc-test-suites/web-test-suite/naffologeq_curies_variants.ruleml new file mode 100644 index 00000000..442fad9e --- /dev/null +++ b/test/rnc-test-suites/web-test-suite/naffologeq_curies_variants.ruleml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + friend + Jane + constant b + test + 12 + 12 + 12a + tomorrow + 2002-10-10T17:00:00Z + test12 + Jack + y + + + + + + + + a + fx + + + + + + + \ No newline at end of file