Merge pull request gregorio-project#1428 from henryso/fix-1425

Added a "standing" punctum inclinatum shape.

CHANGELOG.md

@@ -7,7 +7,8 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - `latin` is now supported as a valid language name.  This brings Latin into line with other languages where both titlecased and lowercased version of the language name (e.g. `English` and `english`) are both allowed.
 
 ### Added
-- Add support for two and three letter language codes for supported languages. I used [this list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for list of codes (and language names).  No new languages are supported as a result of this change, just different ways of specifying the existing names.
+- Added support for two and three letter language codes for supported languages. [This list of codes](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) (and language names) was used for this support.  No new languages are supported as a result of this change, just different ways of specifying the existing names.
+- A non-rotated diamond-shaped variant of the punctum inclinatum.  Append a `2` in gabc to the capitalized note pitch letter to force gregorio to use this shape.  Otherwise, gregorio will try to use it when a string of these notes is at the unison within a syllable.  See [#1425](https://github.com/gregorio-project/gregorio/issues/1425).
 
 
 ## [Unreleased][CTAN]

UPGRADE.md

@@ -2,6 +2,10 @@
 
 This file contains instructions to upgrade to a new release of Gregorio.  These instructions are cumulative; meaning that you should apply the instructions from all versions between the one you are upgrading from and the current version.
 
+## Unreleased
+
+Gregorio will now use an "upright" punctum inclinatum shape for a series of unison punctum inclinatum notes over a given syllable.  When there is a single punctum inclinatum, Gregorio will use a heuristic to choose a shape.  In any of these cases, if the result is not satisfactory, especially in context with nearby syllables, you may select a different shape by using `0` (for the descending shape) or `1` (for the ascending shape) after the capitalized letter indicating the punctum inclinatum.  Forced selection of the upright shape is also possible by using `2` after the capitalized letter indicating the punctum inclinatum.
+
 ## 5.1
 
 No additional steps are needed to upgrade from 5.0 to 5.1.

configure.ac

@@ -52,6 +52,7 @@ AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS+=" -Wstrict-prototypes"])
 AX_CHECK_COMPILE_FLAG([-Wdeclaration-after-statement], [CFLAGS+=" -Wdeclaration-after-statement"])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS+=" -Wall"])
 AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS+=" -Wextra"])
+AX_CHECK_COMPILE_FLAG([-Wno-gnu-statement-expression], [CFLAGS+=" -Wno-gnu-statement-expression"])
 AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS+=" -Wl,-z,relro"])
 AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS+=" -Wl,-z,now"])
 AX_CHECK_LINK_FLAG([-fPIE], [LDFLAGS+=" -fPIE"])

contrib/gabc.vim

@@ -11,11 +11,11 @@ syn match gabcAttributeName /^[^:]*:/
 syn match gabcAttributeEnd ";"
 syn match gabcNoteError "." contained
 syn match gabcBasicNote "[a-np]" contained
-syn match gabcBasicNote "[A-NP][01]\?" contained
-syn match gabcAlteration "[\<\>~xy#vVwWqQR\-Ss\.+]" contained
-syn match gabcAlteration "_[0-5]*" contained
-syn match gabcAlteration "[oO'\.][01]\?" contained
-syn match gabcAlteration "r[0-8]\?" contained
+syn match gabcBasicNote "[A-NP][012]\?" contained
+syn match gabcNoteShape "[\<\>~xy#vVwWqQR\-Ss\.+]" contained
+syn match gabcNoteShape "_[0-5]*" contained
+syn match gabcNoteShape "[oO'\.][01]\?" contained
+syn match gabcNoteShape "r[0-8]\?" contained
 syn match gabcClef "[cf]b\?[1-5]" contained
 syn match gabcTextMarkup "</\?e>" contained
 syn match gabcTextMarkup "</\?b>" contained
@@ -51,7 +51,7 @@ syn region gabcSpecial matchgroup=gabcTextMarkup start="<sp>" end="</sp>"
 syn region gabcVerbatim matchgroup=gabcTextMarkup start="<v>" end="</v>"
             \ contained
 syn region gabcNabc matchgroup=gabcNabcCut start="|" end="[|)]" keepend
-syn cluster gabcFusible contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace,
+syn cluster gabcFusible contains=gabcBasicNote,gabcNoteShape,gabcBar,gabcSpace,
             \gabcComment,gabcCommand,gabcNoteError,gabcFuse,
             \gabcTextOrNoteMarkup,gabcClef,gabcNabc,gabcBracket
 syn region gabcFuseGroup matchGroup=gabcFuseGroup start="@\[" end="\]"
@@ -79,7 +79,7 @@ hi def link gabcVerbatim            Constant
 hi def link gabcAlt                 Constant
 hi def link gabcClef                Statement
 hi def link gabcBasicNote           Statement
-hi def link gabcAlteration          PreProc
+hi def link gabcNoteShape           PreProc
 hi def link gabcCommand             Type
 hi def link gabcBar                 Special
 hi def link gabcSpace               Special

doc/Gabc.tex

@@ -456,8 +456,9 @@ \subsubsection{One-Note Neumes}
   \pitchchar & punctum quadratum \\
   \Pitchchar{} & punctum inclinatum (automatic leaning based on surrounding
                  pitches) \\
-  \Pitchchar0 & left-leaning punctum inclinatum \\
-  \Pitchchar1 & right-leaning punctum inclinatum \\
+  \Pitchchar0 & left-leaning (descending) punctum inclinatum \\
+  \Pitchchar1 & right-leaning (ascending) punctum inclinatum \\
+  \Pitchchar2 & non-leaning (unison) punctum inclinatum \\
   \pitchchar\texttt{o} & oriscus \\
   \pitchchar\texttt{w} & quilisma \\
   \pitchchar\texttt{v} & virga (stem on right) \\

fonts/granapadano-base.sfd

@@ -19,7 +19,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1176402534
-ModificationTime: 1502068966
+ModificationTime: 1532090737
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -42,7 +42,7 @@ NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 0
-WinInfo: 144 16 4
+WinInfo: 160 16 4
 BeginPrivate: 0
 EndPrivate
 Grid
@@ -58,7 +58,7 @@ Grid
  22 -700 l 0
 EndSplineSet
 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 207 207
+BeginChars: 209 209
 
 StartChar: Accentus
 Encoding: 0 -1 0
@@ -4897,5 +4897,53 @@ SplineSet
  122.5 1244 152.337 1216.68 152.337 1183.33 c 1
 EndSplineSet
 EndChar
+
+StartChar: StansPunctumInclinatum
+Encoding: 207 -1 207
+Width: 178
+Flags: HW
+HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1
+LayerCount: 2
+Fore
+SplineSet
+2.66895 64.7109 m 2
+ 1.52832 66.9912 0.387695 70.4111 0.388672 72.6914 c 0
+ 0.388672 74.9717 1.52734 78.3916 2.66895 80.6719 c 2
+ 77.9082 193.53 l 2
+ 80.1885 198.092 84.749 200.371 89.3076 200.37 c 0
+ 93.8682 200.371 98.4287 198.092 101.849 193.53 c 2
+ 175.72 80.5508 l 1
+ 178 78.2705 178 74.8506 178 72.5703 c 0
+ 177.999 70.29 178.202 66.8701 175.921 64.5898 c 1
+ 101.848 -48.1484 l 2
+ 98.4277 -52.709 93.8682 -54.9883 89.3086 -54.9883 c 0
+ 84.748 -54.9883 80.1885 -52.71 77.9082 -48.1484 c 2
+ 2.66895 64.7109 l 2
+EndSplineSet
+EndChar
+
+StartChar: StansPunctumInclinatum#Cavum
+Encoding: 208 -1 208
+Width: 178
+Flags: HW
+HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1
+LayerCount: 2
+Fore
+SplineSet
+28.6279 67.1055 m 2
+ 27.8301 68.7021 27.0312 71.0957 27.0322 72.6924 c 0
+ 27.0322 74.2891 27.8291 76.6826 28.6279 78.2793 c 2
+ 81.2949 157.279 l 2
+ 82.8906 160.472 86.084 162.068 89.2754 162.067 c 0
+ 92.4668 162.068 95.6602 160.473 98.0537 157.279 c 2
+ 149.763 78.1943 l 1
+ 151.36 76.5977 151.359 74.2041 151.359 72.6074 c 0
+ 151.359 71.0107 151.501 68.6172 149.904 67.0215 c 1
+ 98.0537 -11.8955 l 2
+ 95.6592 -15.0879 92.4678 -16.6836 89.2754 -16.6836 c 0
+ 86.084 -16.6836 82.8916 -15.0879 81.2949 -11.8955 c 2
+ 28.6279 67.1055 l 2
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont

fonts/greciliae-base.sfd

@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1176402534
-ModificationTime: 1518881819
+ModificationTime: 1531856498
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -43,10 +43,14 @@ NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 0
-WinInfo: 182 13 6
+WinInfo: 195 13 6
 BeginPrivate: 0
 EndPrivate
 Grid
+-1000 67.5576 m 0
+ 2000 67.5576 l 0
+93.3101 1300 m 0
+ 93.3101 -700 l 0
 -1000 159 m 0
  2000 159 l 0
 -1000 194 m 0
@@ -67,7 +71,7 @@ Grid
  17.75 -700 l 0
 EndSplineSet
 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 259 259
+BeginChars: 261 261
 
 StartChar: Accentus
 Encoding: 0 -1 0
@@ -6162,5 +6166,41 @@ SplineSet
  1.34961 1198.28 -6.4502 1207.82 -6.4502 1225.15 c 4
 EndSplineSet
 EndChar
+
+StartChar: StansPunctumInclinatum
+Encoding: 259 -1 259
+Width: 185
+VWidth: 2612
+Flags: HW
+HStem: -59.373 255.694
+VStem: -0.0930023 185.306
+LayerCount: 2
+Fore
+SplineSet
+185.568 68 m 1
+ 93 -59.918 l 1
+ -0.31543 68 l 1
+ 93 196.93 l 1
+ 185.568 68 l 1
+EndSplineSet
+EndChar
+
+StartChar: StansPunctumInclinatum#Cavum
+Encoding: 260 -1 260
+Width: 185
+VWidth: 2612
+Flags: HW
+HStem: -21.0186 178.986
+VStem: 27.7031 129.714
+LayerCount: 2
+Fore
+SplineSet
+157.664 68 m 5
+ 93 -21.3965 l 1
+ 27.5449 68 l 5
+ 93 158.397 l 1
+ 157.664 68 l 5
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont

fonts/gregorio-base.sfd

@@ -19,7 +19,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1176402534
-ModificationTime: 1511565160
+ModificationTime: 1532022663
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -42,7 +42,7 @@ NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 0
-WinInfo: 0 32 8
+WinInfo: 200 8 2
 BeginPrivate: 0
 EndPrivate
 Grid
@@ -56,7 +56,7 @@ Grid
  22 -700 l 0
 EndSplineSet
 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 214 214
+BeginChars: 216 216
 
 StartChar: Accentus
 Encoding: 0 -1 0
@@ -4786,5 +4786,39 @@ SplineSet
  122.5 1244 152 1216.68 152 1183.33 c 1
 EndSplineSet
 EndChar
+
+StartChar: StansPunctumInclinatum
+Encoding: 214 -1 214
+Width: 164
+VWidth: 2048
+Flags: HW
+HStem: -409 15 -94 15 221 15 536 15
+LayerCount: 2
+Fore
+SplineSet
+80 192.069 m 1
+ 163.485 83 l 1
+ 80 -33.6953 l 1
+ 57.1689 4.03223 -0.65918 83 -0.65918 83 c 1
+ 80 192.069 l 1
+EndSplineSet
+EndChar
+
+StartChar: StansPunctumInclinatum#Cavum
+Encoding: 215 -1 215
+Width: 164
+VWidth: 2048
+Flags: HW
+HStem: -409 15 -94 15 221 15 536 15
+LayerCount: 2
+Fore
+SplineSet
+81 158.243 m 1
+ 138.974 82 l 1
+ 81 0.208008 l 1
+ 65.0195 26.6172 24.0723 82 24.0723 82 c 1
+ 81 158.243 l 1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont

fonts/squarize.py

@@ -286,6 +286,7 @@ def precise_message(glyph_name):
     'Punctum' : True,
     'AscendensPunctumInclinatum' : True,
     'DescendensPunctumInclinatum' : True,
+    'StansPunctumInclinatum' : True,
     'Stropha' : True,
     'StrophaAucta' : True,
     'StrophaAuctaLongtail' : True,