* Support for prompt composition (AND) and cleaning around it.

* Option to cleanup around extra network tags.
* Improved cleanup.
* Some refactoring.

scripts/ppp_script.py

@@ -194,14 +194,6 @@ class PromptPostProcessorScript(scripts.Script):
                 section=section,
             ),
         )
-        shared.opts.add_option(
-            key="ppp_cup_extraspaces",
-            info=shared.OptionInfo(
-                True,
-                label="Remove extra spaces",
-                section=section,
-            ),
-        )
         shared.opts.add_option(
             key="ppp_cup_emptyconstructs",
             info=shared.OptionInfo(
@@ -226,3 +218,27 @@ class PromptPostProcessorScript(scripts.Script):
                 section=section,
             ),
         )
+        shared.opts.add_option(
+            key="ppp_cup_ands",
+            info=shared.OptionInfo(
+                True,
+                label="Clean up around ANDs",
+                section=section,
+            ),
+        )
+        shared.opts.add_option(
+            key="ppp_cup_extranetworktags",
+            info=shared.OptionInfo(
+                False,
+                label="Clean up around extra network tags",
+                section=section,
+            ),
+        )
+        shared.opts.add_option(
+            key="ppp_cup_extraspaces",
+            info=shared.OptionInfo(
+                True,
+                label="Remove extra spaces",
+                section=section,
+            ),
+        )