From 1825366a1ec82aadbc8161442ca967258ccc7a30 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 1 Nov 2017 13:24:29 -0700 Subject: [PATCH] schema/ListedLicense: Do not allow or inside By differentiating between formattedAltText..., which may contain and , and formattedFixedText..., which may not. The optionalType is using formattedAltTextGroup, because nesting variable content inside an optional element can be useful [1,2]. The element, on the other hand, specifies all the variable options in its match attribute, so there's no need for nesting variable elements inside the alt body. Also require fixed text for , since those aren't templates. And drop the unused notesType, since they're vanilla formatted text. We almost certainly want to drop titleText and copyrightText fro the formatted*TextGroup choices, but I'm leaving that for [3]. [1]: https://github.com/spdx/license-list-XML/issues/393 [2]: https://github.com/spdx/license-list-XML/issues/462 [3]: https://github.com/spdx/license-list-XML/pull/452 --- schema/ListedLicense.xsd | 57 ++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/schema/ListedLicense.xsd b/schema/ListedLicense.xsd index c2cb3e586..07f96cd49 100644 --- a/schema/ListedLicense.xsd +++ b/schema/ListedLicense.xsd @@ -19,12 +19,12 @@ - - - + + + - + @@ -38,13 +38,13 @@ - - - - + + + + - + @@ -57,47 +57,52 @@ - - - - - - - - - + - + - + - - + + + + + - + + + + + + + + + + + - + - - + +