Skip to content

Commit

Permalink
Merge branch 'develop' into commentary
Browse files Browse the repository at this point in the history
* develop:
  Fixed improper centering with elision after prefix. Fixes gregorio-project#1320.
  Spelling error
  Added clarity to UPGRADE
  Remove source files for gregorio and granapadano from Mac installer
  Remove gregorio and granapadano source files from tds file
  Restrict fonts in Windows Installer
  New gregall glyphs for gregorio-project#1303 gregorio-project#1305 gregorio-project#1313 gregorio-project#1314 gregorio-project#1315 gresgmodern not updated yet.
  • Loading branch information
rpspringuel committed Mar 2, 2017
2 parents cf7219e + 8052b5b commit ba23526
Show file tree
Hide file tree
Showing 11 changed files with 4,271 additions and 288 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
## [5.0.0-beta2] - 2017-02-24
### Fixed
- Glyphs for pes quadratum shapes with initio debilis are no longer missing. Use `-fqg` to engrave them. See [#1310](https://github.com/gregorio-project/gregorio/issues/1310).
- Elisions after a vowel centering prefix will no longer cause the center to be placed on the vowel in the prefix. Since prefixes are unvoiced vowels, this makes more sense than the previous behavior. As usual, you may use the manual centering features to force the centering where you want if this does not produce what you want. See [#1320](https://github.com/gregorio-project/gregorio/issues/1320).

### Changed
- The default behaviour of `\gregorioscore` has been changed to autocompile.
- When the note after an oriscus is at the same pitch, the oriscus direction now depends on the first non-unison, non-oriscus note after the oriscus (see [#1179](https://github.com/gregorio-project/gregorio/issues/1179)).
- 6 new St. Gall neume glyphs have been added to the `gregall` font and glyph for nabc `to!ciG` has been changed (see [#1303](https://github.com/gregorio-project/gregorio/issues/1303), [#1305](https://github.com/gregorio-project/gregorio/issues/1305), [#1313](https://github.com/gregorio-project/gregorio/issues/1313), [#1314](https://github.com/gregorio-project/gregorio/issues/1314), [#1315](https://github.com/gregorio-project/gregorio/issues/1315)).

## [5.0.0-beta1] - 2017-01-31
### Fixed
Expand Down
7 changes: 5 additions & 2 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The `autocompile` option is now the default option for the behavior of `\gregori

### Additional fonts

With the addition of more cavum shapes, the number of font options which come with Gregorio (the package) by default has been reduced in order to control the download size. From now on only Greciliae will be installed by default. The Gregorio and Grana Padano fonts, as well as their "-op" Dominican variants, will now be available as a separate download. If you were using these fonts, either download `supp_fonts-5_0_0.zip` and install them or switch to Greciliae.
With the addition of more cavum shapes, the number of font options which come with Gregorio (the package) by default has been reduced in order to control the download size. From now on only Greciliae (and its "-op" Dominican variant) will be installed by default. The Gregorio and Grana Padano fonts, as well as their "-op" Dominican variants, will now be available as a separate download. If you were using these fonts, either download `supp_fonts-5_0_0.zip` and install them or switch to Greciliae.

To install the new versions of Gregorio (the font) and Grana Padano, unzip `supp_fonts-5_0_0.zip`, navigate to the uncompressed folder in Terminal (or Command Prompt on Windows) and execute `texlua install_supp_fonts.lua` after you have installed the main Gregorio distribution. This script will look for the location of Greciliae and copy the other fonts to that location. If you wish to control the installation of the fonts manually, the script takes an optional argument with one of the following values:

Expand All @@ -23,7 +23,6 @@ Additionally, if you are building the fonts yourself from a git clone, `install-

**Note:** All the above methods assume you only need to access the fonts from within a TeX document (and thus are designed to put them into the correct folder in a texmf tree). If you want to use the fonts in other programs, then you will need to consult the documentation appropriate to your platform and/or the program and manually move, copy, or link the fonts to the necessary location.


### Ledger lines

As of version 5.0, ledger lines are extended through notes on either side of a ledger line that crosses a stem, as long as the notes are within the same element.
Expand All @@ -47,6 +46,10 @@ As of version 5.0, the `\gresethyphenprotrusion{percentage}` command is deprecat

As of version 5.0, when the note after the oriscus is at the same pitch as the oriscus, the oriscus will point towards the first non-unison note after the oriscus or downwards if at the end of the score. Use the `0` (for downwards) `1` (for upwards) modifiers to force a different orientation.

### Elisions in vowel centering

As of version 5.0, elisions after a vowel centering prefix will not cause the center to be placed on the vowel at the end of the prefix. Since elisions are unvoiced vowels, this makes more sense than the previous behavior. However, if this change does not produce your desired output, you may surround the center manually with `{` and `}` in gabc.

## 4.2

### Executable file name
Expand Down
2 changes: 1 addition & 1 deletion doc/Gabc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ \subsection{Headers}
placed above the initial unless one of the following conditions are
met:
\begin{itemize}
\item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
\item There is a \verb=\greannotation= defined immediately prior to \verb=\gregorioscore=.
\item The \texttt{annotation} header field is defined.
\end{itemize}
\item[mode-modifier] The mode ``modifier'' of the piece. This may be any
Expand Down
12 changes: 11 additions & 1 deletion doc/GregorioNabcRef.tex
Original file line number Diff line number Diff line change
Expand Up @@ -871,9 +871,13 @@
\texttt{H114N} Nativitas tua \texttt{AM1035}\\
\texttt{H118G} Gaude, Maria Virgo \texttt{NR130*}\\
\texttt{H119C} Cum inducerent\\
\texttt{H173I} Insurrexerunt in me \texttt{NR364}\\
\texttt{H173C} Contumelias et terrores \texttt{NR365}\\
\texttt{H179L} Liberavit Dominus \texttt{ARII183}\\
\texttt{H179A} Amicus meus osculi \texttt{NR381}\\
\texttt{H179I} Iudas mercator \texttt{NR382}\\
\texttt{H219T} Tradiderunt me \texttt{NR408}\\
\texttt{H219I} Iesum tradidit impius \texttt{NR409}\\
\texttt{H266D} Domino si in tempore\\
\texttt{H269S} Spiritus Sanctus\\
\texttt{H269D} Dum complerentur \texttt{NR493}\\
Expand Down Expand Up @@ -1066,6 +1070,7 @@
\sneume{toS3lst2} & \texttt{toS3lst2} & \texttt{C59D} & tuae\\
\sneume{pq!cl-} & \texttt{pq!cl-} & \texttt{C87E} & sanasti\\
\sneume{to>1} & \texttt{to>1} & \texttt{E130I} & obdormiam & \fbox{2.166x}\\
\sneume{to>2} & \texttt{to>2} & \texttt{H219T} & fortes: & \fbox{1.63x}\\
\sneume{to->} & \texttt{to->} & \texttt{E158D} & respexit & \fbox{2.166x}\\
\sneume{toS2sux1} & \texttt{toS2sux1} & \texttt{C46O} & Surge\\ \hline
& \multicolumn{3}{l}{\textbf{climacus}} & \\
Expand Down Expand Up @@ -1167,6 +1172,7 @@
\sneume{pe-su2} & \texttt{pe-su2} & \texttt{H73S} & adoraverunt\\
\sneume{pe-1su2} & \texttt{pe-1su2} & \texttt{C64Q} & habitat\\
\sneume{pe-1sut2} & \texttt{pe-1sut2} & \texttt{H104T} & confitemur\\
\sneume{pe-1sut1suw1} & \texttt{pe-1sut1suw1} & \texttt{H219I} & videret & \fbox{1.63x}\\
\sneume{peSsu2} & \texttt{peSsu2} & \texttt{A17T} & eius\\
\sneume{peSsut2} & \texttt{peSsut2} & \texttt{C27E} & sanctos\\
\sneume{vippt1su2} & \texttt{vippt1su2} & \texttt{C56B} & benedicetur.\\
Expand Down Expand Up @@ -1343,6 +1349,7 @@
\sneume{su2suw1} & \texttt{su2suw1} \textit{Cf.} \sneume{visu2suw1} & \multicolumn{2}{l}{\texttt{visu2suw1}}\\
\sneume{su2sux1} & \texttt{su2sux1} \textit{Cf.} \sneume{vi-su2sux1} & \multicolumn{2}{l}{\texttt{vi-su2sux1}}\\
\sneume{sut1su2} & \texttt{sut1su2} \textit{Cf.} \sneume{visut1su2} & \multicolumn{2}{l}{\texttt{visut1su2}}\\
\sneume{sut1suw1} & \texttt{sut1suw1} \textit{Cf.} \sneume{pe-1sut1suw1} & \multicolumn{2}{l}{\texttt{pe-1sut1suw1}}\\
\sneume{sut3} & \texttt{sut3} \textit{Cf.} \sneume{visut3} & \multicolumn{2}{l}{\texttt{visut3}}\\
\sneume{suv1su2} & \texttt{suv1su2} \textit{Cf.} \sneume{visuv1su2} & \multicolumn{2}{l}{\texttt{visuv1su2}}\\
\sneume{sut4} & \texttt{sut4} \textit{Cf.} \sneume{visut4} & \multicolumn{2}{l}{\texttt{visut4}}\\
Expand Down Expand Up @@ -1435,6 +1442,7 @@
\sneume{qi!cl-} & \texttt{qi!cl-} & \texttt{C148A} & factus\\
\sneume{qi!cl>} & \texttt{qi!cl>} & \texttt{H77S} & Magi\\
\sneume{qi!po} & \texttt{qi!po} & \texttt{H87E} & Deus\\
\sneume{qi!po>} & \texttt{qi!po>} & \texttt{H173C} & adversum & \fbox{1.9x}\\
\sneume{pf!clM-ppt1} & \texttt{pf!clM-ppt1} & \texttt{E327O} & narante & \fbox{2.166x}\\
\sneume{cl!po>ppt1} & \texttt{cl!po>ppt1} & \texttt{E327O} & narante & \fbox{2.166x}\\
\sneume{qlppt1} & \texttt{qlppt1} & \texttt{C38T} & Sede\\
Expand Down Expand Up @@ -1479,7 +1487,8 @@
\sneume{ql-su1sut1} & \texttt{ql-su1sut1} & \texttt{H307F} & iustitiae & \fbox{2.0x}\\
\sneume{qippt2sut2} & \texttt{qippt2sut2} & \texttt{H297B} & generationes & \fbox{2.0x}\\
\sneume{ql!vssu3} & \texttt{ql!vssu3} & \texttt{H443V} & ei & \fbox{2.0x}\\
\sneume{to!ciG} & \texttt{to!ciG} & \texttt{C28T} & gloriae.\\
\sneume{to!ciG} & \texttt{to!ciG} & \texttt{E51R} & eum & \fbox{2.0x}\\
\sneume{to!ciGhh} & \texttt{to!ciG} & \texttt{C28T} & gloriae.\\
\sneume{to!cl} & \texttt{to!cl} & \texttt{C84T} & pupillo\\
\sneume{to!cl!cl!cl} & \texttt{to!cl!cl!cl} & \texttt{C64Q} & sepavit,\\
\sneume{to!cl!po} & \texttt{to!cl!po} & \texttt{E31T} & veritas & \fbox{2.166x}\\
Expand Down Expand Up @@ -1511,6 +1520,7 @@
\sneume{toS2sut2} & \texttt{toS2sut2} & \texttt{C150L} & dicta\\
\sneume{to-1su2} & \texttt{to-1su2} & \texttt{H322C} & ostendere & \fbox{2.0x}\\
\sneume{to-1su1} & \texttt{to-1su1} & \texttt{H323B} & Gallus & \fbox{2.0x}\\
\sneume{to-1suu1} & \texttt{to-1suu1} & \texttt{H173I} & me & \fbox{1.8x}\\
\sneume{to-1suu1su2} & \texttt{to-1suu1su2} & \texttt{H324V} & cognovi & \fbox{2.0x}\\
\sneume{po-1pp2su1sux1} & \texttt{po-1pp2su1sux1} & \texttt{H323D} & desiderium & \fbox{2.0x}\\
\sneume{po-1su1sux1} & \texttt{po-1su1sux1} \textit{Cf.} \sneume{po-1pp2su1sux1} & \multicolumn{3}{l}{\texttt{po-1pp2su1sux1} minus bipunctis}\\
Expand Down
Loading

0 comments on commit ba23526

Please sign in to comment.