diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-04 22:14:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-04 22:14:54 +0000 |
commit | fccd789bbf541302533ca5c4ae75ce56b7d371db (patch) | |
tree | 0703d4fb83676c8eeeba1da6d347a648d4453f4d /Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c | |
parent | 26d10d9f2d0cc75e2d7688f259ff8ec7212053f9 (diff) |
gregorio-6.0.0-beta2
git-svn-id: svn://tug.org/texlive/trunk@58126 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c')
-rw-r--r-- | Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c index dd88699392b..61d8f959cae 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains the logic for positioning signs on neumes. * - * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * @@ -89,8 +89,11 @@ OFFSET_CASE(LeadingPunctum); OFFSET_CASE(LeadingQuilisma); OFFSET_CASE(LeadingOriscus); OFFSET_CASE(Flat); +OFFSET_CASE(FlatParen); OFFSET_CASE(Sharp); +OFFSET_CASE(SharpParen); OFFSET_CASE(Natural); +OFFSET_CASE(NaturalParen); static __inline const char *note_before_last_note_case_ignoring_deminutus( const gregorio_note *const current_note) @@ -516,7 +519,7 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph, if (done) { break; } - /* else fallthrough to the next case! */ + /* fall through */ case T_PORRECTUS_FLEXUS: switch (i) { case HEPISEMA_FIRST_TWO: @@ -702,7 +705,7 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph, if (done) { break; } - /* else fallthrough to the next case! */ + /* fall through */ case T_PORRECTUS: /* or porrectus-like flexus */ switch (i) { case HEPISEMA_FIRST_TWO: @@ -796,7 +799,7 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph, if (done) { break; } - /* else fallthrough to the next case! */ + /* fall through */ case T_SALICUS: v_episema = VPOS_BELOW; switch (i) { @@ -845,7 +848,7 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph, if (done) { break; } - /* else fallthrough to the next case! */ + /* fall through */ case T_ANCUS: switch (i) { case 1: @@ -945,12 +948,21 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph, case S_FLAT: note->gtex_offset_case = Flat; break; + case S_FLAT_PAREN: + note->gtex_offset_case = FlatParen; + break; case S_SHARP: note->gtex_offset_case = Sharp; break; + case S_SHARP_PAREN: + note->gtex_offset_case = SharpParen; + break; case S_NATURAL: note->gtex_offset_case = Natural; break; + case S_NATURAL_PAREN: + note->gtex_offset_case = NaturalParen; + break; default: note->gtex_offset_case = last_note_case(glyph, fused_single_note_case(glyph, FinalPunctum, LeadingPunctum), |