Skip to content

Commit

Permalink
Merge branch 'release-4.2' into eolateos
Browse files Browse the repository at this point in the history
* release-4.2:
  Accepting corrected results
  Added a test for whitespace collapsing. Tests gregorio-project/gregorio#1111.
  New test to show interaction between mora shift and old bar spacing algorithm
  • Loading branch information
rpspringuel committed May 22, 2016
2 parents 1c05304 + 5a11dc3 commit 8489bc3
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 0 deletions.
15 changes: 15 additions & 0 deletions tests/gabc-gtex/newlines.gabc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: newlines;
%%
(c3)
one(f) two(g)
three
four(h)
five

six(i)
seven
(j)
eignt

nine(k)
(::)
63 changes: 63 additions & 0 deletions tests/gabc-gtex/newlines.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
% File generated by gregorio 4.2.0-beta1-release-4.2-61ac29e-3742
\GregorioTeXAPIVersion{4.2.0-beta1}%
% Name: newlines
\GreBeginHeaders %
\GreHeader{name}{newlines}%
\GreEndHeaders %
\GreBeginScore{57131644399b17c446ca35b5f58d016df191ce67}{13}{8}{0}{0}{}{4}%
\GreScoreOpening{%
}{%
\GreSetInitialClef{c}{3}{3}{c}{0}{3}%
}{%
}{\GreSyllable}{\GreSetFirstSyllableText{o}{n}{e}{{\GreFirstWord{\GreFirstSyllable{\GreFirstSyllableInitial{n}}}}{\GreFirstWord{\GreFirstSyllable{e}}}{}}{{}{\GreFirstWord{\GreFirstSyllable{\GreFirstSyllableInitial{o}}}}{\GreFirstWord{\GreFirstSyllable{ne}}}}{}}{}{\GreFirstWord}{1}{\GreSetNextSyllable{tw}{o}{}{t}{wo}}{}{0}{}{%
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPPunctum}{8}{\GreNextCustos{9}{}}{0}%
{%
\GreGlyphHeights{8}{8}%
}{}{}%
}%
%
\GreSyllable{\GreSetThisSyllable{tw}{o}{}{t}{wo}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{thr}{ee}{ four}{t}{hree four}}{}{0}{}{%
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPPunctum}{9}{\GreNextCustos{10}{}}{0}%
{%
\GreGlyphHeights{9}{9}%
}{}{}%
}%
%
\GreSyllable{\GreSetThisSyllable{thr}{ee}{ four}{t}{hree four}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{f}{i}{ve six}{f}{ive six}}{}{0}{}{%
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPPunctum}{10}{\GreNextCustos{11}{}}{0}%
{%
\GreGlyphHeights{10}{10}%
}{}{}%
}%
%
\GreSyllable{\GreSetThisSyllable{f}{i}{ve six}{f}{ive six}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{s}{e}{ven }{s}{even }}{}{0}{}{%
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPPunctum}{11}{\GreNextCustos{12}{}}{0}%
{%
\GreGlyphHeights{11}{11}%
}{}{}%
}%
%
\GreSyllable{\GreSetThisSyllable{s}{e}{ven }{s}{even }}{}{\GreUnstyled}{1}{\GreSetNextSyllable{}{ei}{gnt nine}{e}{ignt nine}}{}{0}{}{%
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPPunctum}{12}{\GreNextCustos{13}{}}{0}%
{%
\GreGlyphHeights{12}{12}%
}{}{}%
}%
%
\GreSyllable{\GreSetThisSyllable{}{ei}{gnt nine}{e}{ignt nine}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{}{}{}{}{}}{}{15}{}{%
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPPunctum}{13}{\GreNextCustos{9}{}}{0}%
{%
\GreGlyphHeights{13}{13}%
}{}{}%
}%
%
\GreFinalDivisioFinalis{%
}%
\GreEndScore %
\endinput %
Binary file modified tests/gabc-output/edge_cases.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions tests/gabc-output/newlines.gabc
Binary file added tests/gabc-output/newlines.pdf
Binary file not shown.
Binary file modified tests/tex-output/bar-spacing-old/bar-spacing-old.pdf
Binary file not shown.
Binary file added tests/tex-output/bugs/fix-1078/fix-1078.pdf
Binary file not shown.
17 changes: 17 additions & 0 deletions tests/tex-output/bugs/fix-1078/fix-1078.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
% !TEX program = LuaLaTeX+se
\documentclass[12pt, a4paper]{article}

\usepackage{fontspec}
\usepackage{fullpage}
\pagestyle{empty}

\usepackage{libertine}
\usepackage[autocompile]{gregoriotex}

\begin{document}

\gresetbarspacing{old}

\gabcsnippet{(c3) first(g) *(:) sec(g)ond(g.) *(:) third(g) (::)}

\end{document}

0 comments on commit 8489bc3

Please sign in to comment.