Merge pull request #727 from henryso/fix-724

Added oriscus cavum glyphs.
gregorio-project · Dec 25, 2015 · f2d7128 · f2d7128
2 parents 81552d0 + 2ec74e2
commit f2d7128
Show file tree

Hide file tree

Showing 14 changed files with 730 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - 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)).
+- Hollow version of the oriscus, called by adding the `r` modifier to an oriscus, as in `gor` or `gor<` (See [#724](https://github.com/gregorio-project/gregorio/issues/724)).
 
 ### Deprecated
 - `initial-style` gabc header, supplanted by the `\gresetinitiallines` TeX command.

diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex
@@ -525,6 +525,42 @@ \section{Gregorio Controls}
   \#1 & integer & Height number of the custos.\\
 \end{argtable}
 
+\macroname{\textbackslash GreOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset an oriscus cavum (the oriscus points at a higher note).
+
+\begin{argtable}
+  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+  \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GreOriscusCavumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a reverse oriscus cavum (the oriscus points at a lower note).
+
+\begin{argtable}
+  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+  \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GreOriscusCavumDeminutus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a reverse oriscus cavum with a deminutus tail.
+
+\begin{argtable}
+  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+  \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
 \macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro to typeset a round brace above the lines.
 

diff --git a/doc/GregorioRef.lua b/doc/GregorioRef.lua
@@ -83,6 +83,12 @@ local GABC = {
   Natural = [[gy]],
   NaturalHole = [[\excluded{gy}]],
   Oriscus = [[go]],
+  OriscusCavum = [[gor]],
+  OriscusCavumDeminutus = [[gor\~{}]],
+  OriscusCavumDeminutusHole = [[\excluded{gor\~{}}]],
+  OriscusCavumHole = [[\excluded{gor}]],
+  OriscusCavumReversus = [[gor>]],
+  OriscusCavumReversusHole = [[\excluded{gor>}]],
   OriscusLineBL = [[\excluded{e}@go]],
   OriscusReversus = [[go^^^^003c]],
   OriscusReversusLineTL = [[\excluded{i}@go]],
@@ -202,6 +208,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
 
   local function index_font(csname, variants, common)
     local glyphs = font.fonts[font.id(csname)].resources.unicodes
+    -- force-load the code points of the font --
+    local ignored = glyphs['___magic___']
     local glyph, cp
     for glyph, cp in pairs(glyphs) do
       if cp >= 0xe000 and not EXCLUDE[glyph] and not glyph:match('^HEpisema') then
@@ -302,7 +310,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
     if b then
       table.insert(glyph_names, { a, b, c, d, e })
     else
-      tex.error('Unable to parse '..name)
+      -- if parse fails, just use the name
+      table.insert(glyph_names, { '', name, '', '', '' })
     end
   end
   local function compare(x, y)

diff --git a/fonts/greciliae-base.sfd b/fonts/greciliae-base.sfd
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1176402534
-ModificationTime: 1450840039
+ModificationTime: 1450990984
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -43,7 +43,7 @@ NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 112 16 4
+WinInfo: 144 16 4
 BeginPrivate: 0
 EndPrivate
 Grid
@@ -71,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: 379 164
+BeginChars: 379 170
 
 StartChar: Punctum
 Encoding: 0 -1 0
@@ -4134,5 +4134,167 @@ SplineSet
  166 13 l 2x70
 EndSplineSet
 EndChar
+
+StartChar: OriscusCavum
+Encoding: 164 -1 164
+Width: 166
+VWidth: 2537
+Flags: W
+HStem: -55.3496 245.7
+VStem: -0.200195 20.7578<16.3018 143.132> 145.441 20.759<-8.87925 119.649>
+LayerCount: 2
+Fore
+SplineSet
+105.722 120.649 m 4
+ 90.5117 125.856 63.46 141.447 46.9775 146.04 c 4
+ 29.6621 150.865 20.5576 136.966 20.5576 107.989 c 6
+ 20.5576 16.3018 l 5
+ 29.1074 21.0879 40.1895 21.8984 60.2783 15.3281 c 4
+ 76.5156 10.0166 103.485 -6.95801 119.022 -11.04 c 4
+ 142.067 -17.0947 145.44 7.10742 145.441 27.0098 c 6
+ 145.441 119.649 l 5
+ 136.892 116.433 125.398 113.913 105.722 120.649 c 4
+127.2 139.65 m 0
+ 156.411 139.65 166.2 164.545 166.2 190.35 c 1
+ 166.2 13.5498 l 2
+ 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
+ 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
+ 9.08496 -3.34961 -0.200195 -29.9844 -0.200195 -55.3496 c 1
+ -0.200195 121.45 l 2
+ -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0
+ 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
+EndSplineSet
+EndChar
+
+StartChar: OriscusCavumHole
+Encoding: 165 -1 165
+Width: 166
+VWidth: 2537
+Flags: W
+HStem: -11.04 157.08
+VStem: 20.5576 124.883<20.3702 115.738>
+LayerCount: 2
+Fore
+SplineSet
+105.722 120.649 m 4
+ 125.398 113.913 136.892 116.433 145.441 119.649 c 5
+ 145.441 27.0098 l 6
+ 145.44 7.10742 142.067 -17.0947 119.022 -11.04 c 4
+ 103.485 -6.95801 76.5156 10.0166 60.2783 15.3281 c 4
+ 40.1895 21.8984 29.1074 21.0879 20.5576 16.3018 c 5
+ 20.5576 107.989 l 6
+ 20.5576 136.966 29.6621 150.865 46.9775 146.04 c 4
+ 63.46 141.447 90.5117 125.856 105.722 120.649 c 4
+EndSplineSet
+EndChar
+
+StartChar: OriscusCavumReversus
+Encoding: 166 -1 166
+Width: 166
+VWidth: 2537
+Flags: W
+HStem: -55.3496 245.699
+VStem: -0.200195 20.7588<-8.87926 119.649> 145.442 20.7578<16.3018 143.132>
+LayerCount: 2
+Fore
+SplineSet
+60.2783 120.649 m 4
+ 40.6016 113.913 29.1084 116.433 20.5586 119.649 c 5
+ 20.5586 27.0098 l 6
+ 20.5596 7.10742 23.9326 -17.0947 46.9775 -11.04 c 4
+ 62.5146 -6.95801 89.4844 10.0166 105.722 15.3281 c 4
+ 125.811 21.8984 136.893 21.0879 145.442 16.3018 c 5
+ 145.442 107.989 l 6
+ 145.442 136.966 136.338 150.865 119.022 146.04 c 4
+ 102.54 141.447 75.4883 125.856 60.2783 120.649 c 4
+38.7998 139.65 m 0
+ 59.8818 139.65 104.721 172.15 127.2 172.15 c 0
+ 150.6 172.15 166.2 160.06 166.2 121.45 c 2
+ 166.2 -55.3496 l 1
+ 166.2 -29.9844 156.915 -3.34961 127.2 -3.34961 c 0
+ 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
+ 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2
+ -0.200195 190.35 l 1
+ -0.200195 164.545 9.58887 139.65 38.7998 139.65 c 0
+EndSplineSet
+EndChar
+
+StartChar: OriscusCavumReversusHole
+Encoding: 167 -1 167
+Width: 166
+VWidth: 2537
+Flags: W
+HStem: -11.04 157.08
+VStem: 20.5576 124.884<20.3702 115.738>
+LayerCount: 2
+Fore
+SplineSet
+60.2773 120.649 m 4
+ 75.4873 125.856 102.539 141.447 119.021 146.04 c 4
+ 136.337 150.865 145.441 136.966 145.441 107.989 c 6
+ 145.441 16.3018 l 5
+ 136.892 21.0879 125.81 21.8984 105.721 15.3281 c 4
+ 89.4834 10.0166 62.5137 -6.95801 46.9766 -11.04 c 4
+ 23.9316 -17.0947 20.5586 7.10742 20.5576 27.0098 c 6
+ 20.5576 119.649 l 5
+ 29.1074 116.433 40.6006 113.913 60.2773 120.649 c 4
+EndSplineSet
+EndChar
+
+StartChar: OriscusCavumDeminutus
+Encoding: 168 -1 168
+Width: 168
+VWidth: 2612
+Flags: W
+HStem: -30.1504 176.8<5.64289 68.2563>
+VStem: 0 21.5576<-0.825308 124.774> 146.441 21.559<26.151 151.025>
+LayerCount: 2
+Fore
+SplineSet
+61.2773 125.774 m 4
+ 41.6006 119.038 30.1084 121.558 21.5576 124.774 c 5
+ 21.5576 36.8848 l 6
+ 21.5576 16.9824 23.4092 -10.4072 48.9268 -3.06543 c 4
+ 64.6211 1.4502 101.103 22.1982 117.171 28.0029 c 4
+ 135.359 34.5732 138.842 30.8633 144.542 24.2266 c 5
+ 145.513 28.6934 146.444 31.9248 146.441 42.8428 c 5
+ 146.441 113.114 l 6
+ 146.441 142.091 139.909 159.746 119.071 153.065 c 4
+ 102.512 147.757 76.4873 130.981 61.2773 125.774 c 4
+116.5 -61.5 m 1
+ 116.5 -61.5 145.949 3.65039 128.2 3.65039 c 1
+ 99.4707 3.65039 66.3203 -30.1504 39.7998 -30.1504 c 0
+ 8.59961 -30.1504 0 -6.01953 0 20.5 c 2
+ 0 197 l 1
+ 0 174.771 8.59961 146.65 39.7998 146.65 c 0
+ 70.1924 146.65 97.5713 179.15 128.2 179.15 c 0
+ 151.6 179.15 168 166.609 168 128 c 2
+ 168 37 l 1
+ 168 -43 116.5 -61.5 116.5 -61.5 c 1
+EndSplineSet
+EndChar
+
+StartChar: OriscusCavumDeminutusHole
+Encoding: 169 -1 169
+Width: 168
+VWidth: 2612
+Flags: W
+HStem: -3.06543 156.13
+VStem: 21.5576 124.883<31.1246 120.955>
+LayerCount: 2
+Fore
+SplineSet
+61.2773 125.774 m 4
+ 76.4873 130.981 102.512 147.757 119.071 153.065 c 4
+ 139.909 159.746 146.441 142.091 146.441 113.114 c 6
+ 146.441 42.8428 l 5
+ 146.444 31.9248 145.513 28.6934 144.542 24.2266 c 5
+ 138.842 30.8633 135.359 34.5732 117.171 28.0029 c 4
+ 101.103 22.1982 64.6211 1.4502 48.9268 -3.06543 c 4
+ 23.4092 -10.4072 21.5576 16.9824 21.5576 36.8848 c 6
+ 21.5576 124.774 l 5
+ 30.1084 121.558 41.6006 119.038 61.2773 125.774 c 4
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont