Add WITH-ALL-VALUES-FROM predicate (Issue #20)

Author: michaelrsweet

CHANGES.md

@@ -22,6 +22,7 @@ libcups v3.0b1 (Month DD, YYYY)
 - Added a roll to the default color ippeveprinter printer.
 - Added new DNS-SD API (Issue #19)
 - Added new PWG media sizes.
+- Added new `EXPECT-ALL-VALUES-FROM` predicate for ipptool files (Issue #20)
 - Added, modernized, and promoted the localization interfaces to public API
   (Issue #24)
 - Added public JSON API (Issue #31)

doc/ipptoolfile.html

@@ -394,6 +394,10 @@ <h3 id="ipptoolfile-5.description.expect-predicates">Expect Predicates</h3>
     <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>WITH-ALL-VALUES &quot;/</strong><em>regular expression</em><strong>/&quot;</strong><br>
 Requires that all values of the <strong>EXPECT</strong> attribute match the regular expression, which must conform to the POSIX regular expression syntax.
 Comparisons are case-sensitive.
+</p>
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>WITH-ALL-VALUES-FROM </strong><em>attribute-name</em><br>
+Requires that all value(s) of the <strong>EXPECT</strong> attribute matches the value(s) in the specified attribute.
+For example, &quot;EXPECT-ALL media-col-database/media-source WITH-ALL-VALUES-FROM media-source-supported&quot; requires that all the &quot;media-source&quot; values are listed as a value of the &quot;media-source-supported&quot; attribute.
 </p>
     <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>WITH-DISTINCT-VALUES</strong><br>
 Requires that all values of the <strong>EXPECT</strong> attribute are unique.

man/ipptoolfile.5

@@ -368,6 +368,10 @@ Requires that all values of the \fBEXPECT\fR attribute match the boolean value g
 Requires that all values of the \fBEXPECT\fR attribute match the regular expression, which must conform to the POSIX regular expression syntax.
 Comparisons are case-sensitive.
 .TP 5
+\fBWITH\-ALL\-VALUES\-FROM \fIattribute-name\fR
+Requires that all value(s) of the \fBEXPECT\fR attribute matches the value(s) in the specified attribute.
+For example, "EXPECT-ALL media\-col\-database/media\-source WITH\-ALL\-VALUES\-FROM media\-source\-supported" requires that all the "media\-source" values are listed as a value of the "media\-source\-supported" attribute.
+.TP 5
 \fBWITH\-DISTINCT\-VALUES\fR
 Requires that all values of the \fBEXPECT\fR attribute are unique.
 Comparisons are case-sensitive.

tools/ipptool.c

@@ -5126,6 +5126,7 @@ token_cb(ipp_file_t     *f,		/* I - IPP file data */
 	_cups_strcasecmp(token, "REPEAT-NO-MATCH") &&
 	_cups_strcasecmp(token, "SAME-COUNT-AS") &&
 	_cups_strcasecmp(token, "WITH-ALL-VALUES") &&
+	_cups_strcasecmp(token, "WITH-ALL-VALUES-FROM") &&
 	_cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") &&
 	_cups_strcasecmp(token, "WITH-ALL-RESOURCES") &&
 	_cups_strcasecmp(token, "WITH-ALL-SCHEMES") &&
@@ -6073,7 +6074,8 @@ token_cb(ipp_file_t     *f,		/* I - IPP file data */
 	return (false);
       }
     }
-    else if (!_cups_strcasecmp(token, "WITH-VALUE-FROM"))
+    else if (!_cups_strcasecmp(token, "WITH-ALL-VALUES-FROM") ||
+	     !_cups_strcasecmp(token, "WITH-VALUE-FROM"))
     {
       if (!ippFileReadToken(f, temp, sizeof(temp)))
       {
@@ -6091,6 +6093,9 @@ token_cb(ipp_file_t     *f,		/* I - IPP file data */
 
 	data->last_expect->with_value_from = strdup(value);
 	data->last_expect->with_flags      = IPPTOOL_WITH_LITERAL;
+
+	if (!_cups_strncasecmp(token, "WITH-ALL-", 9))
+	  data->last_expect->with_flags |= IPPTOOL_WITH_ALL;
       }
       else
       {