Major rework -- see long comments

* Replace --create-from-json=file with --json-input, which causes the
  regular input to be treated as json.
* Eliminate --to-json
* In --json=2, bring back "objects" and eliminate "objectinfo". Stream
  data is never present.
* In --json-output=2, write "qpdf-v2" with "objects" and include
  stream data.

1 files changed, 9 insertions, 8 deletions

diff --git a/libqpdf/qpdf/auto_job_help.hh b/libqpdf/qpdf/auto_job_help.hh
index e17412d0..7d88155b 100644
--- a/libqpdf/qpdf/auto_job_help.hh
+++ b/libqpdf/qpdf/auto_job_help.hh
@@ -798,10 +798,6 @@ depth in the JSON section of the manual. "version" may be a
 specific version or "latest". Run qpdf --json-help for a
 description of the generated JSON object.
 )");
-ap.addOptionHelp("--to-json", "json", "serialize to JSON", R"(Shortcut for options useful for serializing PDF to JSON:
---json=latest --json-stream-data=inline
-  --json-key=qpdf --decode-level=none
-)");
 ap.addOptionHelp("--json-help", "json", "show format of JSON output", R"(Describe the format of the JSON output by writing to standard
 output a JSON object with the same keys and with values
 containing descriptive text.
@@ -836,11 +832,16 @@ name as the prefix for stream data files. Whatever is given here
 will be appended with -nnn to create the name of the file that
 will contain the data for the stream stream in object nnn.
 )");
-ap.addOptionHelp("--create-from-json", "json", "create PDF from qpdf JSON", R"(--create-from-json=qpdf-json-file
+ap.addOptionHelp("--json-output", "json", "serialize to JSON", R"(--json-output=version
 
-Create a PDF file from the prior output of qpdf --json. See the
-"QPDF JSON Format" section of the manual for information about
-how to use this option.
+The output file will be qpdf JSON format at the given version.
+Only version 2 is supported. See also --json-stream-data
+and --json-stream-prefix
+)");
+ap.addOptionHelp("--json-input", "json", "input file is qpdf JSON", R"(Treat the input file as a JSON file in qpdf JSON format as
+written by qpdf --json-output. See the "QPDF JSON Format"
+section of the manual for information about how to use this
+option.
 )");
 ap.addOptionHelp("--update-from-json", "json", "update a PDF from qpdf JSON", R"(--update-from-json=qpdf-json-file