Bump clang-format to version 20 and reformat

This improves indentation of long strings. This commit also fixes some trailing whitespace in ChangeLog.

Bump clang-format to version 20 and reformat
This improves indentation of long strings. This commit also fixes some trailing whitespace in ChangeLog.
Jay Berkenbilt
1 parent badcdf8f
Showing 35 changed files with 263 additions and 192 deletions
ChangeLog
examples/pdf-attach-file.cc
examples/pdf-create.cc
format-code
include/qpdf/QPDFObjectHandle.hh
include/qpdf/QPDFObjectHandle_future.hh
libqpdf/InputSource.cc
libqpdf/NNTree.cc
libqpdf/Pl_AES_PDF.cc
libqpdf/Pl_ASCIIHexDecoder.cc
libqpdf/QPDF.cc
libqpdf/QPDFAcroFormDocumentHelper.cc
libqpdf/QPDFFormFieldObjectHelper.cc
libqpdf/QPDFJob.cc
libqpdf/QPDFJob_json.cc
libqpdf/QPDFLogger.cc
libqpdf/QPDFObjectHandle.cc
libqpdf/QPDFPageDocumentHelper.cc
libqpdf/QPDFPageObjectHelper.cc
libqpdf/QPDFParser.cc
@@ -49,7 +49,7 @@
 	* Add QPDF::setMaxWarnings to set the maximum of warnings before
 	warning suppression.
-	* Add static option to Pl_DCT to limit memory usage of 
+	* Add static option to Pl_DCT to limit memory usage of
 	decompression. The option is generally exposed but is primarily
 	intended to support fuzz tests, which have explicit memory limits
 	that are smaller than what is commonly seen in the wild with PDF
@@ -86,13 +86,14 @@ process(
     // Create appearance stream for the attachment.
-    auto ap = q.newStream("0 10 m\n"
-                          "10 0 l\n"
-                          "20 10 l\n"
-                          "10 0 m\n"
-                          "10 20 l\n"
-                          "0 0 20 20 re\n"
-                          "S\n");
+    auto ap = q.newStream(
+        "0 10 m\n"
+        "10 0 l\n"
+        "20 10 l\n"
+        "10 0 m\n"
+        "10 20 l\n"
+        "0 0 20 20 re\n"
+        "S\n");
     auto apdict = ap.getDict();
     // The following four lines demonstrate the use of the qpdf literal syntax introduced in
@@ -105,21 +106,22 @@ process(
     apdict.replaceKey("/Type", "/XObject"_qpdf);
     apdict.replaceKey("/Subtype", "/Form"_qpdf);
     apdict.replaceKey("/BBox", "[ 0 0 20 20 ]"_qpdf);
-    auto annot = q.makeIndirectObject(QPDFObjectHandle::parse(
-        &q,
-        ("<<"
-         "  /AP <<"
-         "    /N " +
-         ap.unparse() +
-         "  >>"
-         "  /Contents " +
-         QPDFObjectHandle::newUnicodeString(attachment).unparse() + "  /FS " +
-         fs.getObjectHandle().unparse() + "  /NM " +
-         QPDFObjectHandle::newUnicodeString(attachment).unparse() +
-         "  /Rect [ 72 700 92 720 ]"
-         "  /Subtype /FileAttachment"
-         "  /Type /Annot"
-         ">>")));
+    auto annot = q.makeIndirectObject(
+        QPDFObjectHandle::parse(
+            &q,
+            ("<<"
+             "  /AP <<"
+             "    /N " +
+             ap.unparse() +
+             "  >>"
+             "  /Contents " +
+             QPDFObjectHandle::newUnicodeString(attachment).unparse() + "  /FS " +
+             fs.getObjectHandle().unparse() + "  /NM " +
+             QPDFObjectHandle::newUnicodeString(attachment).unparse() +
+             "  /Rect [ 72 700 92 720 ]"
+             "  /Subtype /FileAttachment"
+             "  /Type /Annot"
+             ">>")));
     // Generate contents for the page.
     auto contents = q.newStream(("q\n"
@@ -194,10 +194,11 @@ add_page(
     QPDFObjectHandle contents = createPageContents(pdf, color_space + " with filter " + filter);
     // Create the page dictionary
-    QPDFObjectHandle page = pdf.makeIndirectObject("<<"
-                                                   " /Type /Page"
-                                                   " /MediaBox [0 0 612 392]"
-                                                   ">>"_qpdf);
+    QPDFObjectHandle page = pdf.makeIndirectObject(
+        "<<"
+        " /Type /Page"
+        " /MediaBox [0 0 612 392]"
+        ">>"_qpdf);
     page.replaceKey("/Contents", contents);
     page.replaceKey("/Resources", resources);
@@ -23,7 +23,7 @@
 # are improvements, bump the minimum required version of clang-format
 # here, and update manual/contributing.rst. There's a comment there
 # that refers to this comment. See also .clang-format.
-min_version=18
+min_version=20
 clang_format=clang-format
 if clang-format-$min_version --version >/dev/null 2>&1; then
@@ -1639,7 +1639,8 @@ QPDFObjectHandle::isInitialized() const
     return obj != nullptr;
 }
-inline QPDFObjectHandle::operator bool() const noexcept
+inline QPDFObjectHandle::
+operator bool() const noexcept
 {
     return static_cast<bool>(obj);
 }
@@ -1639,7 +1639,8 @@ QPDFObjectHandle::isInitialized() const noexcept
     return obj != nullptr;
 }
-inline QPDFObjectHandle::operator bool() const noexcept
+inline QPDFObjectHandle::
+operator bool() const noexcept
 {
     return static_cast<bool>(obj);
 }
@@ -57,8 +57,9 @@ InputSource::findFirst(char const* start_chars, qpdf_offset_t offset, size_t len
     // memory.
     size_t size = sizeof(buf) - 1;
     if ((strlen(start_chars) < 1) || (strlen(start_chars) > size)) {
-        throw std::logic_error("InputSource::findSource called with"
-                               " too small or too large of a character sequence");
+        throw std::logic_error(
+            "InputSource::findSource called with"
+            " too small or too large of a character sequence");
     }
     char* p = nullptr;
@@ -62,8 +62,9 @@ NNTreeIterator::updateIValue(bool allow_invalid)
     }
     if (!okay) {
         if (!allow_invalid) {
-            throw std::logic_error("attempt made to dereference an invalid"
-                                   " name/number tree iterator");
+            throw std::logic_error(
+                "attempt made to dereference an invalid"
+                " name/number tree iterator");
         }
         this->ivalue.first = QPDFObjectHandle();
         this->ivalue.second = QPDFObjectHandle();
@@ -111,8 +111,9 @@ Pl_AES_PDF::finish()
             // However, we have encountered files for which the output is not a multiple of the
             // block size.  In this case, pad with zeroes and hope for the best.
             if (this->offset >= this->buf_size) {
-                throw std::logic_error("buffer overflow in AES encryption"
-                                       " pipeline");
+                throw std::logic_error(
+                    "buffer overflow in AES encryption"
+                    " pipeline");
             }
             std::memset(this->inbuf + this->offset, 0, this->buf_size - this->offset);
             this->offset = this->buf_size;
@@ -47,8 +47,9 @@ Pl_ASCIIHexDecoder::write(unsigned char const* buf, size_t len)
                 t[0] = ch;
                 t[1] = 0;
                 throw std::runtime_error(
-                    std::string("character out of range"
-                                " during base Hex decode: ") +
+                    std::string(
+                        "character out of range"
+                        " during base Hex decode: ") +
                     t);
             }
             break;
@@ -101,9 +101,10 @@ namespace
         void
         throwException()
         {
-            throw std::logic_error("QPDF operation attempted on a QPDF object with no input "
-                                   "source. QPDF operations are invalid before processFile (or "
-                                   "another process method) or after closeInputSource");
+            throw std::logic_error(
+                "QPDF operation attempted on a QPDF object with no input "
+                "source. QPDF operations are invalid before processFile (or "
+                "another process method) or after closeInputSource");
         }
     };
 } // namespace
@@ -495,8 +496,9 @@ QPDF::inParse(bool v)
     if (m->in_parse == v) {
         // This happens if QPDFParser::parse tries to resolve an indirect object while it is
         // parsing.
-        throw std::logic_error("QPDF: re-entrant parsing detected. This is a qpdf bug."
-                               " Please report at https://github.com/qpdf/qpdf/issues.");
+        throw std::logic_error(
+            "QPDF: re-entrant parsing detected. This is a qpdf bug."
+            " Please report at https://github.com/qpdf/qpdf/issues.");
     }
     m->in_parse = v;
 }
@@ -1188,8 +1190,9 @@ QPDF::processXRefIndex(
                         throw damaged(
                             "Cross-reference stream's /Index contains a negative object id");
                     } else if (first > max_num_entries) {
-                        throw damaged("Cross-reference stream's /Index contains an impossibly "
-                                      "large object id");
+                        throw damaged(
+                            "Cross-reference stream's /Index contains an impossibly "
+                            "large object id");
                     }
                 }
             } else {
@@ -1392,8 +1395,9 @@ QPDF::showXRefTable()
             break;
         default:
-            throw std::logic_error("unknown cross-reference table type while"
-                                   " showing xref_table");
+            throw std::logic_error(
+                "unknown cross-reference table type while"
+                " showing xref_table");
             break;
         }
         m->log->info("\n");
@@ -2266,8 +2270,9 @@ QPDF::copyForeignObject(QPDFObjectHandle foreign)
     ObjCopier& obj_copier = m->object_copiers[other.m->unique_id];
     if (!obj_copier.visiting.empty()) {
-        throw std::logic_error("obj_copier.visiting is not empty"
-                               " at the beginning of copyForeignObject");
+        throw std::logic_error(
+            "obj_copier.visiting is not empty"
+            " at the beginning of copyForeignObject");
     }
     // Make sure we have an object in this file for every referenced object in the old file.
@@ -2439,8 +2444,9 @@ QPDF::copyStreamData(QPDFObjectHandle result, QPDFObjectHandle foreign)
     auto stream = foreign.getObjectPtr()->as<QPDF_Stream>();
     if (stream == nullptr) {
-        throw std::logic_error("unable to retrieve underlying"
-                               " stream object from foreign stream");
+        throw std::logic_error(
+            "unable to retrieve underlying"
+            " stream object from foreign stream");
     }
     std::shared_ptr<Buffer> stream_buffer = stream->getStreamDataBuffer();
     if ((foreign_stream_qpdf.m->immediate_copy_from) && (stream_buffer == nullptr)) {
@@ -276,8 +276,9 @@ QPDFAcroFormDocumentHelper::analyze()
                 // case such as a PDF creator adding a self-contained annotation (merged with the
                 // field dictionary) to the page's /Annots array and forgetting to also put it in
                 // /AcroForm.
-                annot.warnIfPossible("this widget annotation is not"
-                                     " reachable from /AcroForm in the document catalog");
+                annot.warnIfPossible(
+                    "this widget annotation is not"
+                    " reachable from /AcroForm in the document catalog");
                 m->annotation_to_field[og] = QPDFFormFieldObjectHelper(annot);
                 m->field_to_annotations[og].emplace_back(annot);
             }
@@ -296,14 +297,16 @@ QPDFAcroFormDocumentHelper::traverseField(
     }
     if (!field.isIndirect()) {
         QTC::TC("qpdf", "QPDFAcroFormDocumentHelper direct field");
-        field.warnIfPossible("encountered a direct object as a field or annotation while "
-                             "traversing /AcroForm; ignoring field or annotation");
+        field.warnIfPossible(
+            "encountered a direct object as a field or annotation while "
+            "traversing /AcroForm; ignoring field or annotation");
         return;
     }
     if (!field.isDictionary()) {
         QTC::TC("qpdf", "QPDFAcroFormDocumentHelper non-dictionary field");
-        field.warnIfPossible("encountered a non-dictionary as a field or annotation while"
-                             " traversing /AcroForm; ignoring field or annotation");
+        field.warnIfPossible(
+            "encountered a non-dictionary as a field or annotation while"
+            " traversing /AcroForm; ignoring field or annotation");
         return;
     }
     QPDFObjGen og(field.getObjGen());
@@ -331,9 +331,9 @@ QPDFFormFieldObjectHelper::setV(QPDFObjectHandle value, bool need_appearances)
         setFieldAttribute("/V", value);
     }
     if (need_appearances) {
-        QPDF& qpdf =
-            this->oh.getQPDF("QPDFFormFieldObjectHelper::setV called with need_appearances = "
-                             "true on an object that is not associated with an owning QPDF");
+        QPDF& qpdf = this->oh.getQPDF(
+            "QPDFFormFieldObjectHelper::setV called with need_appearances = "
+            "true on an object that is not associated with an owning QPDF");
         QPDFAcroFormDocumentHelper(qpdf).setNeedAppearances(true);
     }
 }
@@ -368,8 +368,9 @@ QPDFFormFieldObjectHelper::setRadioButtonValue(QPDFObjectHandle name)
     QPDFObjectHandle kids = this->oh.getKey("/Kids");
     if (!(isRadioButton() && parent.isNull() && kids.isArray())) {
-        this->oh.warnIfPossible("don't know how to set the value"
-                                " of this field as a radio button");
+        this->oh.warnIfPossible(
+            "don't know how to set the value"
+            " of this field as a radio button");
         return;
     }
     setFieldAttribute("/V", name);
@@ -770,9 +771,9 @@ QPDFFormFieldObjectHelper::generateTextAppearance(QPDFAnnotationObjectHelper&amp; ao
         QTC::TC("qpdf", "QPDFFormFieldObjectHelper create AS from scratch");
         QPDFObjectHandle::Rectangle rect = aoh.getRect();
         QPDFObjectHandle::Rectangle bbox(0, 0, rect.urx - rect.llx, rect.ury - rect.lly);
-        QPDFObjectHandle dict =
-            QPDFObjectHandle::parse("<< /Resources << /ProcSet [ /PDF /Text ] >>"
-                                    " /Type /XObject /Subtype /Form >>");
+        QPDFObjectHandle dict = QPDFObjectHandle::parse(
+            "<< /Resources << /ProcSet [ /PDF /Text ] >>"
+            " /Type /XObject /Subtype /Form >>");
         dict.replaceKey("/BBox", QPDFObjectHandle::newFromRectangle(bbox));
         AS = QPDFObjectHandle::newStream(this->oh.getOwningQPDF(), "/Tx BMC\nEMC\n");
         AS.replaceDict(dict);
@@ -614,8 +614,9 @@ QPDFJob::checkConfiguration()
         usage("no output file may be given for this option");
     }
     if (m->check_requires_password && m->check_is_encrypted) {
-        usage("--requires-password and --is-encrypted may not be given"
-              " together");
+        usage(
+            "--requires-password and --is-encrypted may not be given"
+            " together");
     }
     if (m->encrypt && (!m->allow_insecure) &&
@@ -646,8 +647,9 @@ QPDFJob::checkConfiguration()
     }
     if ((!m->split_pages) && QUtil::same_file(m->infilename.get(), m->outfilename.get())) {
         QTC::TC("qpdf", "QPDFJob same file error");
-        usage("input file and output file are the same; use --replace-input to intentionally "
-              "overwrite the input file");
+        usage(
+            "input file and output file are the same; use --replace-input to intentionally "
+            "overwrite the input file");
     }
     if (m->json_version == 1) {
@@ -2243,8 +2245,9 @@ QPDFJob::handleTransformations(QPDF&amp; pdf)
             }
             last_page_seen = spec.first_page;
             nums.appendItem(QPDFObjectHandle::newInteger(spec.first_page - 1));
-            nums.appendItem(QPDFPageLabelDocumentHelper::pageLabelDict(
-                spec.label_type, spec.start_num, spec.prefix));
+            nums.appendItem(
+                QPDFPageLabelDocumentHelper::pageLabelDict(
+                    spec.label_type, spec.start_num, spec.prefix));
         }
         auto page_labels = QPDFObjectHandle::newDictionary();
         page_labels.replaceKey("/Nums", nums);
@@ -2497,8 +2500,9 @@ QPDFJob::handlePageSpecs(QPDF&amp; pdf, std::vector&lt;std::unique_ptr&lt;QPDF&gt;&gt;&amp; page_hea
     auto n_collate = m->collate.size();
     auto n_specs = parsed_specs.size();
     if (!(n_collate == 0 || n_collate == 1 || n_collate == n_specs)) {
-        usage("--pages: if --collate has more than one value, it must have one value per page "
-              "specification");
+        usage(
+            "--pages: if --collate has more than one value, it must have one value per page "
+            "specification");
     }
     if (n_collate > 0 && n_specs > 1) {
         // Collate the pages by selecting one page from each spec in order. When a spec runs out of
@@ -2706,8 +2710,9 @@ QPDFJob::maybeFixWritePassword(int R, std::string&amp; password)
                     std::string encoded;
                     if (!QUtil::utf8_to_pdf_doc(password, encoded)) {
                         QTC::TC("qpdf", "QPDFJob password not encodable");
-                        throw std::runtime_error("supplied password cannot be encoded for 40-bit "
-                                                 "or 128-bit encryption formats");
+                        throw std::runtime_error(
+                            "supplied password cannot be encoded for 40-bit "
+                            "or 128-bit encryption formats");
                     }
                     password = encoded;
                 }
@@ -2948,13 +2953,15 @@ QPDFJob::setWriterOptions(QPDFWriter&amp; w)
     }
     if (m->progress) {
         if (m->progress_handler) {
-            w.registerProgressReporter(std::shared_ptr<QPDFWriter::ProgressReporter>(
-                new QPDFWriter::FunctionProgressReporter(m->progress_handler)));
+            w.registerProgressReporter(
+                std::shared_ptr<QPDFWriter::ProgressReporter>(
+                    new QPDFWriter::FunctionProgressReporter(m->progress_handler)));
         } else {
             char const* outfilename = m->outfilename ? m->outfilename.get() : "standard output";
-            w.registerProgressReporter(std::shared_ptr<QPDFWriter::ProgressReporter>(
-                // line-break
-                new ProgressReporter(*m->log->getInfo(), m->message_prefix, outfilename)));
+            w.registerProgressReporter(
+                std::shared_ptr<QPDFWriter::ProgressReporter>(
+                    // line-break
+                    new ProgressReporter(*m->log->getInfo(), m->message_prefix, outfilename)));
         }
     }
 }
@@ -3127,8 +3134,9 @@ QPDFJob::writeJSON(QPDF&amp; pdf)
         fp = std::make_shared<Pl_StdioFile>("json output", fc->f);
     } else if ((m->json_stream_data == qpdf_sj_file) && m->json_stream_prefix.empty()) {
         QTC::TC("qpdf", "QPDFJob need json-stream-prefix for stdout");
-        usage("please specify --json-stream-prefix since the input file "
-              "name is unknown");
+        usage(
+            "please specify --json-stream-prefix since the input file "
+            "name is unknown");
     } else {
         QTC::TC("qpdf", "QPDFJob write json to stdout");
         m->log->saveToStandardOutput(true);
@@ -295,13 +295,15 @@ Handlers::beginEncrypt(JSON j)
     });
     if (key_len == 0) {
         QTC::TC("qpdf", "QPDFJob json encrypt no key length");
-        usage("exactly one of 40bit, 128bit, or 256bit must be given; an empty dictionary may be "
-              "supplied for one of them to set the key length without imposing any restrictions");
+        usage(
+            "exactly one of 40bit, 128bit, or 256bit must be given; an empty dictionary may be "
+            "supplied for one of them to set the key length without imposing any restrictions");
     }
     if (!(user_password_seen && owner_password_seen)) {
         QTC::TC("qpdf", "QPDFJob json encrypt missing password");
-        usage("the user and owner password are both required; use the empty string for the user "
-              "password if you don't want a password");
+        usage(
+            "the user and owner password are both required; use the empty string for the user "
+            "password if you don't want a password");
     }
     this->c_enc = c_main->encrypt(key_len, user_password, owner_password);
 }
@@ -200,8 +200,9 @@ QPDFLogger::setSave(std::shared_ptr&lt;Pipeline&gt; p, bool only_if_not_set)
     if (p == m->p_stdout) {
         auto pt = dynamic_cast<Pl_Track*>(p.get());
         if (pt->getUsed()) {
-            throw std::logic_error("QPDFLogger: called setSave on standard output after standard"
-                                   " output has already been used");
+            throw std::logic_error(
+                "QPDFLogger: called setSave on standard output after standard"
+                " output has already been used");
         }
         if (m->p_info == m->p_stdout) {
             m->p_info = m->p_stderr;
@@ -1507,8 +1507,9 @@ QPDFObjectHandle::getUniqueResourceName(
     // This could only happen if there is a coding error.
     // The number of candidates we test is more than the
     // number of keys we're checking against.
-    throw std::logic_error("unable to find unconflicting name in"
-                           " QPDFObjectHandle::getUniqueResourceName");
+    throw std::logic_error(
+        "unable to find unconflicting name in"
+        " QPDFObjectHandle::getUniqueResourceName");
 }
 // Dictionary mutators
@@ -2820,8 +2821,9 @@ QPDFObjectHandle::checkOwnership(QPDFObjectHandle const&amp; item) const
     auto item_qpdf = item.getOwningQPDF();
     if ((qpdf != nullptr) && (item_qpdf != nullptr) && (qpdf != item_qpdf)) {
         QTC::TC("qpdf", "QPDFObjectHandle check ownership");
-        throw std::logic_error("Attempting to add an object from a different QPDF. Use "
-                               "QPDF::copyForeignObject to add objects from another file.");
+        throw std::logic_error(
+            "Attempting to add an object from a different QPDF. Use "
+            "QPDF::copyForeignObject to add objects from another file.");
     }
 }
@@ -59,8 +59,9 @@ QPDFPageDocumentHelper::flattenAnnotations(int required_flags, int forbidden_fla
     if (afdh.getNeedAppearances()) {
         this->qpdf.getRoot()
             .getKey("/AcroForm")
-            .warnIfPossible("document does not have updated appearance streams, so form fields "
-                            "will not be flattened");
+            .warnIfPossible(
+                "document does not have updated appearance streams, so form fields "
+                "will not be flattened");
     }
     for (auto& ph: getAllPages()) {
         QPDFObjectHandle resources = ph.getAttribute("/Resources", true);
@@ -551,9 +551,10 @@ QPDFPageObjectHelper::removeUnreferencedResourcesHelper(
         ph.parseContents(&rf);
         size_t after_nw = (q ? q->numWarnings() : 0);
         if (after_nw > before_nw) {
-            ph.oh.warnIfPossible("Bad token found while scanning content stream; "
-                                 "not attempting to remove unreferenced objects from"
-                                 " this object");
+            ph.oh.warnIfPossible(
+                "Bad token found while scanning content stream; "
+                "not attempting to remove unreferenced objects from"
+                " this object");
             return false;
         }
     } catch (std::exception& e) {
@@ -715,8 +716,9 @@ QPDFPageObjectHelper::getFormXObjectForPage(bool handle_transformations)
     newdict.replaceKey("/Group", getAttribute("/Group", false).shallowCopy());
     QPDFObjectHandle bbox = getTrimBox(false).shallowCopy();
     if (!bbox.isRectangle()) {
-        this->oh.warnIfPossible("bounding box is invalid; form"
-                                " XObject created from page will not work");
+        this->oh.warnIfPossible(
+            "bounding box is invalid; form"
+            " XObject created from page will not work");
     }
     newdict.replaceKey("/BBox", bbox);
     auto provider =
@@ -1018,8 +1020,9 @@ QPDFPageObjectHelper::copyAnnotations(
         from_afdh = afdh;
     } else if (from_afdh) {
         if (from_afdh->getQPDF().getUniqueId() != from_qpdf.getUniqueId()) {
-            throw std::logic_error("QPDFAcroFormDocumentHelper::copyAnnotations: from_afdh"
-                                   " is not from the same QPDF as from_page");
+            throw std::logic_error(
+                "QPDFAcroFormDocumentHelper::copyAnnotations: from_afdh"
+                " is not from the same QPDF as from_page");
         }
     } else {
         from_afdhph = std::make_shared<QPDFAcroFormDocumentHelper>(from_qpdf);
@@ -160,8 +160,9 @@ QPDFParser::parseRemainder(bool content_stream)
                 tokenizer.getValue() == "R") {
                 if (context == nullptr) {
                     QTC::TC("qpdf", "QPDFParser indirect without context");
-                    throw std::logic_error("QPDFParser::parse called without context on an object "
-                                           "with indirect references");
+                    throw std::logic_error(
+                        "QPDFParser::parse called without context on an object "
+                        "with indirect references");
                 }
                 auto id = QIntC::to_int(int_buffer[(int_count - 1) % 2]);
                 auto gen = QIntC::to_int(int_buffer[(int_count) % 2]);
@@ -470,8 +471,9 @@ bool
 QPDFParser::tooManyBadTokens()
 {
     if (frame->olist.size() > 5'000 || frame->dict.size() > 5'000) {
-        warn("encountered errors while parsing an array or dictionary with more than 5000 "
-             "elements; giving up on reading object");
+        warn(
+            "encountered errors while parsing an array or dictionary with more than 5000 "
+            "elements; giving up on reading object");
         return true;
     }
     if (--max_bad_count > 0 && good_count > 4) {
@@ -1012,8 +1012,9 @@ QPDFWriter::pushMD5Pipeline(PipelinePopper&amp; pp)
 {
     if (!m->id2.empty()) {
         // Can't happen in the code
-        throw std::logic_error("Deterministic ID computation enabled after ID"
-                               " generation has already occurred.");
+        throw std::logic_error(
+            "Deterministic ID computation enabled after ID"
+            " generation has already occurred.");
     }
     qpdf_assert_debug(m->deterministic_id);
     qpdf_assert_debug(m->md5_pipeline == nullptr);
@@ -1081,8 +1082,9 @@ QPDFWriter::enqueueObject(QPDFObjectHandle object)
         // original QPDF gets destroyed, which just disconnects the QPDFObjectHandle from its owner.
         if (object.getOwningQPDF() != &(m->pdf)) {
             QTC::TC("qpdf", "QPDFWriter foreign object");
-            throw std::logic_error("QPDFObjectHandle from different QPDF found while writing.  Use "
-                                   "QPDF::copyForeignObject to add objects from another file.");
+            throw std::logic_error(
+                "QPDFObjectHandle from different QPDF found while writing.  Use "
+                "QPDF::copyForeignObject to add objects from another file.");
         }
         if (m->qdf_mode && object.isStreamOfType("/XRef")) {
@@ -1876,9 +1878,10 @@ QPDFWriter::generateID()
         if (m->deterministic_id) {
             if (m->deterministic_id_data.empty()) {
                 QTC::TC("qpdf", "QPDFWriter deterministic with no data");
-                throw std::runtime_error("INTERNAL ERROR: QPDFWriter::generateID has no data for "
-                                         "deterministic ID.  This may happen if deterministic ID "
-                                         "and file encryption are requested together.");
+                throw std::runtime_error(
+                    "INTERNAL ERROR: QPDFWriter::generateID has no data for "
+                    "deterministic ID.  This may happen if deterministic ID "
+                    "and file encryption are requested together.");
             }
             seed += m->deterministic_id_data;
         } else {
@@ -209,8 +209,9 @@ QPDF_Stream::writeStreamJSON(
     case qpdf_sj_none:
     case qpdf_sj_inline:
         if (p != nullptr) {
-            throw std::logic_error("QPDF_Stream::writeStreamJSON: pipeline should only be supplied "
-                                   "when json_data is file");
+            throw std::logic_error(
+                "QPDF_Stream::writeStreamJSON: pipeline should only be supplied "
+                "when json_data is file");
         }
         break;
     case qpdf_sj_file:
@@ -219,8 +220,9 @@ QPDF_Stream::writeStreamJSON(
                 "QPDF_Stream::writeStreamJSON: pipeline must be supplied when json_data is file");
         }
         if (data_filename.empty()) {
-            throw std::logic_error("QPDF_Stream::writeStreamJSON: data_filename must be supplied "
-                                   "when json_data is file");
+            throw std::logic_error(
+                "QPDF_Stream::writeStreamJSON: data_filename must be supplied "
+                "when json_data is file");
         }
         break;
     }
@@ -617,13 +619,15 @@ QPDF_Stream::pipeStreamData(
         warn("content normalization encountered bad tokens");
         if (normalizer->lastTokenWasBad()) {
             QTC::TC("qpdf", "QPDF_Stream bad token at end during normalize");
-            warn("normalized content ended with a bad token; you may be able to resolve this by "
-                 "coalescing content streams in combination with normalizing content. From the "
-                 "command line, specify --coalesce-contents");
+            warn(
+                "normalized content ended with a bad token; you may be able to resolve this by "
+                "coalescing content streams in combination with normalizing content. From the "
+                "command line, specify --coalesce-contents");
         }
-        warn("Resulting stream data may be corrupted but is may still useful for manual "
-             "inspection. For more information on this warning, search for content normalization "
-             "in the manual.");
+        warn(
+            "Resulting stream data may be corrupted but is may still useful for manual "
+            "inspection. For more information on this warning, search for content normalization "
+            "in the manual.");
     }
     return success;
@@ -997,8 +997,9 @@ QPDF::decryptString(std::string&amp; str, QPDFObjGen const&amp; og)
             break;
         default:
-            warn(damagedPDF("unknown encryption filter for strings (check /StrF in "
-                            "/Encrypt dictionary); strings may be decrypted improperly"));
+            warn(damagedPDF(
+                "unknown encryption filter for strings (check /StrF in "
+                "/Encrypt dictionary); strings may be decrypted improperly"));
             // To avoid repeated warnings, reset cf_string.  Assume we'd want to use AES if V == 4.
             m->encp->cf_string = e_aes;
             use_aes = true;
@@ -237,8 +237,9 @@ class QPDF::JSONReactor: public JSON::Reactor
         pdf(pdf),
         is(is),
         must_be_complete(must_be_complete),
-        descr(std::make_shared<QPDFValue::Description>(
-            QPDFValue::JSON_Descr(std::make_shared<std::string>(is->getName()), "")))
+        descr(
+            std::make_shared<QPDFValue::Description>(
+                QPDFValue::JSON_Descr(std::make_shared<std::string>(is->getName()), "")))
     {
     }
     ~JSONReactor() override = default;
@@ -267,10 +268,10 @@ class QPDF::JSONReactor: public JSON::Reactor
     struct StackFrame
     {
         StackFrame(state_e state) :
-            state(state){};
+            state(state) {};
         StackFrame(state_e state, QPDFObjectHandle&& object) :
             state(state),
-            object(object){};
+            object(object) {};
         state_e state;
         QPDFObjectHandle object;
     };
@@ -20,7 +20,7 @@
 template <class T, class int_type>
 static void
 load_vector_int(
-    BitStream& bit_stream, int nitems, std::vector<T>& vec, int bits_wanted, int_type T::*field)
+    BitStream& bit_stream, int nitems, std::vector<T>& vec, int bits_wanted, int_type T::* field)
 {
     bool append = vec.empty();
     // nitems times, read bits_wanted from the given bit stream, storing results in the ith vector
@@ -46,9 +46,9 @@ load_vector_vector(
     BitStream& bit_stream,
     int nitems1,
     std::vector<T>& vec1,
-    int T::*nitems2,
+    int T::* nitems2,
     int bits_wanted,
-    std::vector<int> T::*vec2)
+    std::vector<int> T::* vec2)
 {
     // nitems1 times, read nitems2 (from the ith element of vec1) items into the vec2 vector field
     // of the ith item of vec1.
@@ -164,8 +164,9 @@ QPDF::readLinearizationData()
     // that prevent loading.
     if (!isLinearized()) {
-        throw std::logic_error("called readLinearizationData for file"
-                               " that is not linearized");
+        throw std::logic_error(
+            "called readLinearizationData for file"
+            " that is not linearized");
     }
     // /L is read and stored in linp by isLinearized()
@@ -478,8 +479,9 @@ QPDF::checkLinearizationInternal()
     // streams are in use.
     if (m->uncompressed_after_compressed) {
-        linearizationWarning("linearized file contains an uncompressed object after a compressed "
-                             "one in a cross-reference stream");
+        linearizationWarning(
+            "linearized file contains an uncompressed object after a compressed "
+            "one in a cross-reference stream");
     }
     // Further checking requires optimization and order calculation. Don't allow optimization to
@@ -689,8 +691,9 @@ QPDF::checkHPageOffset(
         for (size_t i = 0; i < toS(he.nshared_objects); ++i) {
             int idx = he.shared_identifiers.at(i);
             if (shared_idx_to_obj.count(idx) == 0) {
-                stopOnError("unable to get object for item in"
-                            " shared objects hint table");
+                stopOnError(
+                    "unable to get object for item in"
+                    " shared objects hint table");
             }
             hint_shared.insert(shared_idx_to_obj[idx]);
         }
@@ -753,8 +756,9 @@ QPDF::checkHSharedObject(std::vector&lt;QPDFObjectHandle&gt; const&amp; pages, std::map&lt;in
             if (i == so.nshared_first_page) {
                 QTC::TC("qpdf", "QPDF lin check shared past first page");
                 if (m->part8.empty()) {
-                    linearizationWarning("part 8 is empty but nshared_total > "
-                                         "nshared_first_page");
+                    linearizationWarning(
+                        "part 8 is empty but nshared_total > "
+                        "nshared_first_page");
                 } else {
                     int obj = m->part8.at(0).getObjectID();
                     if (obj != so.first_shared_obj) {
@@ -839,8 +843,9 @@ QPDF::checkHOutlines()
                     std::to_string(table_length) + "; computed = " + std::to_string(length));
             }
         } else {
-            linearizationWarning("incorrect first object number in outline "
-                                 "hints table.");
+            linearizationWarning(
+                "incorrect first object number in outline "
+                "hints table.");
         }
     } else {
         linearizationWarning("incorrect object count in outline hint table");
@@ -1123,8 +1128,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
                 break;
             case ObjUser::ou_bad:
-                stopOnError("INTERNAL ERROR: QPDF::calculateLinearizationData: "
-                            "invalid user type");
+                stopOnError(
+                    "INTERNAL ERROR: QPDF::calculateLinearizationData: "
+                    "invalid user type");
                 break;
             }
         }
@@ -1187,8 +1193,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
     // Part 4: open document objects.  We don't care about the order.
     if (lc_root.size() != 1) {
-        stopOnError("found other than one root while"
-                    " calculating linearization data");
+        stopOnError(
+            "found other than one root while"
+            " calculating linearization data");
     }
     m->part4.push_back(getObject(*(lc_root.begin())));
     for (auto const& og: lc_open_document) {
@@ -1205,8 +1212,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
     }
     QPDFObjGen first_page_og(pages.at(0).getObjGen());
     if (!lc_first_page_private.count(first_page_og)) {
-        stopOnError("INTERNAL ERROR: QPDF::calculateLinearizationData: first page "
-                    "object not in lc_first_page_private");
+        stopOnError(
+            "INTERNAL ERROR: QPDF::calculateLinearizationData: first page "
+            "object not in lc_first_page_private");
     }
     lc_first_page_private.erase(first_page_og);
     m->c_linp.first_page_object = pages.at(0).getObjectID();
@@ -1258,8 +1266,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
         ObjUser ou(ObjUser::ou_page, toI(i));
         if (m->obj_user_to_objects.count(ou) == 0) {
-            stopOnError("found unreferenced page while"
-                        " calculating linearization data");
+            stopOnError(
+                "found unreferenced page while"
+                " calculating linearization data");
         }
         for (auto const& og: m->obj_user_to_objects[ou]) {
             if (lc_other_page_private.count(og)) {
@@ -1271,9 +1280,10 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
     }
     // That should have covered all part7 objects.
     if (!lc_other_page_private.empty()) {
-        stopOnError("INTERNAL ERROR:"
-                    " QPDF::calculateLinearizationData: lc_other_page_private is "
-                    "not empty after generation of part7");
+        stopOnError(
+            "INTERNAL ERROR:"
+            " QPDF::calculateLinearizationData: lc_other_page_private is "
+            "not empty after generation of part7");
     }
     // Part 8: other pages' shared objects
@@ -1294,8 +1304,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
     std::set<QPDFObjGen> pages_ogs =
         m->obj_user_to_objects[ObjUser(ObjUser::ou_root_key, "/Pages")];
     if (pages_ogs.empty()) {
-        stopOnError("found empty pages tree while"
-                    " calculating linearization data");
+        stopOnError(
+            "found empty pages tree while"
+            " calculating linearization data");
     }
     for (auto const& og: pages_ogs) {
         if (lc_other.count(og)) {
@@ -1331,8 +1342,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
         }
     }
     if (!lc_thumbnail_private.empty()) {
-        stopOnError("INTERNAL ERROR: QPDF::calculateLinearizationData: lc_thumbnail_private not "
-                    "empty after placing thumbnails");
+        stopOnError(
+            "INTERNAL ERROR: QPDF::calculateLinearizationData: lc_thumbnail_private not "
+            "empty after placing thumbnails");
     }
     // Place shared thumbnail objects
@@ -1403,8 +1415,9 @@ QPDF::calculateLinearizationData(T const&amp; object_stream_data)
         CHPageOffsetEntry& pe = m->c_page_offset_data.entries.at(i);
         ObjUser ou(ObjUser::ou_page, toI(i));
         if (m->obj_user_to_objects.count(ou) == 0) {
-            stopOnError("found unreferenced page while"
-                        " calculating linearization data");
+            stopOnError(
+                "found unreferenced page while"
+                " calculating linearization data");
         }
         for (auto const& og: m->obj_user_to_objects[ou]) {
             if ((m->object_to_obj_users[og].size() > 1) && (obj_to_index.count(og.getObj()) > 0)) {
@@ -1559,8 +1572,9 @@ QPDF::calculateHPageOffset(QPDFWriter::NewObjTable const&amp; new_obj, QPDFWriter::O
         // Adjust delta entries
         if ((phe.at(i).delta_nobjects < min_nobjects) ||
             (phe.at(i).delta_page_length < min_length)) {
-            stopOnError("found too small delta nobjects or delta page length while writing "
-                        "linearization data");
+            stopOnError(
+                "found too small delta nobjects or delta page length while writing "
+                "linearization data");
         }
         phe.at(i).delta_nobjects -= min_nobjects;
         phe.at(i).delta_page_length -= min_length;
@@ -1636,7 +1650,7 @@ QPDF::calculateHOutline(QPDFWriter::NewObjTable const&amp; new_obj, QPDFWriter::ObjT
 template <class T, class int_type>
 static void
-write_vector_int(BitWriter& w, int nitems, std::vector<T>& vec, int bits, int_type T::*field)
+write_vector_int(BitWriter& w, int nitems, std::vector<T>& vec, int bits, int_type T::* field)
 {
     // nitems times, write bits bits from the given field of the ith vector to the given bit writer.
@@ -1654,9 +1668,9 @@ write_vector_vector(
     BitWriter& w,
     int nitems1,
     std::vector<T>& vec1,
-    int T::*nitems2,
+    int T::* nitems2,
     int bits,
-    std::vector<int> T::*vec2)
+    std::vector<int> T::* vec2)
 {
     // nitems1 times, write nitems2 (from the ith element of vec1) items from the vec2 vector field
     // of the ith item of vec1.
@@ -1742,8 +1756,9 @@ QPDF::writeHSharedObject(BitWriter&amp; w)
     for (size_t i = 0; i < toS(nitems); ++i) {
         // If signature were present, we'd have to write a 128-bit hash.
         if (entries.at(i).signature_present != 0) {
-            stopOnError("found unexpected signature present"
-                        " while writing linearization data");
+            stopOnError(
+                "found unexpected signature present"
+                " while writing linearization data");
         }
     }
     write_vector_int(w, nitems, entries, t.nbits_nobjects, &HSharedObjectEntry::nobjects_minus_one);
@@ -174,8 +174,9 @@ QPDF::pushInheritedAttributesToPage(bool allow_changes, bool warn_skipped_keys)
         allow_changes,
         warn_skipped_keys);
     if (!key_ancestors.empty()) {
-        throw std::logic_error("key_ancestors not empty after"
-                               " pushing inherited attributes to pages");
+        throw std::logic_error(
+            "key_ancestors not empty after"
+            " pushing inherited attributes to pages");
     }
     m->pushed_inherited_attributes_to_pages = true;
     m->ever_pushed_inherited_attributes_to_pages = true;
@@ -55,8 +55,9 @@ QPDF::getAllPages()
             // Files have been found in the wild where /Pages in the catalog points to the first
             // page. Try to work around this and similar cases with this heuristic.
             if (!warned) {
-                getRoot().warnIfPossible("document page tree root (root -> /Pages) doesn't point"
-                                         " to the root of the page tree; attempting to correct");
+                getRoot().warnIfPossible(
+                    "document page tree root (root -> /Pages) doesn't point"
+                    " to the root of the page tree; attempting to correct");
                 warned = true;
             }
             changed_pages = true;
@@ -959,9 +959,10 @@ QUtil::qpdf_time_to_iso8601(QPDFTime const&amp; qtm)
 bool
 QUtil::pdf_time_to_qpdf_time(std::string const& str, QPDFTime* qtm)
 {
-    static std::regex pdf_date("^D:([0-9]{4})([0-9]{2})([0-9]{2})"
-                               "([0-9]{2})([0-9]{2})([0-9]{2})"
-                               "(?:(Z?)|([\\+\\-])([0-9]{2})'([0-9]{2})')$");
+    static std::regex pdf_date(
+        "^D:([0-9]{4})([0-9]{2})([0-9]{2})"
+        "([0-9]{2})([0-9]{2})([0-9]{2})"
+        "(?:(Z?)|([\\+\\-])([0-9]{2})'([0-9]{2})')$");
     std::smatch m;
     if (!std::regex_match(str, m, pdf_date)) {
         return false;
@@ -17,8 +17,9 @@
 void
 SecureRandomDataProvider::provideRandomData(unsigned char* data, size_t len)
 {
-    throw std::logic_error("SecureRandomDataProvider::provideRandomData called "
-                           "when support was not compiled in");
+    throw std::logic_error(
+        "SecureRandomDataProvider::provideRandomData called "
+        "when support was not compiled in");
 }
 RandomDataProvider*
@@ -23,8 +23,9 @@ class QPDFParser
         tokenizer(tokenizer),
         decrypter(decrypter),
         context(context),
-        description(std::make_shared<QPDFValue::Description>(
-            std::string(input.getName() + ", " + object_description + " at offset $PO"))),
+        description(
+            std::make_shared<QPDFValue::Description>(
+                std::string(input.getName() + ", " + object_description + " at offset $PO"))),
         parse_pdf(parse_pdf)
     {
     }
@@ -16,7 +16,7 @@ struct _qpdf_data
     _qpdf_data() = default;
     _qpdf_data(std::unique_ptr<QPDF>&& qpdf) :
-        qpdf(std::move(qpdf)){};
+        qpdf(std::move(qpdf)) {};
     ~_qpdf_data() = default;
@@ -21,10 +21,12 @@ main(int, char*[])
     test_string("abc");
     test_string("message digest");
     test_string("abcdefghijklmnopqrstuvwxyz");
-    test_string("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi"
-                "jklmnopqrstuvwxyz0123456789");
-    test_string("1234567890123456789012345678901234567890"
-                "1234567890123456789012345678901234567890");
+    test_string(
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi"
+        "jklmnopqrstuvwxyz0123456789");
+    test_string(
+        "1234567890123456789012345678901234567890"
+        "1234567890123456789012345678901234567890");
     MD5 a;
     a.encodeFile("md5.in");
     std::cout << a.unparse() << std::endl;
@@ -607,8 +607,9 @@ hex_encode_decode_test()
     std::cout << "begin hex encode/decode\n";
     assert_hex_encode("", "");
     assert_hex_encode("Potato", "506f7461746f");
-    std::string with_null("a\367"
-                          "00w");
+    std::string with_null(
+        "a\367"
+        "00w");
     with_null[3] = '\0';
     assert_hex_encode(with_null, "61f7300077");
     assert_hex_decode("", "");
@@ -27,7 +27,7 @@ The qpdf source code is formatted using clang-format with a
 :file:`.clang-format` file at the top of the source tree. The
 :file:`format-code` script reformats all the source code in the
 repository. You must have ``clang-format`` in your path, and it must
-be at least version 18.
+be at least version 20.
 For emacs users, the :file:`.dir-locals.el` file configures emacs
 ``cc-mode`` for an indentation style that is similar to but not
@@ -38,14 +38,15 @@ runtest(int n)
     if (n == 0) {
         // Create a minimal PDF from scratch.
-        QPDFObjectHandle font =
-            pdf.makeIndirectObject(QPDFObjectHandle::parse("<<"
-                                                           " /Type /Font"
-                                                           " /Subtype /Type1"
-                                                           " /Name /F1"
-                                                           " /BaseFont /Helvetica"
-                                                           " /Encoding /WinAnsiEncoding"
-                                                           ">>"));
+        QPDFObjectHandle font = pdf.makeIndirectObject(
+            QPDFObjectHandle::parse(
+                "<<"
+                " /Type /Font"
+                " /Subtype /Type1"
+                " /Name /F1"
+                " /BaseFont /Helvetica"
+                " /Encoding /WinAnsiEncoding"
+                ">>"));
         QPDFObjectHandle procset = pdf.makeIndirectObject(QPDFObjectHandle::parse("[/PDF /Text]"));