Initial support for user general remarks

copienator/commands/reading_annotations.py

@@ -26,6 +26,7 @@ from copienator.annotation_documents import copy_documents
 from copienator.annotation_layout import legacy_layout
 from copienator.annotation_read_cache import AnnotationReadCache
 from copienator.custom_remarks import apply_custom_remarks
+from copienator import general_remarks
 from copienator.annotation_modifications import (
     BASELINE,
     output_removals,
@@ -260,9 +261,16 @@ def apply_actions_and_regenerate(
 
     if incomplete:
         return ExitCode.PARTIAL
+    general = general_remarks.render(workspace.root, student_id,
+                                     max((im.width for im in dirty_images.values()), default=800))
+    if general is not None:
+        concatenated.insert(0, general)
+        filtered.insert(0, general)
     concat_image = concatenate(concatenated)
     filtered_image = concatenate(filtered)
     with staged_files(output_dir, remove=(*output_removals(output_dir), BASELINE)) as staging:
+        if general is not None:
+            general.save(staging / general_remarks.IMAGE_FILENAME)
         for label, image in dirty_images.items():
             image.save(staging / f"{label}.jpg")
         if not preserve_score_file:
@@ -277,8 +285,8 @@ def apply_actions_and_regenerate(
             # Imported here because the grouped reader also uses this module.
             from copienator.commands.reading_grouped_annotations import save_checked_pdf
             save_checked_pdf(
-                workspace.root, list(zip(filtered_labels, filtered, strict=True)),
-                all_labels, staging / "Concat_F.pdf",
+                workspace.root, [(label, dirty_images[label]) for label in filtered_labels],
+                all_labels, staging / "Concat_F.pdf", general=general,
             )
         stage_baseline(workspace.root, "Bnot", output_dir, staging, dirty_images,
                        header_heights, build_answer_info(scores, labels_data, answer_labels),