Skip to content

Commit

Permalink
Merge pull request gregorio-project#44 from gregorio-project/release-4.0
Browse files Browse the repository at this point in the history 
Merged release-4.0 into develop.
  • Loading branch information
@henryso
henryso committed Nov 25, 2015
2 parents 347042f + 3ae87b3 commit 2c11f6a
Show file tree
Hide file tree
Showing 22 changed files with 1,220 additions and 1,220 deletions.
44 changes: 22 additions & 22 deletions tests/gabc-dump/PopulusSion.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,20 +568,20 @@
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
=====================================================================
type 9 (GRE_SYLLABLE)
position 3 (WORD_END)
Expand Down Expand Up @@ -923,7 +923,7 @@
type 1 (GRE_NOTE)
pitch i
shape 1 (S_PUNCTUM)
signs 16 (_V_EPISEMUS)
signs 16 (_V_EPISEMA)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch j
Expand Down Expand Up @@ -1082,20 +1082,20 @@
type 1 (GRE_NOTE)
pitch i
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch j
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch i
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
=====================================================================
type 9 (GRE_SYLLABLE)
position 3 (WORD_END)
Expand Down Expand Up @@ -1193,7 +1193,7 @@
type 1 (GRE_NOTE)
pitch f
shape 1 (S_PUNCTUM)
signs 16 (_V_EPISEMUS)
signs 16 (_V_EPISEMA)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -1309,7 +1309,7 @@
type 1 (GRE_NOTE)
pitch i
shape 3 (S_PUNCTUM_INCLINATUM)
signs 16 (_V_EPISEMUS)
signs 16 (_V_EPISEMA)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -1386,20 +1386,20 @@
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
auto hepisemus size 0 (H_NORMAL)
auto hepisemus bridge true
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
=====================================================================
type 9 (GRE_SYLLABLE)
position 3 (WORD_END)
Expand Down Expand Up @@ -1835,7 +1835,7 @@
type 1 (GRE_NOTE)
pitch i
shape 1 (S_PUNCTUM)
signs 16 (_V_EPISEMUS)
signs 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 3 (WORD_END)
Expand Down
60 changes: 30 additions & 30 deletions tests/gabc-dump/glyphs/bars.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 2 (B_DIVISIO_MINIMA)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 2 (B_DIVISIO_MINIMA)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -272,7 +272,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 2 (B_DIVISIO_MINIMA)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand All @@ -296,14 +296,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 3 (B_DIVISIO_MINOR)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 3 (B_DIVISIO_MINOR)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -331,7 +331,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 3 (B_DIVISIO_MINOR)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand All @@ -355,14 +355,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 4 (B_DIVISIO_MAIOR)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 4 (B_DIVISIO_MAIOR)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -390,7 +390,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 4 (B_DIVISIO_MAIOR)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand All @@ -414,14 +414,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 5 (B_DIVISIO_FINALIS)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 5 (B_DIVISIO_FINALIS)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -451,7 +451,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 5 (B_DIVISIO_FINALIS)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -533,14 +533,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 6 (B_DIVISIO_MINOR_D1)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 6 (B_DIVISIO_MINOR_D1)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -570,7 +570,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 6 (B_DIVISIO_MINOR_D1)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -652,14 +652,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 7 (B_DIVISIO_MINOR_D2)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 7 (B_DIVISIO_MINOR_D2)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -689,7 +689,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 7 (B_DIVISIO_MINOR_D2)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -771,14 +771,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 8 (B_DIVISIO_MINOR_D3)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 8 (B_DIVISIO_MINOR_D3)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -808,7 +808,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 8 (B_DIVISIO_MINOR_D3)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -890,14 +890,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 9 (B_DIVISIO_MINOR_D4)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 9 (B_DIVISIO_MINOR_D4)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -927,7 +927,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 9 (B_DIVISIO_MINOR_D4)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -1009,14 +1009,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 10 (B_DIVISIO_MINOR_D5)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 10 (B_DIVISIO_MINOR_D5)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -1046,7 +1046,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 10 (B_DIVISIO_MINOR_D5)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -1128,14 +1128,14 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 11 (B_DIVISIO_MINOR_D6)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 11 (B_DIVISIO_MINOR_D6)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
=====================================================================
type 9 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -1165,7 +1165,7 @@
---------------------------------------------------------------------
type 14 (GRE_BAR)
bar 11 (B_DIVISIO_MINOR_D6)
special sign 5 (_V_EPISEMUS)
special sign 16 (_V_EPISEMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
Loading

0 comments on commit 2c11f6a

Please sign in to comment.