Skip to content

Commit

Permalink
Merge commit '53a78372b547a6aa329571073cd05820d73bbaec' into antescof…
Browse files Browse the repository at this point in the history
…o-develop

* commit '53a78372b547a6aa329571073cd05820d73bbaec':
  set font alignment (may result in incorrect placement of dots)
  remove obsolete and non-maintained examples
  add resetCurrentNotesTP + accidentals collisions (in progress)
  fix crash bug due to the new checkHiddenNotes method : change the shared vector management
  automatic handling of conflicted notes (covering each other with different durations and one is a half or whole note) on multi voices staves (issue grame-cncm#164)
  moved to regression tests
  change log update
  fix issue grame-cncm#169 : not a perfect solution, a more logical one would be to reorder events creation in case of chords but it breaks the spacing
  rename tp to timepos
  add a new inhibitNextReset2Key method
  adapt due to removal of fStartTime in ARNote : doAutoEndBar and doAutoGlissando concerned
  remove ugly fStartTime in ARNote : dates of notes in chords are now consistent
  add getMeasureAccidentals method (for debug purpose)
  fix accidentals printing
  update install-qt-action to v3
  update install-qt-action to v3
  moved to regression tests
  fix missing dot in tuplet (issue grame-cncm#170)
  improve ARBase printing
  add std::string operator

# Conflicts:
#	src/engine/graphic/GRSingleNote.h
#	src/engine/graphic/GRStaff.h
  • Loading branch information
arshiacont committed Jul 19, 2023
2 parents c196168 + 53a7837 commit 603578a
Show file tree
Hide file tree
Showing 40 changed files with 476 additions and 1,076 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

# Runs a set of commands using the runners shell
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3

- name: Build Guidolib
run: make -C build basic
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

# Runs a set of commands using the runners shell
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3

- name: Build Guidolib
run: make -C build basic
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

# Runs a set of commands using the runners shell
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v1
Expand Down
8 changes: 7 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ GUIDO Engine history
----------------------------------------------------------------
version 1.7.7
- fix crash bug with repeat begin
- improve slur rendering it spans several systems
- fix issue #168: Slur Collision when the slur spams more than one system
- fix issue #170: Dots not drawn in Tuplets
- fix issue #171: Incorrect beam dash direction
- fix issue #169: Double flat is rendered as four if repeated on a 2nd voice
- fix issue #164: Conflicting notes on a multi voices staff
- fix occasional incorrect dots placement in repeatEnd (depending on context)


----------------------------------------------------------------
version 1.7.6
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
82 changes: 0 additions & 82 deletions server/web-examples/guido.html

This file was deleted.

65 changes: 0 additions & 65 deletions server/web-examples/js/canvas.html

This file was deleted.

Binary file removed server/web-examples/js/guido2-webfont.eot
Binary file not shown.
Loading

0 comments on commit 603578a

Please sign in to comment.