Better handling of beat unit codes

Audiveris · Dec 5, 2024 · 70fe404 · 70fe404
1 parent 490dc44
commit 70fe404
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/app/src/main/java/org/audiveris/omr/sig/inter/MetronomeInter.java b/app/src/main/java/org/audiveris/omr/sig/inter/MetronomeInter.java
@@ -31,7 +31,6 @@
 import org.audiveris.omr.glyph.Grades;
 import org.audiveris.omr.glyph.Shape;
 import static org.audiveris.omr.glyph.Shape.TEXT;
-import org.audiveris.omr.glyph.ShapeSet;
 import org.audiveris.omr.math.GeoUtil;
 import org.audiveris.omr.math.LineUtil;
 import org.audiveris.omr.math.PointUtil;
@@ -56,11 +55,11 @@
 import org.audiveris.omr.text.TextLine;
 import org.audiveris.omr.text.TextRole;
 import org.audiveris.omr.text.TextWord;
+import org.audiveris.omr.ui.field.MusicPane;
 import org.audiveris.omr.ui.symbol.MetronomeSymbol;
 import org.audiveris.omr.ui.symbol.MusicFamily;
 import org.audiveris.omr.ui.symbol.MusicFont;
 import org.audiveris.omr.ui.symbol.ShapeSymbol;
-import org.audiveris.omr.ui.symbol.Symbols;
 import org.audiveris.omr.ui.symbol.TextFamily;
 import org.audiveris.omr.ui.symbol.TextFont;
 import org.audiveris.omr.util.Entities;
@@ -870,10 +869,7 @@ public List<WordInter> setValue (String newValue)
      */
     private static String beatUnitRegexp ()
     {
-        final Symbols symbols = MusicFamily.Bravura.getSymbols();
-
-        return ShapeSet.SimpleBeatUnits.stream().map(
-                u -> "\\x{" + Integer.toHexString(symbols.getCode(u)[0]) + "}") //
+        return MusicPane.musicCodes.stream().map(c -> "\\x{" + Integer.toHexString(c) + "}") //
                 .collect(Collectors.joining());
     }
 

diff --git a/app/src/main/java/org/audiveris/omr/ui/field/MusicPane.java b/app/src/main/java/org/audiveris/omr/ui/field/MusicPane.java
@@ -23,15 +23,19 @@
 
 import org.audiveris.omr.constant.Constant;
 import org.audiveris.omr.constant.ConstantSet;
+import org.audiveris.omr.glyph.ShapeSet;
 import org.audiveris.omr.ui.Colors;
 import org.audiveris.omr.ui.symbol.MusicFamily;
+import org.audiveris.omr.ui.symbol.Symbols;
 import org.audiveris.omr.ui.symbol.TextFamily;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.JTextPane;
@@ -56,9 +60,12 @@ public class MusicPane
 
     private static final Logger logger = LoggerFactory.getLogger(MusicPane.class);
 
-    /** Minimum code point value to detect a music character. */
+    /** Minimum code point value to detect a potential music character. */
     private static final int HIGH_CODE = 0xE000;
 
+    /** Codes of supported music characters. */
+    public static final Set<Integer> musicCodes = buildMusicCodes();
+
     //~ Instance fields ----------------------------------------------------------------------------
 
     /** Attributes referring the music font family. */
@@ -133,7 +140,7 @@ public void adjustMusicCharacters ()
         for (int i = 0; i < length; i++) {
             final int code = str.codePointAt(i);
 
-            if (code >= HIGH_CODE) {
+            if (musicCodes.contains(code)) {
                 // Set music attributes to the current character
                 doc.setCharacterAttributes(i, 1, musicSet, true);
             }
@@ -188,6 +195,27 @@ public void setFamilies (MusicFamily musicFamily,
         adjustMusicCharacters();
     }
 
+    //~ Static Methods -----------------------------------------------------------------------------
+
+    //-----------------//
+    // buildMusicCodes //
+    //-----------------//
+    private static Set<Integer> buildMusicCodes ()
+    {
+        final Set<Integer> set = new HashSet<>();
+        final Symbols symbols = MusicFamily.Bravura.getSymbols();
+
+        ShapeSet.BeatUnits.getShapes().forEach(bu -> {
+            for (int c : symbols.getCode(bu)) {
+                if (c >= HIGH_CODE) {
+                    set.add(c);
+                }
+            }
+        });
+
+        return set;
+    }
+
     //~ Inner Classes ------------------------------------------------------------------------------
 
     //-----------//