Skip to content

Commit

Permalink
Merge branch 'develop' into fix-1285
Browse files Browse the repository at this point in the history 
* develop:
  Accept modified test results
  Modified commentary test
  Added a test to exercise the elision-after-prefix fix. Tests gregorio-project/gregorio#1320.
  • Loading branch information
@rpspringuel
rpspringuel committed Mar 13, 2017
2 parents b1ee0a2 + ae42b38 commit 0222144
Show file tree
Hide file tree
Showing 4 changed files with 233 additions and 0 deletions.
223 changes: 223 additions & 0 deletions tests/gabc-dump/bugs/fix-1320.dump
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
=====================================================================
SCORE INFOS
=====================================================================
number_of_voices 1
name fix-1320


=====================================================================
HEADERS
=====================================================================
name fix-1320
issue 1320
test-purpose elision after prefix should not put center on the vowel at the end of the prefix


=====================================================================
VOICES INFOS
=====================================================================
Voice 1
initial_key 7 (c4)


=====================================================================
SCORE
=====================================================================
type 0 (GRE_SYLLABLE)
position 1 (WORD_BEGINNING)
---------------------------------------------------------------------
character S
---------------------------------------------------------------------
character a
---------------------------------------------------------------------
character l
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 2 (WORD_MIDDLE)
---------------------------------------------------------------------
beginning of style ST_FIRST_WORD
---------------------------------------------------------------------
character v
---------------------------------------------------------------------
end of style ST_FIRST_WORD
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
beginning of style ST_FIRST_WORD
---------------------------------------------------------------------
character u
---------------------------------------------------------------------
end of style ST_FIRST_WORD
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
beginning of style ST_FIRST_WORD
---------------------------------------------------------------------
character m
---------------------------------------------------------------------
end of style ST_FIRST_WORD
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 3 (WORD_END)
---------------------------------------------------------------------
beginning of style ST_FIRST_WORD
---------------------------------------------------------------------
character q
---------------------------------------------------------------------
character u
---------------------------------------------------------------------
beginning of style ST_ELISION
---------------------------------------------------------------------
character e
---------------------------------------------------------------------
end of style ST_ELISION
---------------------------------------------------------------------
character
---------------------------------------------------------------------
end of style ST_FIRST_WORD
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
beginning of style ST_FIRST_WORD
---------------------------------------------------------------------
character a
---------------------------------------------------------------------
end of style ST_FIRST_WORD
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
beginning of style ST_FIRST_WORD
---------------------------------------------------------------------
character b
---------------------------------------------------------------------
end of style ST_FIRST_WORD
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 1 (WORD_BEGINNING)
---------------------------------------------------------------------
character h
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character o
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
character s
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 17 (G_PODATUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 3 (WORD_END)
---------------------------------------------------------------------
character t
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character i
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
character s
---------------------------------------------------------------------
character …
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 7 (GRE_BAR)
bar 5 (B_DIVISIO_FINALIS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character e
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
beginning of style ST_ELISION
---------------------------------------------------------------------
character a
---------------------------------------------------------------------
end of style ST_ELISION
---------------------------------------------------------------------
character u
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch k
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character e
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
beginning of style ST_ELISION
---------------------------------------------------------------------
character a
---------------------------------------------------------------------
end of style ST_ELISION
---------------------------------------------------------------------
character p
---------------------------------------------------------------------
type 7 (GRE_BAR)
bar 5 (B_DIVISIO_FINALIS)
=====================================================================
6 changes: 6 additions & 0 deletions tests/gabc-dump/bugs/fix-1320.gabc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: fix-1320;
issue: 1320;
test-purpose: elision after prefix should not put center on the vowel at the end of the prefix;
%%
(c4) Sal(d)vum(d)qu<e>e</e> ab(d) hos(dh)tis…(h) (::)
e<e>a</e>u(k) e<e>a</e>p(::)
Binary file modified tests/tex-output/commentary/commentary.pdf
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions tests/tex-output/commentary/commentary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@
\grecommentary[12pt]{Additional spacing test}
\gregorioscore[a]{commentary}

\gresetinitiallines{0}
\gresetheadercapture{commentary}{grecommentary}{}%
\gregorioscore[a]{commentary}

\end{document}

0 comments on commit 0222144

Please sign in to comment.