add macos-13

Author: bramtayl

.github/workflows/workflow.yaml

@@ -7,18 +7,18 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-24.04, windows-latest]
+        os: [macos-latest, macos-13, ubuntu-latest, windows-latest]
     runs-on: ${{matrix.os}}
     steps:
     - name: Download
       uses: actions/checkout@v4
 
     - name: Update Ubuntu
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'ubuntu-latest'
       run: sudo apt-get update
 
     - name: Install dependencies on Ubuntu
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'ubuntu-latest'
       run: > 
         sudo apt-get install
         cmake
@@ -28,11 +28,11 @@ jobs:
         qt6-base-dev
 
     - name: Install gcovr on Ubuntu
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'ubuntu-latest'
       run: pipx install gcovr
 
     - name: Install dependencies on MacOS
-      if: matrix.os == 'macos-latest'
+      if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
       run: brew install fluid-synth ninja qt libxml2
 
     - name: Add MSVC to path on Windows
@@ -109,10 +109,6 @@ jobs:
 
     - name: Build with tests
       run: cmake --build with_tests --config Debug
-    
-    - name: Start fonts server on MacOS
-      if: matrix.os == 'macos-latest'
-      run: sudo launchctl load -w /System/Library/LaunchAgents/com.apple.fontd.useragent.plist
 
     - name: Test on Unix
       if: matrix.os != 'windows-latest'
@@ -123,17 +119,25 @@ jobs:
       run: cd with_tests; ctest --build-config Debug --verbose
 
     - name: Run gcovr
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'ubuntu-latest'
       run: gcovr --xml "coverage.xml"  --filter "$(pwd)/src/"
 
     - name: Upload code coverage
       uses: codecov/codecov-action@v4
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'ubuntu-latest'
       with:
         files: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
+    
+    - name: Configure without tests on MacOS 13
+      if: matrix.os == 'macos-13'
+      run: >
+        cmake -S . -B without_tests
+        -DCMAKE_BUILD_TYPE=Release
+        -DCPACK_GENERATOR=ZIP
+        -DCPACK_PACKAGE_FILE_NAME=Justly-MacOS-Intel
 
-    - name: Configure without tests on MacOS
+    - name: Configure without tests on MacOS latest
       if: matrix.os == 'macos-latest'
       run: >
         cmake -S . -B without_tests
@@ -142,7 +146,7 @@ jobs:
         -DCPACK_PACKAGE_FILE_NAME=Justly-MacOS-arm64
 
     - name: Configure without tests on Ubuntu
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'ubuntu-latest'
       run: >
         cmake -S . -B without_tests
         -DCMAKE_BUILD_TYPE=Release

CMakeLists.txt

@@ -123,7 +123,7 @@ qt_add_executable(Justly)
 target_sources(Justly PRIVATE bin/main.cpp)
 target_link_libraries(Justly PRIVATE JustlyLibrary Qt6::Core Qt6::Widgets)
 if (WIN32)
-    # set_target_properties(Justly PROPERTIES WIN32_EXECUTABLE ON)
+    set_target_properties(Justly PROPERTIES WIN32_EXECUTABLE ON)
 endif()
 install_executable(Justly)
 

README.md

@@ -145,7 +145,7 @@ To go back to the chords, select "Back to chords" from the "Edit" menu (see belo
 In the "File" menu, you can choose among the following options:
 
 - "Open" to open a previously saved song.
-- "Import MusicXML" to import an uncompressed MusicXML file using [5-limit tuning](https://en.wikipedia.org/wiki/Five-limit_tuning#The_just_ratios) based on the key signature. 
+- "Import MusicXML" to import an uncompressed MusicXML file (see below). 
 - "Save" to save the song in the previous location.
 - "Save As" to save the song in a new location.
 - "Export recording" to export a recording of the song as a wav file.
@@ -183,6 +183,34 @@ In the play menu, you can choose among the following options:
 - "Play selection" to play a selection of chords or notes. If you play a selection of chords, you will skip any previous chords, and only play the selected chords. If you play a selection of notes within a chord, you will skip any previous chords, and only play the selected notes within the current chord.
 - "Stop Playing" to stop playing.
 
+## Import
+
+Justly can import sheet music written in MusicXML.
+To do so, Justly uses a few heuristics.
+
+Justly uses the current key signature to find the tonic. Just then uses the following scale relative to the tonic:
+
+- Minor second: 16/5
+- Major second: 9/8
+- Minor third: 6/5
+- Major third: 5/4
+- Perfect fourth: 4/3
+- Augmented fourth/dimished fifth: 45/32
+- Perfect fifth: 3/2
+- Minor sixth: 8/5
+- Major sixth: 5/3
+- Minor seventh: 9/5
+- Perfect octave: 2
+
+For example, in the key of A, the frequency of any E (a perfect fifth away from the tonic) will be 3/2 of the frequency of the tonic below it.
+
+When the key signature changes, Justly modulates by the interval of the new key in the old key signature. So, if you modulate by from the key of A to the key of E, Justly will modulate by an interval of 3/2 (plus or minus an octave).
+
+Here are some tips for importing music written in standard notation:
+
+- Change key signatures every time the underlying chord in the music changes.
+- You might need to manually adjust seventh intervals. In the context of a seventh chord, you might want to change the seventh of the chord to be a harmonic seventh above the tonic. Likewise, in the context of a half-diminished seventh chord, you might want to change the root note of the chord to be a harmonic seventh below the top note of the chord. Be careful, however, because harmonic seventh intervals are notically different from minor seventh intervals.
+
 ## Example
 
 This example is the [simple.json](examples/simple.json) file in the examples folder.

src/justly.cpp

@@ -430,9 +430,9 @@ to_xml_program_pointer(xmlNode &node) -> const SubProgram * {
   const auto name = get_content(node);
   const auto &all_programs = SubProgram::get_all_programs();
   const auto program_pointer = std::find_if(
-      all_programs.cbegin(), all_programs.cend(),
+      all_programs.begin(), all_programs.end(),
       [name](const SubProgram &item) { return item.original_name == name; });
-  Q_ASSERT(program_pointer != nullptr);
+  Q_ASSERT(program_pointer != all_programs.end());
   return &(*program_pointer);
 }
 
@@ -540,7 +540,7 @@ template <std::derived_from<Program> SubProgram>
 
   std::sort(programs.begin(), programs.end(),
             [](const SubProgram &instrument_1, const SubProgram &instrument_2) {
-              return instrument_1.translated_name <=
+              return instrument_1.translated_name <
                      instrument_2.translated_name;
             });
 
@@ -4636,6 +4636,5 @@ void SongEditor::closeEvent(QCloseEvent *const close_event_pointer) {
 
 // TODO(brandon): instrument mapping for musicxml
 // TODO(brandon): musicxml repeats
-// TODO(brandon): more musicxml docs
 
 #include "justly.moc"