From e091b6c9d01f7ac910a2031c4db5fdcbb6dd2d27 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 27 Jan 2022 08:29:40 -0500 Subject: [PATCH] Allow --x[=y] in option help short text --- generate_auto_job | 2 +- job.sums | 4 ++-- manual/_ext/qpdf.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generate_auto_job b/generate_auto_job index 7c9c9e6f..dd8d3366 100755 --- a/generate_auto_job +++ b/generate_auto_job @@ -184,7 +184,7 @@ class Main: state = st_topic continue m = re.match( - r'^(\s*\.\. )qpdf:option:: (([^=\s]+)([= ](.+))?)$', + r'^(\s*\.\. )qpdf:option:: (([^=\[\s]+)([\[= ](.+))?)$', line) if m: if topic is None: diff --git a/job.sums b/job.sums index f12ea23d..ff86de5a 100644 --- a/job.sums +++ b/job.sums @@ -1,5 +1,5 @@ # Generated by generate_auto_job -generate_auto_job bf02a4e1ce64ab413a2ca8812041d50e55fe3c892e7e6010b9c258d71420310e +generate_auto_job 8efd9e2fa9d517ceb80404f1779f37de194df32a422f0beca30a2b47cc64d816 include/qpdf/auto_job_c_att.hh 7ad43bb374c1370ef32ebdcdcb7b73a61d281f7f4e3f12755585872ab30fb60e include/qpdf/auto_job_c_copy_att.hh 32275d03cdc69b703dd7e02ba0bbe15756e714e9ad185484773a6178dc09e1ee include/qpdf/auto_job_c_enc.hh 72e138c7b96ed5aacdce78c1dec04b1c20d361faec4f8faf52f64c1d6be99265 @@ -11,5 +11,5 @@ libqpdf/qpdf/auto_job_decl.hh 9f79396ec459f191be4c5fe34cf88c265cf47355a1a945fa39 libqpdf/qpdf/auto_job_help.hh 383eea80e2c185ef5295fc126246457a7ceeffea759fdb90bb2e6727532ea538 libqpdf/qpdf/auto_job_init.hh 3b6323189480a7d782563c9d2b5bc29b8dcd19c6dcc89840b207e38cb503d3f1 libqpdf/qpdf/auto_job_schema.hh 16bfde09f71765b0977af31d64b13632d2e6dda184bda79b2b9e45bc354a1677 -manual/_ext/qpdf.py 855fe12de5af7a10bb24be6ecc4d5dff4c84ac58cf388a13be6bbb394346a67d +manual/_ext/qpdf.py e9ac9d6c70642a3d29281ee5ad92ae2422dee8be9306fb8a0bc9dba0ed5e28f3 manual/cli.rst 68122ff8179c10df3fe6d577adde4973c346f7866ba9a511bab5a6e6f292a6f1 diff --git a/manual/_ext/qpdf.py b/manual/_ext/qpdf.py index 032aa86c..bb13b8b5 100644 --- a/manual/_ext/qpdf.py +++ b/manual/_ext/qpdf.py @@ -21,7 +21,7 @@ class OptionDirective(ObjectDescription): return sig def add_target_and_index(self, name_cls, sig, signode): - m = re.match(r'^--([^= ]+)', sig) + m = re.match(r'^--([^\[= ]+)', sig) if not m: raise Exception('option must start with --') option_name = m.group(1) @@ -42,7 +42,7 @@ class OptionIndex(Index): # name, subtype, docname, anchor, extra, qualifier, description for name, display_name, typ, docname, anchor, _ in options: - m = re.match(r'^(--([^= ]+))', display_name) + m = re.match(r'^(--([^\[= ]+))', display_name) if not m: raise Exception( 'OptionIndex.generate: display name not as expected')