diff --git a/.gregorio-version b/.gregorio-version index ad1b4e2ce..b65678531 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -4.1.0-rc2 +4.1.0 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/CHANGELOG.md b/CHANGELOG.md index c40f5b731..5737429f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,113 +2,42 @@ All notable changes to this project will be documented in this file. As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/). -## [Unreleased][unreleased] -### Fixed -- New bar spacing algorithm now respects `\gresetlastline`. -- Italic correction is applied to the default style of elision. - -### Changed -- `spacebeforeeolcustos` has been increased, aproximately doubling its size. It's also been made fixed by default, but is still capapble of accepting a rubber value should you so desire. - -### Added -- `iterwordspacetext@bars@notext` and `interwordspacetext@bars@notext@euouae`: These spaces will be used by the new bar spacing algorithm as the minimal space between the text of the syllables adjacent to the bar syllable when the bar syllable itself has not text associated with it. See [#978](https://github.com/gregorio-project/gregorio/issues/978). - - -## [4.1.0-rc2] - 2016-02-25 +## [4.1.0] - 2016-03-01 ### Fixed - Hyphens now shouldn't go right of the staff lines (see [#845](https://github.com/gregorio-project/gregorio/issues/845)). -- Offset limit calculations now function better in both directions for new bar spacing algorithm. -- Bars ending a line are now at a correct (closer) distance from end of line. - -### Changed -- The treatment of syllables with no notes has been reverted when the old spacing algorithm is used. Such syllables are now treated as notes syllables under the old algorithm (as was the case in 4.1.0-beta3 and earlier) and as bar syllables under the new algorithm. -- The names of the spaces around bars have changed, see `gsp-default` or GregorioRef for the new names. It is now possible to tune the spacing of the virgula separately from the divisio minima, and the dominican bar separately from the divisio minor. -- When using the new bar spacing algorithm, it is now possible to assign different spaces to bar in three different cases: inside a syllable, in a separate syllable with text, and in a separate syllable without text (see [#944](https://github.com/gregorio-project/gregorio/issues/944) for request). - -### Added -- It is now possible to turn off rythmic signs (separately or all together) with `\greprintsigns`, see GregorioRef for details (and [#936](https://github.com/gregorio-project/gregorio/issues/936) for request). -- Added `maxbaroffsettextright@nobar` and `maxbaroffsettextleft@nobar` which function identically to the normal version except that they are used then the "bar" is empty (i.e. something like `*()` in gabc). -- Space between the two bars of a divisio finalis is now tunable through `divisiofinalissep`. -- Added `notesonly` argument to `\gresetshiftaftermora` (see [#948](https://github.com/gregorio-project/gregorio/issues/948)). -- Added `maxbaroffsettextright@eol` and `maxbaroffsettextleft@eol` which function identically to the normal version except that they are used then the bar is immediately followed by a manual line break (i.e. something like `test(::z)` in gabc). - -### Known Bugs -- When there is no manual break, the spacing around bars at the end of a line in the new spacing algorithm is not perfect, this should be visible only in edge cases. If you encounter such a bad spacing, you are advised to force a line break manually. See [#959](https://github.com/gregorio-project/gregorio/issues/959). -- Above lines text does not move to account for high notes which occur in the same place. As a result the two may overlap. You can work around this by changing `abovelinestextraise` but this is a global setting, affecting the entire score. See [#960](https://github.com/gregorio-project/gregorio/issues/960). -- A manual custos in a low note position will not push down the text associated with it, resulting in the two overlapping. See [#961](https://github.com/gregorio-project/gregorio/issues/961). - - -## [4.1.0-rc1] - 2016-02-18 -### Fixed -- New bar spacing algorithm now accounts for translations (and other below lyrics stuff). - Horizontal episema on initio debilis is now sized correctly (see [#880](https://github.com/gregorio-project/gregorio/issues/880)). -- Elisions immediately after the vowel are now properly left out of the center (see [#907](https://github.com/gregorio-project/gregorio/issues/907)) -- New bar spacing algorithm now respects the setting of `\gresetshiftaftermora`. See [#919](https://github.com/gregorio-project/gregorio/issues/919) - Space between the text of two syllables of the same word when no hyphen is necessary is now strictly 0 (see [#922](https://github.com/gregorio-project/gregorio/issues/922)) - A horizontal episema on the first note of a torculus deminutus is now placed correctly. See [#926](https://github.com/gregorio-project/gregorio/issues/926). -- Corrected determination of repercussive figures and other edge cases (introduced in 4.1.0-beta2). See [#928](https://github.com/gregorio-project/gregorio/issues/928) and [#929](https://github.com/gregorio-project/gregorio/issues/929). +- Compilation of documents produced with Gregorio should be slightly faster. +- The alignment of the vertical episema under a punctum inclinatum deminutus is now correct (see [#742](https://github.com/gregorio-project/gregorio/issues/742)). +- `` and `` may now be ended on the final divisio maior/finalis (see [#743](https://github.com/gregorio-project/gregorio/issues/743)). +- Sign positioning on the first note of quadratum figures is now correct (see [#752](https://github.com/gregorio-project/gregorio/issues/752)). +- Interlinear spacing of annotations when font size was smaller than normal. You should now see just the spacing specified by `annotationseparation`. +- Spacing is now correct and ledger lines are now typeset for flats, sharps, and naturals above and below the staff (see [#790](https://github.com/gregorio-project/gregorio/issues/790) and [#882](https://github.com/gregorio-project/gregorio/issues/882)). +- Forced hyphens at the end of words are no longer suppressed (see [#804](https://github.com/gregorio-project/gregorio/issues/804)). +- Three descending, otherwise unmodified notes are now correctly grouped as a clivis followed by a punctum. If you prefer three notes butted up against each other, separate them with `!`. ### Changed -- Adjustments to the heuristic for ledger lines to include adjacent notes (see [#862](https://github.com/gregorio-project/gregorio/issues/862)). +- `spacebeforeeolcustos` has been increased, aproximately doubling its size. It's also been made fixed by default, but is still capapble of accepting a rubber value should you so desire. +- The names of the spaces around bars have changed, see `gsp-default` or GregorioRef for the new names. It is now possible to tune the spacing of the virgula separately from the divisio minima, and the Dominican bar separately from the divisio minor. - The stem length determination will use the ledger line below the note with the stem (see [#863](https://github.com/gregorio-project/gregorio/issues/863)). - Made the oriscus orientation dependent on the note that follows. Using `1` will force the ascending oriscus and `0` will force the descending oriscus. The old behavior may be restored by setting the `oriscus-orientation` gabc header to `legacy`. See UPGRADE.md for details (for the change request, see [#774](https://github.com/gregorio-project/gregorio/issues/774) and [#898](https://github.com/gregorio-project/gregorio/issues/898)). - Add new lines as needed to the gabc output. (see [#905](https://github.com/gregorio-project/gregorio/issues/905)). -- Syllable with no notes are now treated as bar syllables rather than note syllables. This increase their spacing under the old algorithm and, more importantly, allows them to use the new spacing algorithm. -- `maxbaroffset` has been split into `maxbaroffsettextleft` and `maxbaroffsettextright` - -### Added -- Controls for tuning horizontal episema vertical position. See GregorioRef for details (for the change request, see [#872](https://github.com/gregorio-project/gregorio/issues/872)). -- More dimensions are tunable: `overhepisemalowshift`, `overhepisemahighshift`, `underhepisemalowshift`, `underhepisemahighshift`, `hepisemamiddleshift`, `vepisemalowshift`, `vepisemahighshift`, `linepunctummorashift`, `spacepunctummorashift`, `spaceamonepespunctummorashift`, `lineporrectuspunctummorashift`, `spaceporrectuspunctummorashift`, `raresignshift`, `interwordspacetext@bars`, `interwordspacetext@bars@euouae`. See GregorioRef for details (for the change request for most of these, see comments in [#872](https://github.com/gregorio-project/gregorio/issues/872)). -- A new dimension, `intersyllablespacestretchhyphen` is now available to add stretching in the case of syllables separated by an hyphen (see comments in [#922](https://github.com/gregorio-project/gregorio/issues/922)) - - -## [4.1.0-beta3] - 2016-02-09 -### Fixed -- Missing file from manifests and system-setup scripts has been added (new bug in 4.1.0-beta2) - -### Changed - Command line output (help message, version message, error handling) has been improved, see [#891](https://github.com/gregorio-project/gregorio/issues/891) - Windows installer no longer copies the executable into the TeX bin directory. Instead it has the option to add its own bin directory to PATH. - `system-setup.sh` has become `system-setup.command` so that it is double click executable on Mac. - Post install options for Windows installer have been simplified. There are no longer separate options for MiKTeX and TeXLive. Instead the installer will determine which you have itself and act accordingly. - Windows installer will check more locations for old installations to remove. - - -## [4.1.0-beta2] - 2016-02-08 -### Fixed -- When a flat on a ledger line (`bx` or `lx`) was preceding a note also on a ledger line, the ledger line was partially visible inside the flat, see [#882](https://github.com/gregorio-project/gregorio/issues/882). -- Compilation of documents produced with Gregorio should be slightly faster. - -### Changed -- Stem length for virgas, flexus, pes quadratum, etc. are now tunable, and have been reviewed, see [#803](https://github.com/gregorio-project/gregorio/issues/803). - Height of the porrectus have been altered (first note moved up, second also moved up when second ambitus is more than one) so that they are more coherent with the punctum height. The porrectus stroke drawings have also been slightly altered to be slightly thinner and sharper around the bottom note (see [#858](https://github.com/gregorio-project/gregorio/issues/858)). - When a syllable is preceeded by a punctum mora, gregorio now ignores the punctum mora in the spacing of the syllables by default, and also adds a custom space (defaulting to 0). You can change this behavior with `\gresetshiftaftermora{}`, see GregorioRef for its arguments. To balance the output, space before a punctum mora has been made slightly thinner, more in line with old Solesmes books. (For the change requests, see [#795](https://github.com/gregorio-project/gregorio/issues/795) and [#871](https://github.com/gregorio-project/gregorio/issues/871)). - The `--admin` option is removed from the `initexmf` call for MiKTeX installations, allowing the installer to work better on Windows 10. - MiKTeX installations no longer copy files into TEXMFLOCAL but instead registers the texmf folder which the installer creates with MiKTeX, allowing it to use those files in place. See [#884](https://github.com/gregorio-project/gregorio/issues/884) - Windows installer now contains an uninstall script which will run as part of the uninstall action and thus should remove the Gregorio executable and TeX files from their copied locations (leaving a clean post-uninstall system). - -### Added -- A new algorithm for placing bar syllables has been added. The goal of the new algorithm is to place the bar line exactly between the notes which surround it and do the same with the text associated with the bar line. It also implements a limit, `maxbaroffset`, which prevents the bar line and its text from getting too far apart. This algorithm can be activated with `\gresetbarspacing{new}`. Testing is not yet complete and it may still contain bugs. See [#767](https://github.com/gregorio-project/gregorio/issues/767). -- It is now possible to generate a font with a different stem length schema (apart from the default one, Solesmes' is available), see [fonts/README.md](fonts/README.md) for details. -- Some forms (`ed` for example) will have a different stem length if a ledger line is present. Heuristics to determine the presence of a ledger line or not are quite simple and may not always be correct. Gabc now allows you to force a note to act as if a ledger line was present with `[ll:1]`, or as if there was no ledger line, with `[ll:0]`. See Gabc section of GregorioRef for details. -- The ability to typeset an inter-glyph space using `/!` in gabc (see [#868](https://github.com/gregorio-project/gregorio/issues/868)) - -## [4.1.0-beta1] - 2016-01-23 -### Fixed -- The alignment of the vertical episema under a punctum inclinatum deminutus is now correct (see [#742](https://github.com/gregorio-project/gregorio/issues/742)). -- `` and `` may now be ended on the final divisio maior/finalis (see [#743](https://github.com/gregorio-project/gregorio/issues/743)). -- Sign positioning on the first note of quadratum figures is now correct (see [#752](https://github.com/gregorio-project/gregorio/issues/752)). -- Interlinear spacing of annotations when font size was smaller than normal. You should now see just the spacing specified by `annotationseparation`. -- Spacing is now correct and ledger lines are now typeset for flats, sharps, and naturals above and below the staff (see [#790](https://github.com/gregorio-project/gregorio/issues/790)). -- Forced hyphens at the end of words are no longer suppressed (see [#804](https://github.com/gregorio-project/gregorio/issues/804)). -- Three descending, otherwise unmodified notes are now correctly grouped as a clivis followed by a punctum. If you prefer three notes butted up against each other, separate them with `!`. - -### Changed - Initial handling has been simplified. The initial style should now be specified from TeX by using the `\gresetinitiallines` command, rather than from a gabc header. Big initials and normal initials are now governed by a single `initial` style, meant to be changed between scores as appropriate. See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#632](https://github.com/gregorio-project/gregorio/issues/632)). Deprecations for this change are listed in the Deprecation section, below. - `\gresethyphen` no longer manipulates `maximumspacewithoutdash`, allowing for restoration of consistent behavior after this distance has been modified. See [#705](https://github.com/gregorio-project/gregorio/issues/705). - The oriscus-based shapes in the greciliae font are more consistent. The shape of a scandicus with a second ambitus of two is more consistent across all score fonts. - Minimal space between notes of different syllables (or words) has been reduced when the second syllable starts with an alteration. -- The space between note and horizontal episema has been tightened for notes at the `c` or `k` height when there is no ledger line. Due to the intricacies of measurement, the system tries to make a best guess as to the existence of the ledger line. If the guess is wrong, you may use the `[hl:n]` and `[ll:n]` notations in gabc to override the guess. See [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#716](https://github.com/gregorio-project/gregorio/issues/716)). +- The space between note and horizontal episema has been tightened for notes at the `c` or `k` height when there is no ledger line. Due to the intricacies of measurement, the system tries to make a best guess as to the existence of the ledger line. If the guess is wrong, you may use the `[hl:n]` and `[ll:n]` notations in gabc to override the guess. See [UPGRADE.md](UPGRADE.md) for details (for aspects of change request, see [#716](https://github.com/gregorio-project/gregorio/issues/716), and [#862](https://github.com/gregorio-project/gregorio/issues/862)). - The custos that might appear immediately before a `` block is now suppressed by default. This behavior is controlled by the `\greseteolcustosbeforeeuouae` command. See GregorioRef and [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#761](https://github.com/gregorio-project/gregorio/issues/761)). - Different glyphs will now be used for the liquescent stropha on a line or between lines, if supported by the font. If you prefer the old behavior, use `\grechangeglyph{StrophaAuctaLongtail}{*}{StrophaAucta}` in your TeX file. See [#773](https://github.com/gregorio-project/gregorio/issues/773). - Headers not recognized by gregorio, rather than inducing an error, are now simply accepted by gregorio. Most of the old "standard" headers, like `book` and `manuscript-location`, are now handled in this way and thus are no longer limited to one instance. See GregorioRef for details. @@ -116,6 +45,34 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - `\grecommentary` is now less restrictive about where it occurs and need not occur directly before the score anymore. ### Added +- It is now possible to turn off rythmic signs (separately or all together) with `\greprintsigns`, see GregorioRef for details (and [#936](https://github.com/gregorio-project/gregorio/issues/936) for request). +- Space between the two bars of a divisio finalis is now tunable through `divisiofinalissep`. +- Added `notesonly` argument to `\gresetshiftaftermora` (see [#948](https://github.com/gregorio-project/gregorio/issues/948)). +- Controls for tuning horizontal episema vertical position. See GregorioRef for details (for the change request, see [#872](https://github.com/gregorio-project/gregorio/issues/872)). +- More dimensions are tunable: `overhepisemalowshift`, `overhepisemahighshift`, `underhepisemalowshift`, `underhepisemahighshift`, `hepisemamiddleshift`, `vepisemalowshift`, `vepisemahighshift`, `linepunctummorashift`, `spacepunctummorashift`, `spaceamonepespunctummorashift`, `lineporrectuspunctummorashift`, `spaceporrectuspunctummorashift`, `raresignshift`. See GregorioRef for details (for the change request for most of these, see comments in [#872](https://github.com/gregorio-project/gregorio/issues/872)). +- A new dimension, `intersyllablespacestretchhyphen` is now available to add stretching in the case of syllables separated by an hyphen (see comments in [#922](https://github.com/gregorio-project/gregorio/issues/922)) +- A new algorithm for placing bar syllables has been added and is now the default. It should make both bars and text centered between respectively notes and text of previous and following syllable. It can be configured in many ways through the following: + - `maxbaroffsettextright` + - `maxbaroffsettextleft` + - `maxbaroffsettextright@nobar` + - `maxbaroffsettextleft@nobar` + - `maxbaroffsettextright@eol` + - `maxbaroffsettextleft@eol` + - `bar@*@standalone@text` (where `*` is the type of bar) + - `bar@*@standalone@notext` (where `*` is the type of bar) + - `interwordspacetext@bars` + - `interwordspacetext@bars@euouae` + - `interwordspacetext@bars@notext` + - `interwordspacetext@bars@notext@euouae` + - `bar@rubber` +The old spacing can be activated with `\gresetbarspacing{old}`. See the following for various aspects of the implementation: + - [#767](https://github.com/gregorio-project/gregorio/issues/767) + - [#919](https://github.com/gregorio-project/gregorio/issues/919) + - [#944](https://github.com/gregorio-project/gregorio/issues/944) + - [#978](https://github.com/gregorio-project/gregorio/issues/978) +- It is now possible to generate a font with a different stem length schema (apart from the default one, Solesmes' is available), see [fonts/README.md](fonts/README.md) for details. +- Some forms (`ed` for example) will have a different stem length if a ledger line is present. Heuristics to determine the presence of a ledger line or not are quite simple and may not always be correct. Gabc now allows you to force a note to act as if a ledger line was present with `[ll:1]`, or as if there was no ledger line, with `[ll:0]`. See Gabc section of GregorioRef for details. +- The ability to typeset an inter-glyph space using `/!` in gabc (see [#868](https://github.com/gregorio-project/gregorio/issues/868)) - Support for two-, three-, and five-line staves. Set the `staff-lines` header to `2`, `3`, or `5`. For all values of `staff-lines`, the note below the staff remains 'c'. The two new notes above the staff (for a five-line staff) are `n` and `p`. See [#429](https://github.com/gregorio-project/gregorio/issues/429). - Salicus flexus glyphs (see [#631](https://github.com/gregorio-project/gregorio/issues/631)). - Neume fusion, activated in gabc by `@`. Use `@` before a clivis or a porrectus to get an unstemmed figure. Use `@` between two notes to fuse them explicitly. Enclose a set of notes within `@[` and `]` to automatically guess their fusion. See GregorioRef for details (for the channge requests, see [#679](https://github.com/gregorio-project/gregorio/issues/679), [#687](https://github.com/gregorio-project/gregorio/issues/687), and [#692](https://github.com/gregorio-project/gregorio/issues/692)). @@ -126,7 +83,6 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - Support for a secondary clef. Use `@` to join two clefs together, as in `c1@c4`. The first clef is considered the primary one and will be used when computing an automatic custos before a clef change. See [#755](https://github.com/gregorio-project/gregorio/issues/755). - New headers for typesetting text after `mode` above the initial: `mode` will be typeset first, using the `modeline` style, then `mode-modifier`, using the `modemodifier` style, then `mode-differentia`, using the `modedifferentia` style. See GregorioRef for details (for the change request, see [#756](https://github.com/gregorio-project/gregorio/issues/756)). - Automatic line breaks before a `` block may be made ragged by using `\gresetbreakbeforeeuouae{ragged}`. See GregorioRef for details (for the change request, see [#764](https://github.com/gregorio-project/gregorio/issues/764)). -- Tunable spaces for bars with text underneath: `spacearoundsmallbartext`, `spacearoundminortext`, `spacearoundmaiortext`, `spacearoundfinalistext`, `spacebeforefinalfinalistext`. These are sized slightly larger than their "non-text" counterparts. See GregorioRef and [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#766](https://github.com/gregorio-project/gregorio/issues/766)). - The ability to typeset simple slurs. See GregorioRef for details (for the change request, see [#776](https://github.com/gregorio-project/gregorio/issues/776)). - More control over the alignment of the annotation. You can now set either the first line or the last line of the annotation as the controling line with `\gresetannotationby{firstline}` and `\gresetannotationby{lastline}` respectively. Additionaly, within the line you can specify the top, baseline, or bottom of the line as the alignment point with `\gresetannotationvalign{top}`, `\gresetannotation{baseline}`, and `\gresetannotationvalgin{bottom}` respectively. Default behavior is baseline of the top line (as it was before). These alignment controls are applied before `annotationraise` is taken into account. See [#768](https://github.com/gregorio-project/gregorio/issues/768) for details. - More control over the placement of the commentary. You can now set the amount of space between the lines of a multi-line commentary with `commentaryseparation` and the distance from the top line of the staff to the baseline of the bottom line of the commentary with `commentaryraise`. See [#662](https://github.com/gregorio-project/gregorio/issues/662) for original request. @@ -197,10 +153,15 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - `\setspaceafterinitial`, supplanted by `\grechangedim{afterinitialshift}...` - `\setspacebeforeinitial`, supplanted by `\grechangedim{beforeinitialshift}...` - `\setinitialspacing`, supplanted by `\grechangedim{beforeinitialshift}...`, `\grechangedim{manualinitialwidth}...`, and `\grechangedime{afterinitialshift}...` -- `centering-scheme` gabc header, supplanted by `\grelyriccentering` in TeX. See GregorioRef for syntax. +- `centering-scheme` gabc header, supplanted by `\gresetlyriccentering` in TeX. See GregorioRef for syntax. - `gregoriotex-font` gabc header, supplanted by `\gresetgregoriofont` in TeX. See GregorioRef for syntax. - The meaningless `gabc-version` header in gabc (see [#664](https://github.com/gregorio-project/gregorio/issues/664)). +### Known Bugs +- When there is no manual break, the spacing around bars at the end of a line in the new spacing algorithm is not perfect, this should be visible only in edge cases. If you encounter such a bad spacing, you are advised to force a line break manually. See [#959](https://github.com/gregorio-project/gregorio/issues/959). +- Above lines text does not move to account for high notes which occur in the same place. As a result the two may overlap. You can work around this by changing `abovelinestextraise` but this is a global setting, affecting the entire score. See [#960](https://github.com/gregorio-project/gregorio/issues/960). +- A manual custos in a low note position will not push down the text associated with it, resulting in the two overlapping. See [#961](https://github.com/gregorio-project/gregorio/issues/961). + ## [4.0.1] - 2015-12-28 ### Fixed @@ -361,7 +322,7 @@ See GregorioRef.pdf for full details. - `\setspaceafterinitial`, supplanted by `\grechangedim{afterinitialshift}...` - `\setspacebeforeinitial`, supplanted by `\grechangedim{beforeinitialshift}...` - `\setinitialspacing`, supplanted by `\grechangedim{beforeinitialshift}...`, `\grechangedim{manualinitialwidth}...`, and `\grechangedime{afterinitialshift}...` -- `centering-scheme` gabc header, supplanted by `\grelyriccentering` in TeX. See GregorioRef for syntax. +- `centering-scheme` gabc header, supplanted by `\gresetlyriccentering` in TeX. See GregorioRef for syntax. - `gregoriotex-font` gabc header, supplanted by `\gresetgregoriofont` in TeX. See GregorioRef for syntax. - The meaningless `gabc-version` header in gabc (see [#664](https://github.com/gregorio-project/gregorio/issues/664)). diff --git a/UPGRADE.md b/UPGRADE.md index 725ebff3c..8de1f2c05 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -62,6 +62,8 @@ The spaces around bars are now: - `bar@minima` (both replacing `spacearoundsmallbars`) - `bar@minor` (replacing `spacearoundminor`) - `bar@maior` (replacing `spacearoundmaior`) +- `bar@finalis` (replacing `spacearoundfinalis`) +- `bar@finalifinalis` (replaceing `spacebeforefinalfinalis`) - `bar@dominican` (new) They have variants for the new bar spacing algorithm only: @@ -187,7 +189,7 @@ This would have made the text which was wrapped with `` in your gabc ### Centering scheme -The gabc `centering-scheme` header is now deprecated and will disappear soon. Use the `\grelyriccentering` command from TeX instead. If you were using `centering-scheme: latine;` in gabc, now use `\grelyriccentering{vowel}` in the TeX file that includes the gabc. If you were using `centering-scheme: english;` in gabc, now use `\grelyriccentering{syllable}` in the TeX file that includes the gabc. +The gabc `centering-scheme` header is now deprecated and will disappear soon. Use the `\gresetlyriccentering` command from TeX instead. If you were using `centering-scheme: latine;` in gabc, now use `\gresetlyriccentering{vowel}` in the TeX file that includes the gabc. If you were using `centering-scheme: english;` in gabc, now use `\gresetlyriccentering{syllable}` in the TeX file that includes the gabc. Using the gabc header will, in this release, do that for you, but it will produce a deprecation warning. This header will no longer be available in the next release. diff --git a/configure.ac b/configure.ac index 5706d3729..7dd60b219 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,8 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with Gregorio. If not, see . -AC_INIT([gregorio],[4.1.0-rc2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="4_1_0-rc2" +AC_INIT([gregorio],[4.1.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="4_1_0" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/def_check.sh b/def_check.sh index ff82870e2..073e05026 100755 --- a/def_check.sh +++ b/def_check.sh @@ -30,7 +30,13 @@ sed -i.temp 's:.*OBSOLETE.*::' $TEXFILE sed -i.temp 's:.*DEPRECATED.*::' $TEXFILE #Isolate function names -sed -i.temp 's:.*\(Gre[a-zA-Z]*\).*:\1:' $TEXFILE +sed -i.temp 's:Gre:\ +Gre:g' $TEXFILE +sed -i.temp '/Gre/!d' $TEXFILE +sed -i.temp 's:\(Gre[a-zA-Z]*\).*:\1:' $TEXFILE + +#label file +echo "00 GreMacros Defined in TeX" >> $TEXFILE #alphabetize and remove duplicates sort -u -o$TEXFILE $TEXFILE @@ -38,15 +44,24 @@ sort -u -o$TEXFILE $TEXFILE #Extraction from c code cd ../src/gregoriotex - grep -hE '\\\\Gre.*' gregoriotex-write.c > $CFILE +cd ../gabc +grep -hE '\\\\Gre.*' gabc-notes-determination.l >> $CFILE +grep -hE '\\\\Gre.*' gabc-score-determination.y >> $CFILE + #remove deprecated code sed -i.temp 's:.*OBSOLETE.*::' $CFILE sed -i.temp 's:.*DEPRECATED.*::' $CFILE #Isolate function names -sed -i.temp 's:.*\(Gre[a-zA-Z]*\).*:\1:' $CFILE +sed -i.temp 's:Gre:\ +Gre:g' $CFILE +sed -i.temp '/Gre/!d' $CFILE +sed -i.temp 's:\(Gre[a-zA-Z]*\).*:\1:' $CFILE + +#label file +echo "00 Macros Written by C" >> $CFILE #alphabetize and remove duplicates sort -u -o$CFILE $CFILE diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex index 239734a40..3f0e69929 100644 --- a/doc/Command_Index_User.tex +++ b/doc/Command_Index_User.tex @@ -671,6 +671,10 @@ \subsubsection{Special Characters} \textbf{Nota Bene:} The same rules apply for \#1 as in \verb=\gresetspecial=. +\macroname{\textbackslash gretilde}{}{gregoriotex-main.tex} +Macro to print $\sim$. This macro is set using the above for \texttt{~}. + + \subsubsection{Styling} Different elements of an include score have different styles applied. These elements and their defaults are listed below: @@ -1600,6 +1604,14 @@ \subsubsection*{Bar distances} Same as \texttt{interwordspacetext@bars} for \texttt{euouae} blocks (so quite rare). \end{gdimension} +\begin{gdimension}{interwordspacetext@bars@notext} +Minimum space between texts of adjacent words when they are separated by a bar syllable which has no text associated with it (new bar spacing algorithm only). +\end{gdimension} + +\begin{gdimension}{interwordspacetext@bars@notext@euouae} +Same as \texttt{interwordspacetext@bars@notext} for \texttt{euouae} blocks (so quite rare). +\end{gdimension} + \begin{gdimension}{textbartextspace} Space between the text of previous syllable and the text associated with the bar (old bar spacing algorithm only). \end{gdimension} diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex index 29232012e..76f1b3247 100644 --- a/doc/Command_Index_gregorio.tex +++ b/doc/Command_Index_gregorio.tex @@ -951,9 +951,6 @@ \section{Gregorio Controls} \#9 & Gregorio\TeX\ glyphs & all the notes \end{argtable} -\macroname{\textbackslash GreTilde}{}{gregoriotex-main.tex} -Macro to print $\sim$. - \macroname{\textbackslash GreTranslationCenterEnd}{}{gregoriotex-main.tex} Macro to end the centering of the translation text. @@ -1050,11 +1047,6 @@ \section{Gregorio Controls} \#1 & string & Text to typeset in the translation (at the beginning of a line).\\ \end{argtable} -\macroname{\textbackslash GreZeroHyph}{}{gregoriotex-main.tex} -Macro to typeset a zero-width hyphen (the hyphen is visible, it is only -treated as if it had 0 width when calculating spaces). Used for fine tuning spacing -(especially at line endings). - \macroname{\textbackslash GreForceBreak}{}{gregoriotex-spaces.tex} Macro used to force a line break to occur at a given position. diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex index ebc67b3ab..f965fb6f0 100644 --- a/doc/Command_Index_internal.tex +++ b/doc/Command_Index_internal.tex @@ -1349,6 +1349,11 @@ \subsection{Character Reference Aliases} \macroname{\textbackslash gre@char@normalhyphen}{}{gregoriotex-main.tex} A normal hyphen in the text font. +\macroname{\textbackslash gre@char@zerohyph}{}{gregoriotex-main.tex} +Macro to typeset a zero-width hyphen (the hyphen is visible, it is only +treated as if it had 0 width when calculating spaces). Used for fine tuning spacing +(especially at line endings). + \macroname{\textbackslash gre@char@fuse@debilis}{}{gregoriotex-chars.tex} A fused character consisting of a leading punctum initio debilis (of ambitus one) and a regular punctum. @@ -1593,7 +1598,7 @@ \subsection{Flags} \macroname{\textbackslash ifgre@disablemora}{}{gregoriotex-signs.tex} Boolean to disable the printing of punctum morae. -\macroname{\textbackslash ifgre@disablevepsiema}{}{gregoriotex-signs.tex} +\macroname{\textbackslash ifgre@disablevepisema}{}{gregoriotex-signs.tex} Boolean to disable the printing of vertical episemata. \macroname{\textbackslash ifgre@lastendswithmorasave}{}{gregoriotex-syllable.tex} diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index 98c2f7e53..6382b09c7 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -152,7 +152,7 @@ \vspace{1cm} - \large Version \textbf{4.1.0-rc2}, 25 February 2016 %% PARSE_VERSION_DATE + \large Version \textbf{4.1.0}, 1 March 2016 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index 144181619..d536b99e9 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -78,7 +78,7 @@ 5: 'Five', } -GREGORIO_VERSION = '4.1.0-rc2' +GREGORIO_VERSION = '4.1.0' # The unicode character at which we start our numbering: # U+E000 is the start of the BMP Private Use Area diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj index b3fb2396b..7f2faaa06 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -564,7 +564,7 @@ OVERWRITE_PERMISSIONS VERSION - 4.1.0-rc2 + 4.1.0 UUID 74692645-8112-42EB-8FFC-2CBE2CEDE9FB diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 94cdf21f5..4d159aa5c 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2016/02/25 v4.1.0-rc2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2016/03/01 v4.1.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX % If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts. \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% @@ -38,7 +38,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregorioversion{4.1.0-rc2}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.1.0}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index a92436c6d..4823e9e2e 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -18,7 +18,7 @@ % along with Gregorio. If not, see . \gre@debugmsg{general}{Loading gregoriotex-chars.tex}% -\gre@declarefileversion{gregoriotex-chars.tex}{4.1.0-rc2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{4.1.0}% GREGORIO_VERSION \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}% \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}% diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index d766e8a80..44405b851 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -108,7 +108,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregorioversion{4.1.0-rc2}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.1.0}% GREGORIO_VERSION - VersionManager.py % first some macros to allow checks for version: % Tests that all gregoriotex files are of the same version. @@ -1673,7 +1673,7 @@ %% fonts %%%%%%%%% -\def\GreTilde{% +\def\gretilde{% \ensuremath{\sim}% \relax % }% @@ -1936,7 +1936,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%% % a zero-width hyphen, useful for fine tuning line endings. To input in gabc verb for example. -\def\GreZeroHyph{% +\def\gre@char@zerohyph{% \hbox to 0pt{% \char\the\hyphenchar\font % \hss % @@ -1957,7 +1957,7 @@ \IfStrEq{#1}{normal}% {\global\let\GreHyph\gre@char@normalhyphen}% {\IfStrEq{#1}{zero}% - {\global\let\GreHyph\GreZeroHyph}% + {\global\let\GreHyph\gre@char@zerohyph}% {\gre@error{Unrecognized option for \protect\greseteolhyphen}}% }% }% diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 205fe596a..c98be962e 100644 --- a/tex/gregoriotex-nabc.lua +++ b/tex/gregoriotex-nabc.lua @@ -20,7 +20,7 @@ -- this file contains lua functions used by GregorioTeX St. Gall ancient -- neume support when called with LuaTeX. --- GREGORIO_VERSION 4.1.0-rc2 +-- GREGORIO_VERSION 4.1.0 local gregallaliases = { ["ci~"] = "cl>", diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index da2757c57..b516a27db 100644 --- a/tex/gregoriotex-nabc.tex +++ b/tex/gregoriotex-nabc.tex @@ -20,7 +20,7 @@ % this file contains macros for St. Gall ancient neume support \gre@debugmsg{general}{Loading gregoriotex-nabc.tex}% -\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.0-rc2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.0}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall} diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 0fbbaf963..5887b74af 100644 --- a/tex/gregoriotex-signs.lua +++ b/tex/gregoriotex-signs.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 4.1.0-rc2 +-- GREGORIO_VERSION 4.1.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 511f71044..0a2a76ac2 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -23,7 +23,7 @@ \def\grebarbracewidth{.58879}% \gre@debugmsg{general}{Loading gregoriotex-signs.tex}% -\gre@declarefileversion{gregoriotex-signs.tex}{4.1.0-rc2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{4.1.0}% GREGORIO_VERSION \def\gre@usestylecommon{% \ifgre@usestylefont\else % diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 43cea5a7f..1686cf7c8 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -20,7 +20,7 @@ % this file contains definitions of spaces \gre@debugmsg{general}{Loading gregoriotex-spaces.tex}% -\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.0-rc2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties @@ -1187,6 +1187,34 @@ \gre@debugmsg{spacing}{Changing a dimen.}% \def\gre@prefix{dimen}% \fi% + \IfStrEqCase{#1}{% DEPRECATED + {spacearoundsmallbars}% DEPRECATED + {% DEPRECATED + \gre@deprecated{spacearoundsmallbars}{bar@virgula or bar@minima}% DEPRECATED + \grechangedim{bar@virgula}{#2}{#3}% DEPRECATED + \grechangedim{bar@minima}{#2}{#3}% DEPRECATED + }% DEPRECATED + {spacearoundminor}% DEPRECATED + {% DEPRECATED + \gre@deprecated{spacearoundminor}{bar@minor}% DEPRECATED + \grechangedim{bar@minor}{#2}{#3}% DEPRECATED + }% DEPRECATED + {spacearoundmaior}% DEPRECATED + {% DEPRECATED + \gre@deprecated{spacearoundmaior}{bar@maior}% DEPRECATED + \grechangedim{bar@maior}{#2}{#3}% DEPRECATED + }% DEPRECATED + {spacearoundfinalis}% DEPRECATED + {% DEPRECATED + \gre@deprecated{spacearoundfinalis}{bar@finalis}% DEPRECATED + \grechangedim{bar@finalis}{#2}{#3}% DEPRECATED + }% DEPRECATED + {spacebeforefinalfinalis}% DEPRECATED + {% DEPRECATED + \gre@deprecated{spacebeforfinalfinalis}{bar@finalfinalis}% DEPRECATED + \grechangedime{bar@finalfinalis}{#2}{#3}% DEPRECATED + }% DEPRECATED + }% DEPRECATED \ifcsname gre@space@\gre@prefix @#1\endcsname% \gre@debugmsg{spacing}{It does exist.}% \gre@dimension{#1}{#2}% diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 9bbadc2de..1d0ae0400 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -20,7 +20,7 @@ % this file contains definitions of the glyphs and the syllables \gre@debugmsg{general}{Loading gregoriotex-syllable.tex}% -\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.0-rc2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index d7c6e596b..f36c3a6e9 100644 --- a/tex/gregoriotex-symbols.lua +++ b/tex/gregoriotex-symbols.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 4.1.0-rc2 +-- GREGORIO_VERSION 4.1.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index a64336d2b..6f1ae3181 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -23,7 +23,7 @@ \def\gregoriotex@symbols@loaded{}% \gre@debugmsg{general}{Loading gregoriotex-symbols.tex}% -\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.0-rc2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.0}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% @@ -229,9 +229,9 @@ \gresetspecial{oe}{\oe{}}% \gresetspecial{*}{\GreStar{}}% \gresetspecial{+}{\GreDagger{}}% -\gresetspecial{-}{\GreZeroHyph{}}% +\gresetspecial{-}{\gre@char@zerohyph{}}% \gresetspecial{\string\092}{\textbackslash{}}% \gresetspecial{\string\038}{\&{}}% \gresetspecial{\string\035}{\#{}}% \gresetspecial{\string\095}{\_{}}% -\gresetspecial{\string\126}{\GreTilde{}}% +\gresetspecial{\string\126}{\gretilde{}}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index e8b21b740..95d2274d4 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after, gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '4.1.0-rc2' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '4.1.0' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '4.1.0-rc2', -- GREGORIO_VERSION + version = '4.1.0', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2016/02/25", -- GREGORIO_DATE_LTX + date = "2016/03/01", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2015 - The Gregorio Project", diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index df4ebadc4..51952ecf9 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2016/02/25 v4.1.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2016/03/01 v4.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX % If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away \ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi% diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 17ff3f70e..dbd64cfef 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -21,7 +21,7 @@ % This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does. -% [2016/02/25 v4.1.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2016/03/01 v4.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 00fd5c0e9..beb9e2945 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 4,1,0,22 -PRODUCTVERSION 4,1,0,22 +FILEVERSION 4,1,0,30 +PRODUCTVERSION 4,1,0,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "4.1.0-rc2" + VALUE "FileVersion", "4.1.0" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "4.1.0-rc2" + VALUE "ProductVersion", "4.1.0" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 640155915..fc2966497 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=4.1.0-rc2 +AppVersion=4.1.0 DefaultDirName={pf}\gregorio DefaultGroupName=gregorio SetupIconFile=gregorio.ico @@ -55,9 +55,9 @@ Source: "../README.md"; DestDir: "{app}"; Source: "../CONTRIBUTORS.md"; DestDir: "{app}"; Source: "../UPGRADE.md"; DestDir: "{app}"; ; PARSE_VERSION_FILE_NEXTLINE -Source: "../doc/GregorioRef-4_1_0-rc2.pdf"; DestDir: "{app}"; +Source: "../doc/GregorioRef-4_1_0.pdf"; DestDir: "{app}"; ; PARSE_VERSION_FILE_NEXTLINE -Source: "../doc/GregorioNabcRef-4_1_0-rc2.pdf"; DestDir: "{app}"; +Source: "../doc/GregorioNabcRef-4_1_0.pdf"; DestDir: "{app}"; Source: "../COPYING.md"; DestDir: "{app}"; Source: "../contrib/system-setup.bat"; DestDir: "{app}"; Source: "../contrib/*"; DestDir: "{app}\contrib"; Excludes: "Makefile*,TeXShop\*,*.command";