Added oriscus cavum glyphs.

Fixes gregorio-project#724.
henryso · Dec 23, 2015 · 066e16c · 066e16c
1 parent 6a067b8
commit 066e16c
Show file tree

Hide file tree

Showing 14 changed files with 730 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,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: 1450887026
 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 17.4717<10.4492 144.413> 148.728 17.4725<-10.8255 125.552>
+LayerCount: 2
+Fore
+SplineSet
+106.918 124.499 m 0
+ 90.9072 129.98 62.4314 145.339 45.082 150.174 c 0
+ 26.8549 155.253 17.2715 140.622 17.2715 110.12 c 2
+ 17.2715 10.4492 l 1
+ 26.2715 15.4873 37.9365 18.4453 59.082 11.5293 c 0
+ 76.1748 5.93848 104.564 -10.8773 120.918 -15.1738 c 0
+ 145.176 -21.5469 148.728 3.92871 148.728 24.8789 c 2
+ 148.728 125.552 l 1
+ 139.728 122.166 127.63 117.408 106.918 124.499 c 0
+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: -15.1738 165.348
+VStem: 17.2715 131.456<15.8732 120.807>
+LayerCount: 2
+Fore
+SplineSet
+106.918 124.499 m 0
+ 127.63 117.408 139.728 122.166 148.728 125.552 c 1
+ 148.728 24.8789 l 2
+ 148.728 3.92871 145.176 -21.5469 120.918 -15.1738 c 0
+ 104.564 -10.8773 76.1748 5.93848 59.082 11.5293 c 0
+ 37.9365 18.4453 26.2715 15.4873 17.2715 10.4492 c 1
+ 17.2715 110.12 l 2
+ 17.2715 140.622 26.8549 155.253 45.082 150.174 c 0
+ 62.4314 145.339 90.9072 129.98 106.918 124.499 c 0
+EndSplineSet
+EndChar
+
+StartChar: OriscusCavumReversus
+Encoding: 166 -1 166
+Width: 166
+VWidth: 2537
+Flags: HW
+HStem: -55.3496 245.7
+VStem: 148.728 17.4717<10.4492 144.413> -0.200195 17.4725<-10.8255 125.552>
+LayerCount: 2
+Fore
+SplineSet
+59.082 124.499 m 0
+ 38.3701 117.408 26.2725 122.166 17.2725 125.552 c 1
+ 17.2725 24.8789 l 2
+ 17.2725 3.92871 20.8242 -21.5469 45.082 -15.1738 c 0
+ 61.4355 -10.877 89.8252 5.93848 106.918 11.5293 c 0
+ 128.063 18.4453 139.729 15.4873 148.729 10.4492 c 1
+ 148.729 110.12 l 2
+ 148.729 140.622 139.145 155.253 120.918 150.174 c 0
+ 103.568 145.339 75.0928 129.98 59.082 124.499 c 0
+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: HW
+HStem: -15.1738 165.348
+VStem: 17.2715 131.456<15.8732 120.807>
+LayerCount: 2
+Fore
+SplineSet
+59.0811 124.499 m 0
+ 75.0918 129.98 103.567 145.339 120.917 150.174 c 0
+ 139.145 155.253 148.728 140.622 148.728 110.12 c 2
+ 148.728 10.4492 l 1
+ 139.728 15.4873 128.062 18.4453 106.917 11.5293 c 0
+ 89.8242 5.93848 61.4346 -10.877 45.0811 -15.1738 c 0
+ 20.8232 -21.5469 17.2715 3.92871 17.2715 24.8789 c 2
+ 17.2715 125.552 l 1
+ 26.2715 122.166 38.3691 117.408 59.0811 124.499 c 0
+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 18.2715<-3.9889 130.552> 149.728 18.2725<22.7102 153.502>
+LayerCount: 2
+Fore
+SplineSet
+60.0811 129.499 m 0
+ 39.3691 122.408 27.2715 127.166 18.2715 130.552 c 1
+ 18.2715 34.8789 l 2
+ 18.2715 13.9287 20.2207 -14.9023 47.0811 -7.17383 c 0
+ 63.6008 -2.42062 102.003 19.4189 118.917 25.5293 c 0
+ 138.062 32.4453 141.728 27.4873 147.728 19.4492 c 1
+ 148.75 24.1504 149.731 29.6572 149.728 41.1504 c 1
+ 149.728 115.12 l 2
+ 149.728 145.622 142.852 164.206 120.917 157.174 c 0
+ 103.486 151.586 76.0918 134.98 60.0811 129.499 c 0
+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: -7.17383 164.348
+VStem: 18.2715 131.456<28.8155 124.683>
+LayerCount: 2
+Fore
+SplineSet
+60.0811 129.499 m 4
+ 76.0918 134.98 103.486 151.586 120.917 157.174 c 4
+ 142.852 164.206 149.728 145.622 149.728 115.12 c 6
+ 149.728 41.1504 l 5
+ 149.731 29.6572 148.75 24.1504 147.728 19.4492 c 5
+ 141.728 27.4873 138.062 32.4453 118.917 25.5293 c 4
+ 102.003 19.4189 63.6008 -2.42062 47.0811 -7.17383 c 4
+ 20.2207 -14.9023 18.2715 13.9287 18.2715 34.8789 c 6
+ 18.2715 130.552 l 5
+ 27.2715 127.166 39.3691 122.408 60.0811 129.499 c 4
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont