Work on documentation.

Update ipptool to support inequality ("WITH-VALUE !number") conditions.

Add PWG 5100.13 (NODRIVER) test file.

Author: michaelrsweet

cups/Makefile

@@ -674,13 +674,13 @@ tlscheck:	tlscheck.o $(LIBCUPS_STATIC)
 
 doc:
 	echo "Generating CUPS Programming Manual..."
-	$(RM) cupspm.xml
-	codedoc --section "Programming" --body cupspm.md cupspm.xml \
-		$(LIBOBJS:.o=.c) tls-openssl.c $(HEADERS) --coverimage cupspm.png \
-		--epub ../doc/cupspm.epub
-	codedoc --section "Programming" --body cupspm.md \
-		cupspm.xml > ../doc/cupspm.html
-	$(RM) cupspm.xml
+	$(RM) cupspm3.xml
+	codedoc --section "Programming" --body cupspm3.md cupspm3.xml \
+		$(LIBOBJS:.o=.c) tls-openssl.c $(HEADERS) --coverimage cupspm3.png \
+		--epub ../doc/cupspm3.epub
+	codedoc --section "Programming" --body cupspm3.md \
+		cupspm3.xml > ../doc/cupspm3.html
+	$(RM) cupspm3.xml
 
 
 #

cups/cupspm-icon.png cups/cupspm3-icon.pngcups/cupspm-icon.png renamed to cups/cupspm3-icon.png

@@ -1,5 +1,5 @@
 ---
-title: CUPS Programming Manual
+title: CUPS 3.0 Programming Manual
 author: Michael R Sweet
 copyright: Copyright © 2021-2025 by OpenPrinting. All Rights Reserved.
 version: 3.0.0
@@ -11,16 +11,16 @@ version: 3.0.0
 
 # Introduction
 
-CUPS provides the "cups" library to talk to the different parts of CUPS and with
-Internet Printing Protocol (IPP) printers. The "cups" library functions are
+CUPS 3.0 provides the "cups3" library to talk to the different parts of CUPS and
+with Internet Printing Protocol (IPP) printers. The "cups" library functions are
 accessed by including the `<cups/cups.h>` header.
 
 CUPS is based on the Internet Printing Protocol ("IPP"), which allows clients
 (applications) to communicate with a server (the scheduler, printers, etc.) to
 get a list of destinations, send print jobs, and so forth.  You identify which
 server you want to communicate with using a pointer to the opaque structure
 `http_t`.  The `CUPS_HTTP_DEFAULT` constant can be used when you want to talk to
-the CUPS scheduler.
+the default CUPS spooler.
 
 
 ## Guidelines

cups/cupspm.md cups/cupspm3.mdcups/cupspm.md renamed to cups/cupspm3.md

@@ -18,8 +18,8 @@ DOCFILES	=	\
 			cups.svg \
 			cups-oauth.html \
 			cups-x509.html \
-			cupspm.epub \
-			cupspm.html \
+			cupspm3.epub \
+			cupspm3.html \
 			index.html \
 			ippeveprinter.html \
 			ippfind.html \

cups/cupspm.png cups/cupspm3.pngcups/cupspm.png renamed to cups/cupspm3.png

@@ -219,39 +219,43 @@ <h2 id="cups-oauth-1.options">Options</h2>
 The default is to request authorization for all supported OpenID scopes.
 </p>
     <h2 id="cups-oauth-1.sub-commands">Sub-Commands</h2>
-    <h3 id="cups-oauth-1.sub-commands.authorize">Authorize</h3>
-<p>Starts an authorization workflow with the default web browser.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>authorize</strong> [<em>RESOURCE</em>]<br>
+Starts an authorization workflow with the default web browser.
 If a resource URI is specified, the authorization is specific to that resource.
 The access token is send to the standard output on success.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.clear">Clear</h3>
-<p>Clears any authorization for the specified resource or for all resources if no resource URI is supplied.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>clear</strong> [<em>RESOURCE</em>]<br>
+Clears any authorization for the specified resource or for all resources if no resource URI is supplied.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.get-access-token">Get-Access-Token</h3>
-<p>Output the current, unexpired access token, if any, to the standard output.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>get-access-token</strong> [<em>RESOURCE</em>]<br>
+Output the current, unexpired access token, if any, to the standard output.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.get-client-id">Get-Client-Id</h3>
-<p>Output the client ID string, if any, to the standard output.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>get-client-id</strong><br>
+Output the client ID string, if any, to the standard output.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.get-device-grant">Get-Device-Grant</h3>
-<p>Gets a device authorization grant and outputs the device code, user code, and web page to the standard output.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>get-device-grant</strong> [<em>RESOURCE</em>]<br>
+Gets a device authorization grant and outputs the device code, user code, and web page to the standard output.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.get-device-token">Get-Device-Token</h3>
-<p>Waits for device authorization to complete and outputs the device access token to the standard output.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>get-device-token</strong> [<em>RESOURCE</em>] <em>DEVICE-CODE</em><br>
+Waits for device authorization to complete and outputs the device access token to the standard output.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.get-metadata">Get-Metadata</h3>
-<p>Get the OAuth/OpenID authorization server metadata and send it to the standard output.
-If a name is specified, the output is just the value for the specified metadata.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>get-metadata</strong> [<em>NAME</em>]<br>
+Get the OAuth/OpenID authorization server metadata and send it to the standard output.
+If
+<em>NAME</em>
+is specified, the output is just the value for the named metadata.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.get-user-id">Get-User-Id</h3>
-<p>Get the OpenID user ID information and send it to the standard output.
-If a name is specified, the output is just the named claim from the user ID.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>get-user-id</strong> [<em>RESOURCE</em>] [<em>NAME</em>]<br>
+Get the OpenID user ID information and send it to the standard output.
+If
+<em>NAME</em>
+is specified, the output is just the named claim from the user ID.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.set-access-token">Set-Access-Token</h3>
-<p>Set the access token (which is sometimes also called an API key) for the specified resource or for all resources.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>set-access-token</strong> [<em>RESOURCE</em>] <em>TOKEN</em><br>
+Set the access token (which is sometimes also called an API key) for the specified resource or for all resources.
 </p>
-    <h3 id="cups-oauth-1.sub-commands.set-client-data">Set-Client-Data</h3>
-<p>Set the client ID string and secret for an OAuth/OpenID authorization server.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>set-client-data</strong> <em>CLIENT-ID</em> <em>CLIENT-SECRET</em><br>
+Set the client ID string and secret for an OAuth/OpenID authorization server.
 </p>
     <h2 id="cups-oauth-1.environment-variables">Environment Variables</h2>
 <p>The

cups/cupspm.svg cups/cupspm3.svgcups/cupspm.svg renamed to cups/cupspm3.svg

@@ -97,7 +97,7 @@
   <body>
     <h1 id="cups-x509-1">cups-x509(1)</h1>
     <h2 id="cups-x509-1.name">Name</h2>
-<p>cups-x509 - description
+<p>cups-x509 - manage x.509 certificates and certificate requests
 </p>
     <h2 id="cups-x509-1.synopsis">Synopsis</h2>
 <p><strong>cups-x509</strong>
@@ -215,31 +215,33 @@ <h2 id="cups-x509-1.options">Options</h2>
 The preset &quot;default-ca&quot; specifies those uses required for a Certificate Authority, and the preset &quot;default-tls&quot; specifies those uses required for TLS.
 </p>
     <h2 id="cups-x509-1.sub-commands">Sub-Commands</h2>
-    <h3 id="cups-x509-1.sub-commands.ca-common-name">Ca Common-Name</h3>
-<p>Sign a certificate request for the specified common name.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>ca </strong><em>COMMON-NAME</em><br>
+Sign a certificate request for the specified common name.
 </p>
-    <h3 id="cups-x509-1.sub-commands.cacert-common-name">Cacert Common-Name</h3>
-<p>Create a CA certificate for the specified common name.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>cacert </strong><em>COMMON-NAME</em><br>
+Create a CA certificate for the specified common name.
 </p>
-    <h3 id="cups-x509-1.sub-commands.cert-common-name">Cert Common-Name</h3>
-<p>Create a certificate for the specified common name.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>cert </strong><em>COMMON-NAME</em><br>
+Create a certificate for the specified common name.
 </p>
-    <h3 id="cups-x509-1.sub-commands.client-uri">Client Uri</h3>
-<p>Connect to the specified URI and validate the server's certificate.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>client </strong><em>URI</em><br>
+Connect to the specified URI and validate the server's certificate.
 </p>
-    <h3 id="cups-x509-1.sub-commands.csr-common-name">Csr Common-Name</h3>
-<p>Create a certificate signing request for the specified common name.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>csr </strong><em>COMMON-NAME</em><br>
+Create a certificate signing request for the specified common name.
 </p>
-    <h3 id="cups-x509-1.sub-commands.install-common-name-filename.crt-filename.key">Install Common-Name Filename.Crt [Filename.Key]</h3>
-<p>Installs a certificate and optional private key for the specified common name.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>install </strong><em>COMMON-NAME FILENAME.crt</em> [<em>FILENAME.key</em>]<br>
+Installs a certificate and optional private key for the specified common name.
 The certificate and private key are PEM-encoded files.
 </p>
-    <h3 id="cups-x509-1.sub-commands.server-common-nameport">Server Common-Name[:Port]</h3>
-<p>Run a HTTPS test server that echos back the resource path for every GET request.
-If PORT is not specified, uses a port number from 8000 to 8999.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>server </strong><em>COMMON-NAME</em>[<strong>:</strong><em>PORT</em>]<br>
+Run a HTTPS test server that echos back the resource path for every GET request.
+If
+<em>PORT</em>
+is not specified, uses a port number from 8000 to 8999.
 </p>
-    <h3 id="cups-x509-1.sub-commands.show-common-name">Show Common-Name</h3>
-<p>Shows any stored credentials for the specified common name.
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>show </strong><em>COMMON-NAME</em><br>
+Shows any stored credentials for the specified common name.
 </p>
     <h2 id="cups-x509-1.examples">Examples</h2>
 <p>Create a certificate signing request for a 384-bit ECDSA certificate for &quot;server.example.com&quot;:
@@ -250,9 +252,9 @@ <h2 id="cups-x509-1.examples">Examples</h2>
 </p>
     <pre>     cups-x509 install server.example.com server.example.com.crt
 </pre>
-<p>Run a test server for &quot;server.exmaple.com&quot; on port 8080:
+<p>Run a test server for &quot;server.example.com&quot; on port 8080:
 </p>
-    <pre>     cups-x509 server SERVER-NAME:8080
+    <pre>     cups-x509 server server.example.com:8080
 </pre>
 <p>Test a HTTPS client connection to &quot;www.example.com&quot; with validation:
 </p>