1 files changed, 26 insertions, 27 deletions
diff --git a/libqpdf/qpdf/auto_job_init.hh b/libqpdf/qpdf/auto_job_init.hh
index 7c34e8b1..7fc044dc 100644
--- a/libqpdf/qpdf/auto_job_init.hh
+++ b/libqpdf/qpdf/auto_job_init.hh
@@ -116,25 +116,34 @@ this->ap.addRequiredParameter("password", p(&ArgParser::argPagesPassword), "pass
 this->ap.registerOptionTable("encryption", b(&ArgParser::argEndEncryption));
 this->ap.addPositional(p(&ArgParser::argEncPositional));
 this->ap.registerOptionTable("40-bit encryption", b(&ArgParser::argEnd40BitEncryption));
-this->ap.addChoices("extract", p(&ArgParser::argEnc40Extract), true, yn_choices);
-this->ap.addChoices("annotate", p(&ArgParser::argEnc40Annotate), true, yn_choices);
-this->ap.addChoices("print", p(&ArgParser::argEnc40Print), true, yn_choices);
-this->ap.addChoices("modify", p(&ArgParser::argEnc40Modify), true, yn_choices);
+this->ap.addChoices("extract", [this](char *x){c_enc->extract(x);}, true, yn_choices);
+this->ap.addChoices("annotate", [this](char *x){c_enc->annotate(x);}, true, yn_choices);
+this->ap.addChoices("print", [this](char *x){c_enc->print(x);}, true, yn_choices);
+this->ap.addChoices("modify", [this](char *x){c_enc->modify(x);}, true, yn_choices);
 this->ap.registerOptionTable("128-bit encryption", b(&ArgParser::argEnd128BitEncryption));
-this->ap.addBare("cleartext-metadata", b(&ArgParser::argEnc128CleartextMetadata));
-this->ap.addBare("force-V4", b(&ArgParser::argEnc128ForceV4));
-this->ap.addChoices("accessibility", p(&ArgParser::argEnc128Accessibility), true, yn_choices);
-this->ap.addChoices("extract", p(&ArgParser::argEnc128Extract), true, yn_choices);
-this->ap.addChoices("print", p(&ArgParser::argEnc128Print), true, print128_choices);
-this->ap.addChoices("assemble", p(&ArgParser::argEnc128Assemble), true, yn_choices);
-this->ap.addChoices("annotate", p(&ArgParser::argEnc128Annotate), true, yn_choices);
-this->ap.addChoices("form", p(&ArgParser::argEnc128Form), true, yn_choices);
-this->ap.addChoices("modify-other", p(&ArgParser::argEnc128ModifyOther), true, yn_choices);
-this->ap.addChoices("modify", p(&ArgParser::argEnc128Modify), true, modify128_choices);
-this->ap.addChoices("use-aes", p(&ArgParser::argEnc128UseAes), true, yn_choices);
+this->ap.addBare("cleartext-metadata", [this](){c_enc->cleartextMetadata();});
+this->ap.addBare("force-V4", [this](){c_enc->forceV4();});
+this->ap.addChoices("accessibility", [this](char *x){c_enc->accessibility(x);}, true, yn_choices);
+this->ap.addChoices("extract", [this](char *x){c_enc->extract(x);}, true, yn_choices);
+this->ap.addChoices("print", [this](char *x){c_enc->print(x);}, true, print128_choices);
+this->ap.addChoices("assemble", [this](char *x){c_enc->assemble(x);}, true, yn_choices);
+this->ap.addChoices("annotate", [this](char *x){c_enc->annotate(x);}, true, yn_choices);
+this->ap.addChoices("form", [this](char *x){c_enc->form(x);}, true, yn_choices);
+this->ap.addChoices("modify-other", [this](char *x){c_enc->modifyOther(x);}, true, yn_choices);
+this->ap.addChoices("modify", [this](char *x){c_enc->modify(x);}, true, modify128_choices);
+this->ap.addChoices("use-aes", [this](char *x){c_enc->useAes(x);}, true, yn_choices);
 this->ap.registerOptionTable("256-bit encryption", b(&ArgParser::argEnd256BitEncryption));
-this->ap.addBare("force-R5", b(&ArgParser::argEnc256ForceR5));
-this->ap.addBare("allow-insecure", b(&ArgParser::argEnc256AllowInsecure));
+this->ap.addBare("cleartext-metadata", [this](){c_enc->cleartextMetadata();});
+this->ap.addBare("force-R5", [this](){c_enc->forceR5();});
+this->ap.addBare("allow-insecure", [this](){c_enc->allowInsecure();});
+this->ap.addChoices("accessibility", [this](char *x){c_enc->accessibility(x);}, true, yn_choices);
+this->ap.addChoices("extract", [this](char *x){c_enc->extract(x);}, true, yn_choices);
+this->ap.addChoices("print", [this](char *x){c_enc->print(x);}, true, print128_choices);
+this->ap.addChoices("assemble", [this](char *x){c_enc->assemble(x);}, true, yn_choices);
+this->ap.addChoices("annotate", [this](char *x){c_enc->annotate(x);}, true, yn_choices);
+this->ap.addChoices("form", [this](char *x){c_enc->form(x);}, true, yn_choices);
+this->ap.addChoices("modify-other", [this](char *x){c_enc->modifyOther(x);}, true, yn_choices);
+this->ap.addChoices("modify", [this](char *x){c_enc->modify(x);}, true, modify128_choices);
 this->ap.registerOptionTable("underlay/overlay", b(&ArgParser::argEndUnderlayOverlay));
 this->ap.addPositional(p(&ArgParser::argUOPositional));
 this->ap.addRequiredParameter("to", [this](char *x){c_uo->to(x);}, "page-range");
@@ -154,13 +163,3 @@ this->ap.registerOptionTable("copy attachment", b(&ArgParser::argEndCopyAttachme
 this->ap.addPositional(p(&ArgParser::argCopyAttPositional));
 this->ap.addRequiredParameter("prefix", [this](char *x){c_copy_att->prefix(x);}, "prefix");
 this->ap.addRequiredParameter("password", [this](char *x){c_copy_att->password(x);}, "password");
-this->ap.selectOptionTable("256-bit encryption");
-this->ap.copyFromOtherTable("cleartext-metadata", "128-bit encryption");
-this->ap.copyFromOtherTable("accessibility", "128-bit encryption");
-this->ap.copyFromOtherTable("extract", "128-bit encryption");
-this->ap.copyFromOtherTable("print", "128-bit encryption");
-this->ap.copyFromOtherTable("assemble", "128-bit encryption");
-this->ap.copyFromOtherTable("annotate", "128-bit encryption");
-this->ap.copyFromOtherTable("form", "128-bit encryption");
-this->ap.copyFromOtherTable("modify-other", "128-bit encryption");
-this->ap.copyFromOtherTable("modify", "128-bit encryption");