From 1c254b426847ca0e15aba84732cbf4a88c622cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Bitteur?= <herve.bitteur@audiveris.org>
Date: Mon, 3 Feb 2025 09:37:44 +0100
Subject: [PATCH] BookParameters: separate Items and Processing topics

---
 .../audiveris/omr/score/ui/BookParameters.java   | 10 ++++++++++
 .../audiveris/omr/sheet/ProcessingSwitch.java    | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/audiveris/omr/score/ui/BookParameters.java b/app/src/main/java/org/audiveris/omr/score/ui/BookParameters.java
index 567c7df13..9a49c3bce 100644
--- a/app/src/main/java/org/audiveris/omr/score/ui/BookParameters.java
+++ b/app/src/main/java/org/audiveris/omr/score/ui/BookParameters.java
@@ -317,6 +317,15 @@ private List<XactTopic> buildTopics (Object scope,
             }
         }
 
+        { // Items
+            final XactTopic topic = new XactTopic(Topic.Items.name());
+            topics.add(topic);
+
+            for (ProcessingSwitch key : ProcessingSwitch.itemSwitches) {
+                topic.add(switchMap.get(key));
+            }
+        }
+
         { // Processing
             final XactTopic topic = new XactTopic(Topic.Processing.name());
             topics.add(topic);
@@ -920,6 +929,7 @@ private static enum Topic
         Binarization,
         Scaling,
         Staves,
+        Items,
         Processing;
     }
 
diff --git a/app/src/main/java/org/audiveris/omr/sheet/ProcessingSwitch.java b/app/src/main/java/org/audiveris/omr/sheet/ProcessingSwitch.java
index 3b21da161..f3f5b6f04 100644
--- a/app/src/main/java/org/audiveris/omr/sheet/ProcessingSwitch.java
+++ b/app/src/main/java/org/audiveris/omr/sheet/ProcessingSwitch.java
@@ -52,8 +52,6 @@ public enum ProcessingSwitch
     drumNotation(ProcessingSwitches.constants.drumNotation),
     sixStringTablatures(ProcessingSwitches.constants.sixStringTablatures),
 
-    keepGrayImages(ProcessingSwitches.constants.keepGrayImages),
-    indentations(ProcessingSwitches.constants.indentations),
     smallHeads(ProcessingSwitches.constants.smallHeads),
     smallBeams(ProcessingSwitches.constants.smallBeams),
     crossHeads(ProcessingSwitches.constants.crossHeads),
@@ -63,12 +61,13 @@ public enum ProcessingSwitch
     pluckings(ProcessingSwitches.constants.pluckings),
     partialWholeRests(ProcessingSwitches.constants.partialWholeRests),
     multiWholeHeadChords(ProcessingSwitches.constants.multiWholeHeadChords),
-
     chordNames(ProcessingSwitches.constants.chordNames),
     lyrics(ProcessingSwitches.constants.lyrics),
     lyricsAboveStaff(ProcessingSwitches.constants.lyricsAboveStaff),
-
     articulations(ProcessingSwitches.constants.articulations),
+
+    keepGrayImages(ProcessingSwitches.constants.keepGrayImages),
+    indentations(ProcessingSwitches.constants.indentations),
     bothSharedHeadDots(ProcessingSwitches.constants.bothSharedHeadDots),
     implicitTuplets(ProcessingSwitches.constants.implicitTuplets),
 
@@ -93,7 +92,14 @@ public enum ProcessingSwitch
             sixStringTablatures);
 
     /**
-     * The standard (non-staff) switches.
+     * The item switches.
+     */
+    public static EnumSet<ProcessingSwitch> itemSwitches = EnumSet.range( //
+            smallHeads,
+            articulations);
+
+    /**
+     * The processing switches.
      */
     public static EnumSet<ProcessingSwitch> standardSwitches = EnumSet.range(
             keepGrayImages,