Merge branch 'development'

Author: hbitteur

.github/workflows/publish-winget.yml

@@ -1,5 +1,5 @@
 
-name: Publish latest release on Windows community repository
+name: Publish on Windows repository
 
 on:
   release:
@@ -11,24 +11,29 @@ jobs:
     name: Publish winget package
     runs-on: windows-latest
     steps:
-      - name: Submit package to Windows Package Manager Community Repository
+      - name: Submit package to Windows repository
         run: |
           # Download WingetCreate
           Invoke-WebRequest https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
+          
           # Retrieve the descriptor of Audiveris latest release
           $latest = Invoke-RestMethod 'https://api.github.com/repos/Audiveris/audiveris/releases/latest'
           $tag_name = $latest.tag_name
           echo "=== tag_name is $tag_name"
+          
           # Retrieve all Windows installers among the release assets
           $installers = $latest.assets | Where-Object -Property name -match '.msi'
           echo "=== installers:"
           $installers
+          
           # Retrieve the download URL of the (first) Windows installer
           $installerUrl = $installers | Select -ExpandProperty browser_download_url -First 1
           echo "=== installerUrl is $installerUrl"
-          # Create a folder
-          New-Item -Path "." -Name "myDocs" -ItemType Directory
-          # Create the manifest
-          .\wingetcreate.exe new $installerUrl --output myDocs
-          dir -Recurse myDocs
           
+          # Update the manifest
+          echo "=== updating manifest..."
+          .\wingetcreate.exe update audiveris.org.Audiveris -v $latest.tag_name -u $installerUrl -t ${{ secrets.WINGET_PAT }}
+          echo "=== manifest updated!"
+          
+          # Display the updated Audiveris information
+          winget show audiveris.org.Audiveris

.gitignore

@@ -48,6 +48,8 @@ docs/build
 docs/build/*
 packaging/build
 packaging/build/*
+packaging/manifests
+packaging/manifests/*
 packaging/.gradle/*
 private/*
 schemas/bin/

app/build.gradle

@@ -22,7 +22,7 @@ plugins {
 def app = project(':app')
 
 // Central location for application version
-project.version = '5.8.1'
+project.version = '5.9.0'
 println "version: ${project.version}"
 
 // Central location for the specific versions of tesseract dependencies
@@ -237,7 +237,7 @@ allprojects {
 // Heap size (and other stuff) can be modified via a 'jvmLineArgs' on gradle command line
 tasks.run {
     minHeapSize = '512m'
-    maxHeapSize = '1g'
+    maxHeapSize = '8g'
 
     // Retrieve JVM arguments from jvmLineArgs property if any
     if (project.hasProperty("jvmLineArgs")) {

app/res/basic-classifier.zip

@@ -33,6 +33,7 @@
 import org.audiveris.omr.step.OmrStep;
 import org.audiveris.omr.step.ProcessingCancellationException;
 import org.audiveris.omr.step.RunClass;
+import static org.audiveris.omr.ui.action.AdvancedTopics.swapProcessedSheets;
 import org.audiveris.omr.util.Dumping;
 import org.audiveris.omr.util.FileUtil;
 import org.audiveris.omr.util.NaturalSpec;
@@ -823,7 +824,7 @@ protected void processBook (Book book)
                 }
                 LogUtil.start(book);
 
-                boolean swap = (OMR.gui == null) || isSwap() || BookActions.swapProcessedSheets();
+                boolean swap = (OMR.gui == null) || isSwap() || swapProcessedSheets();
 
                 // Make sure stubs are available
                 if (book.getStubs().isEmpty()) {

app/src/main/java/org/audiveris/omr/CLI.java

@@ -316,19 +316,6 @@ private static void processCli (String[] args)
         }
     }
 
-    //--------------------------//
-    // processSystemsInParallel //
-    //--------------------------//
-    /**
-     * Tell whether we should process systems of a sheet in parallel.
-     *
-     * @return true if so
-     */
-    public static boolean processSystemsInParallel ()
-    {
-        return constants.processSystemsInParallel.isSet();
-    }
-
     //---------------//
     // runBatchTasks //
     //---------------//
@@ -462,10 +449,6 @@ private static class Constants
                 false,
                 "Should we process all tasks in parallel when running in batch?");
 
-        private final Constant.Boolean processSystemsInParallel = new Constant.Boolean(
-                false,
-                "Should we process all systems in parallel in a sheet?");
-
         private final Constant.Integer sheetStepTimeOut = new Constant.Integer(
                 "Seconds",
                 120,

app/src/main/java/org/audiveris/omr/Main.java

@@ -626,6 +626,9 @@ private OmrShape getOmrShape (ArticulationInter inter)
                         : OmrShape.articTenutoBelow;
                 case STACCATISSIMO -> above //
                         ? OmrShape.articStaccatissimoAbove
+                        : OmrShape.articStaccatissimoBelow; // Very rare?
+                case STACCATISSIMO_BELOW -> above //
+                        ? OmrShape.articStaccatissimoAbove // Very rare?
                         : OmrShape.articStaccatissimoBelow;
                 case MARCATO -> above //
                         ? OmrShape.articMarcatoAbove

app/src/main/java/org/audiveris/omr/classifier/AnnotationsBuilder.java

@@ -86,7 +86,7 @@ private static Map<OmrShape, Shape> buildOmrShapeMap ()
         map.put(OmrShape.articMarcatoBelow, Shape.MARCATO_BELOW);
 
         map.put(OmrShape.articStaccatissimoAbove, Shape.STACCATISSIMO);
-        map.put(OmrShape.articStaccatissimoBelow, Shape.STACCATISSIMO);
+        map.put(OmrShape.articStaccatissimoBelow, Shape.STACCATISSIMO_BELOW);
 
         map.put(OmrShape.articStaccatoAbove, Shape.STACCATO);
         map.put(OmrShape.articStaccatoBelow, Shape.STACCATO);

app/src/main/java/org/audiveris/omr/classifier/OmrShapeMapping.java

@@ -235,6 +235,7 @@ public enum Shape
     ACCENT,
     TENUTO,
     STACCATISSIMO,
+    STACCATISSIMO_BELOW,
     MARCATO,
     MARCATO_BELOW,
     ARPEGGIATO,
@@ -885,7 +886,8 @@ public boolean isAbove ()
     public boolean isBelow ()
     {
         return switch (this) {
-            case FERMATA_BELOW, MARCATO_BELOW, PEDAL_MARK, PEDAL_UP_MARK, SLUR_BELOW -> true;
+            case FERMATA_BELOW, MARCATO_BELOW, PEDAL_MARK, PEDAL_UP_MARK, //
+                    STACCATISSIMO_BELOW, SLUR_BELOW -> true;
             default -> false;
         };
     }

app/src/main/java/org/audiveris/omr/glyph/Shape.java

@@ -385,7 +385,14 @@ public class ShapeSet
     public static final ShapeSet Articulations = new ShapeSet(
             ACCENT,
             Colors.SCORE_MODIFIERS,
-            shapesOf(ACCENT, TENUTO, STACCATO, STACCATISSIMO, MARCATO, MARCATO_BELOW));
+            shapesOf(
+                    ACCENT,
+                    TENUTO,
+                    STACCATO,
+                    STACCATISSIMO,
+                    STACCATISSIMO_BELOW,
+                    MARCATO,
+                    MARCATO_BELOW));
 
     public static final ShapeSet Attributes = new ShapeSet(
             PEDAL_MARK,