Merged release-4.2 into develop.

.gregorio-version

@@ -1,4 +1,4 @@
-4.2.0-rc1
+4.2.0-rc2
 
 *** Do not modify this file. ***
 Use VersionManager.py to change the version.

CHANGELOG.md

@@ -13,6 +13,11 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 
 [Unreleased][unreleased]
 ### Fixed
+- When the note after an oriscus is at the same pitch, the oriscus will now point downwards by default (see [#1177](https://github.com/gregorio-project/gregorio/issues/1177)).
+
+
+## [4.2.0-rc2] - 2016-07-05
+### Fixed
 - A two-line initial on a two-line score no longer generates an error (see [#1139](https://github.com/gregorio-project/gregorio/issues/1139)).
 - Staff lines after a two-line initial should now be sized correctly in a more consistent way (see [#1141](https://github.com/gregorio-project/gregorio/issues/1141)).
 - Space at the end of line was not always correct when a line is cut in the middle of a word (see [#1155](https://github.com/gregorio-project/gregorio/issues/1155)).
@@ -27,7 +32,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - When the clef and the first note are at a reasonable vertical distance, `shortspaceafterlineclef` is used instead of `spaceafterlineclef` (make them equal if you don't want this feature). This is used only on the first line, when there is an initial on one line. See [#1138](https://github.com/gregorio-project/gregorio/issues/1138).
 - When an alteration follows a bar, it is not completely taken into consideration in the new bar spacing algorithm (similarly to the punctum mora), this behavior can be tuned with the newly introduced space `alterationadjustmentbar`. See [#1146](https://github.com/gregorio-project/gregorio/issues/1146).
 - Very small improvement in the design of the porrectus auctus and torculus resupinus auctus (see [#1169](https://github.com/gregorio-project/gregorio/issues/1169)).
-- When the notes around a virgula or divisio minima are lower than two spaces below the top staff line, the spaces used are new shorter spaces with a `@short` prefix. To cancel this feature, make them the same as their normal version. See [#1144](https://github.com/gregorio-project/gregorio/issues/1144).
+- When the notes around a virgula or divisio minima are lower than two spaces below the top staff line, the spaces used are new shorter spaces with a `@short` suffix. To cancel this feature, make them the same as their normal version. See [#1144](https://github.com/gregorio-project/gregorio/issues/1144).
 
 ## [4.2.0-rc1] - 2016-05-31
 ### Fixed

UPGRADE.md

@@ -14,7 +14,11 @@ The gregorio and granapadano fonts, as well as their "-op" Dominican variants, w
 
 ### Stemmed oriscus flexus orientation
 
-As of version 4.2, the orientation of the stemmed oriscus flexus `(gOe)` is consistent with the unstemmed oriscus flexus `(goe)` in that the oriscus points downward (since the note which follows is of lower pitch).  If you prefer the oriscus to point upward, you will need to use the `1` modifier (as in `(gO1e)`), which will force an upward orientation of the oriscus.
+As of version 4.2, the orientation of the stemmed oriscus flexus `(gOe)` is consistent with the unstemmed oriscus flexus `(goe)` in that the oriscus points downwards (since the note which follows is of lower pitch).  If you prefer the oriscus to point upwards, you will need to use the `1` modifier (as in `(gO1e)`), which will force an upward orientation of the oriscus.
+
+### Oriscus orientation at the unision
+
+As of version 4.2, when the note after the oriscus is at the same pitch as the oriscus, the oriscus will point downwards by default.  If you prefer it to point upwards, append the `1` modifier to force the upward orientation.
 
 ### Podatus followed by a virga
 

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 <http://www.gnu.org/licenses/>.
 
-AC_INIT([gregorio],[4.2.0-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="4_2_0-rc1"
+AC_INIT([gregorio],[4.2.0-rc2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="4_2_0-rc2"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""
@@ -38,6 +38,8 @@ AC_PROG_YACC
 AC_CHECK_TOOL([RC], [windres], [no])
 AM_CONDITIONAL([HAVE_RC], [test x$RC != xno])
 
+AC_CHECK_ALIGNOF(uint32_t)
+
 AX_CHECK_COMPILE_FLAG([-std=gnu89], [CFLAGS+=" -std=gnu89"])
 dnl until flex gets their act together, use pedantic instead of pedantic-errors
 AX_CHECK_COMPILE_FLAG([-pedantic], [CFLAGS+=" -pedantic"])

doc/GregorioRef.tex

@@ -159,7 +159,7 @@
 
     \vspace{1cm}
 
-    \large Version \textbf{4.2.0-rc1}, 31 May 2016 %% PARSE_VERSION_DATE
+    \large Version \textbf{4.2.0-rc2}, 5 July 2016 %% PARSE_VERSION_DATE
 
     \vspace{1.5cm}
   \end{center}

fonts/squarize.py

@@ -90,7 +90,7 @@
     14 : 'Fourteen',
 }
 
-GREGORIO_VERSION = '4.2.0-rc1'
+GREGORIO_VERSION = '4.2.0-rc2'
 
 # The unicode character at which we start our numbering:
 # U+E000 is the start of the BMP Private Use Area

macosx/Gregorio.pkgproj

@@ -564,7 +564,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>4.2.0-rc1</string><!--GREGORIO_VERSION-->
+				<string>4.2.0-rc2</string><!--GREGORIO_VERSION-->
 			</dict>
 			<key>UUID</key>
 			<string>74692645-8112-42EB-8FFC-2CBE2CEDE9FB</string>

src/gabc/gabc-score-determination.c

@@ -165,7 +165,8 @@ static void oriscus_orientation_visit(
      * via oriscus */
 
     if (oriscus) {
-        if (note->u.note.pitch < oriscus->u.note.pitch) {
+        if (note->u.note.pitch <= oriscus->u.note.pitch) {
+            /* descending or unison */
             switch(oriscus->u.note.shape) {
             case S_ORISCUS_UNDETERMINED:
                 oriscus->u.note.shape = S_ORISCUS_DESCENDENS;
@@ -181,7 +182,7 @@ static void oriscus_orientation_visit(
                 break;
                 /* LCOV_EXCL_STOP */
             }
-        } else { /* ascending or the same */
+        } else { /* ascending */
             switch(oriscus->u.note.shape) {
             case S_ORISCUS_UNDETERMINED:
                 oriscus->u.note.shape = S_ORISCUS_ASCENDENS;

src/sha1.c

@@ -37,15 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_STDALIGN_H
-#include <stdalign.h>
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wc11-extensions"
-#endif
-#else
-#define alignof(x) sizeof(x)
-#endif
-
 #ifdef WORDS_BIGENDIAN
 #define SWAP(n) (n)
 #else
@@ -167,7 +158,7 @@ void sha1_process_bytes(const void *buffer, size_t len, struct sha1_ctx *ctx)
     if (len >= 64) {
         /* architecture and data-specific; LCOV_EXCL_START */
 #if !_STRING_ARCH_unaligned
-#define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0)
+#define UNALIGNED_P(p) ((uintptr_t) (p) % ALIGNOF_UINT32_T != 0)
         if (UNALIGNED_P(buffer)) {
             while (len > 64) {
                 sha1_process_block(memcpy(ctx->buffer, buffer, 64), 64, ctx);

tex/gregoriosyms.sty

@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gregoriosyms}
-    [2016/05/31 v4.2.0-rc1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+    [2016/07/05 v4.2.0-rc2 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%
@@ -39,7 +39,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.2.0-rc1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.2.0-rc2}% GREGORIO_VERSION - VersionManager.py
 
 \providecommand{\gre@declarefileversion}[2]{\relax}
 

tex/gregoriotex-chars.tex

@@ -18,7 +18,7 @@
 % along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
 \gre@debugmsg{general}{Loading gregoriotex-chars.tex}%
-\gre@declarefileversion{gregoriotex-chars.tex}{4.2.0-rc1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{4.2.0-rc2}% GREGORIO_VERSION
 
 \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
 \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%

tex/gregoriotex-main.tex

@@ -159,7 +159,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.2.0-rc1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.2.0-rc2}% GREGORIO_VERSION - VersionManager.py
 
 % first some macros to allow checks for version:
 % Tests that all gregoriotex files are of the same version.

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.2.0-rc1
+-- GREGORIO_VERSION 4.2.0-rc2
 
 local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
 

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.2.0-rc1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{4.2.0-rc2}% GREGORIO_VERSION
 
 
 \xdef\gre@nabcfontname{gregall}%

tex/gregoriotex-signs.lua

@@ -19,7 +19,7 @@
 
 -- this file contains lua functions to support signs used by GregorioTeX.
 
--- GREGORIO_VERSION 4.2.0-rc1
+-- GREGORIO_VERSION 4.2.0-rc2
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn

tex/gregoriotex-signs.tex

@@ -23,7 +23,7 @@
 \def\grebarbracewidth{.58879}%
 
 \gre@debugmsg{general}{Loading gregoriotex-signs.tex}%
-\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0-rc1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0-rc2}% GREGORIO_VERSION
 
 \def\gre@usestylecommon{%
   \ifgre@usestylefont\else %

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.2.0-rc1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{4.2.0-rc2}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for tuning penalties

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.2.0-rc1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{4.2.0-rc2}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for the typesetting of the different glyphs

tex/gregoriotex-symbols.lua

@@ -19,7 +19,7 @@
 
 -- this file contains lua functions to support signs used by GregorioTeX.
 
--- GREGORIO_VERSION 4.2.0-rc1
+-- GREGORIO_VERSION 4.2.0-rc2
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn

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.2.0-rc1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0-rc2}% GREGORIO_VERSION
 
 \RequireLuaModule{gregoriotex}%
 

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.2.0-rc1' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '4.2.0-rc2' -- GREGORIO_VERSION (comment used by VersionManager.py)
 
 local err, warn, info, log = luatexbase.provides_module({
     name               = "gregoriotex",
-    version            = '4.2.0-rc1', -- GREGORIO_VERSION
+    version            = '4.2.0-rc2', -- GREGORIO_VERSION
     greinternalversion = internalversion,
-    date               = "2016/05/31", -- GREGORIO_DATE_LTX
+    date               = "2016/07/05", -- GREGORIO_DATE_LTX
     description        = "GregorioTeX module.",
     author             = "The Gregorio Project (see CONTRIBUTORS.md)",
     copyright          = "2008-2016 - The Gregorio Project",

tex/gregoriotex.sty

@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{gregoriotex}%
-    [2016/05/31 v4.2.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+    [2016/07/05 v4.2.0-rc2 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%

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/05/31 v4.2.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% 		[2016/07/05 v4.2.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 
 \edef\greoldcatcode{\the\catcode`@}

windows/gregorio-resources.rc

@@ -1,20 +1,20 @@
 IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
 1 VERSIONINFO
-FILEVERSION     4,2,0,21
-PRODUCTVERSION  4,2,0,21
+FILEVERSION     4,2,0,22
+PRODUCTVERSION  4,2,0,22
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "CompanyName", "Gregorio project"
       VALUE "FileDescription", "Gregorio"
-      VALUE "FileVersion", "4.2.0-rc1"
+      VALUE "FileVersion", "4.2.0-rc2"
       VALUE "InternalName", "gregorio"
       VALUE "LegalCopyright", "See COPYING in the installation directory."
       VALUE "OriginalFilename", "gregorio.exe"
       VALUE "ProductName", "Gregorio"
-      VALUE "ProductVersion", "4.2.0-rc1"
+      VALUE "ProductVersion", "4.2.0-rc2"
     END
   END
 

windows/gregorio.iss

@@ -1,6 +1,6 @@
 [Setup]
 AppName=gregorio
-AppVersion=4.2.0-rc1
+AppVersion=4.2.0-rc2
 DefaultDirName={pf}\gregorio
 DefaultGroupName=gregorio
 SetupIconFile=gregorio.ico