From b6a0b387c7414ae0b36ca66135b7c6106ea0a816 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 14 Jan 2024 18:01:15 +0100 Subject: [PATCH] Add ni neume (nihil). --- doc/GregorioNabcRef.tex | 10 ++++++++-- fonts/gregall.sfd | 14 +++++++++++--- fonts/grelaon.sfd | 14 +++++++++++--- fonts/gresgmodern.sfd | 18 ++++++++++++++---- tex/gregoriotex-nabc.lua | 4 ++-- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/doc/GregorioNabcRef.tex b/doc/GregorioNabcRef.tex index 5ad8b378..5ee80947 100644 --- a/doc/GregorioNabcRef.tex +++ b/doc/GregorioNabcRef.tex @@ -234,7 +234,8 @@ \texttt{pq} \sneume{pq} pes quassus\\ \texttt{ql} \sneume{ql} quilisma (3 loops)\\ \texttt{qi} \sneume{qi} quilisma (2 loops)\\ -\texttt{pt} \sneume{pt} pes stratus +\texttt{pt} \sneume{pt} pes stratus\\ +\texttt{ni} \sneume{ni} nihil \end{multicols} The \texttt{glyph modifiers} is a possibly empty sequence of following @@ -362,6 +363,10 @@ \texttt{lsx} \sneume{lsx} expectare \end{multicols} +Nihil - \texttt{ni} is an artificial empty base glyph around which +it is possible to place significant letters and/or subpunctis +and/or prepunctis. + Finally a commented example of a \texttt{nabc} snippet: \texttt{```po////pe>2lse7lsl3qlhh!vshhppt1sut2ql>ppu3} @@ -425,7 +430,8 @@ \texttt{sa} \lneume{sa} scandicus\\ \texttt{pq} \lneume{pq} pes quassus\\ \texttt{ql} \lneume{ql} quilisma\\ -\texttt{pt} \lneume{pt1} pes stratus +\texttt{pt} \lneume{pt1} pes stratus\\ +\texttt{ni} \lneume{ni} nihil \end{multicols} The \textit{subpunctis and prepunctis descriptor} consists of the letters diff --git a/fonts/gregall.sfd b/fonts/gregall.sfd index 4922571e..39f66ad0 100644 --- a/fonts/gregall.sfd +++ b/fonts/gregall.sfd @@ -20,7 +20,7 @@ OS2Version: 4 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1388509729 -ModificationTime: 1540934162 +ModificationTime: 1677262955 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -745,11 +745,11 @@ DisplaySize: -96 AntiAlias: 1 FitToEm: 1 ExtremaBound: 10 -WinInfo: 58896 16 6 +WinInfo: 58862 19 8 BeginPrivate: 0 EndPrivate TeXData: 1 0 0 346030 173015 115343 717226 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65538 564 +BeginChars: 65538 565 StartChar: space Encoding: 32 32 0 @@ -268608,5 +268608,13 @@ SplineSet 75.7939 70.7705 75.7939 70.7705 53.4961 93.3828 c 24,40,41 EndSplineSet EndChar + +StartChar: ni +Encoding: 58976 58976 564 +Width: 356 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar EndChars EndSplineFont diff --git a/fonts/grelaon.sfd b/fonts/grelaon.sfd index 5f5a8275..416a096d 100644 --- a/fonts/grelaon.sfd +++ b/fonts/grelaon.sfd @@ -20,7 +20,7 @@ OS2Version: 4 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1388509729 -ModificationTime: 1511620521 +ModificationTime: 1677263124 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -745,11 +745,11 @@ DisplaySize: -96 AntiAlias: 1 FitToEm: 1 ExtremaBound: 10 -WinInfo: 58896 16 8 +WinInfo: 58864 16 8 BeginPrivate: 0 EndPrivate TeXData: 1 0 0 346030 173015 115343 717226 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65542 572 +BeginChars: 65542 573 StartChar: space Encoding: 32 32 0 @@ -196175,5 +196175,13 @@ SplineSet 164.952 98.482 164.952 98.482 113 90 c 24,104,105 EndSplineSet EndChar + +StartChar: ni +Encoding: 58939 58939 572 +Width: 398 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar EndChars EndSplineFont diff --git a/fonts/gresgmodern.sfd b/fonts/gresgmodern.sfd index 724d3e71..a560b2f4 100644 --- a/fonts/gresgmodern.sfd +++ b/fonts/gresgmodern.sfd @@ -20,7 +20,7 @@ OS2Version: 3 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1202942658 -ModificationTime: 1474720778 +ModificationTime: 1677263187 PfmFamily: 81 TTFWeight: 400 TTFWidth: 5 @@ -45,7 +45,7 @@ OS2UnicodeRanges: 00000003.10000000.00000020.00000000 Lookup: 4 1 1 "'liga'" {"'liga'_clim" "'liga'_base" "'liga'_scand" "'liga'_disj" } ['liga' ('DFLT' <'LAT ' > 'DFLT' <'dflt' > 'latn' <'LAT ' > 'latn' <'dflt' > ) ] MarkAttachClasses: 1 DEI: 91125 -LangName: 1033 +LangName: 1033 GaspTable: 3 8 2 150 1 65535 1 0 Encoding: UnicodeBmp Compacted: 1 @@ -64,7 +64,7 @@ Grid 169.1 53 213.708 54 253.1 54 c 24 EndSplineSet TeXData: 1 0 0 100663 50331 33554 219152 1048576 33554 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65538 545 +BeginChars: 65538 546 StartChar: .notdef Encoding: 65536 -1 0 @@ -389,7 +389,7 @@ SplineSet 66 66 58 60 54 50 c 0 46 22 20 30 20 52 c 1xb8 EndSplineSet -LCarets2: 1 0 +LCarets2: 1 0 EndChar StartChar: e1 @@ -37197,5 +37197,15 @@ SplineSet 22 209 20 213 20 221 c 4 EndSplineSet EndChar + +StartChar: ni +Encoding: 58952 58952 545 +Width: 162 +VWidth: 690 +Flags: HW +HStem: 110 124<60.2842 136.005> +VStem: 20 122<114.655 228.762> +LayerCount: 2 +EndChar EndChars EndSplineFont diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 38ded2c1..c51869fc 100644 --- a/tex/gregoriotex-nabc.lua +++ b/tex/gregoriotex-nabc.lua @@ -1,6 +1,6 @@ --GregorioTeX Nabc Lua file. -- ---Copyright (C) 2014-2021 The Gregorio Project (see CONTRIBUTORS.md) +--Copyright (C) 2014-2024 The Gregorio Project (see CONTRIBUTORS.md) -- --This file is part of Gregorio. -- @@ -108,7 +108,7 @@ local gregallmetrics = {} local gregallneumekinds = { vi = 1, pu = 1, ta = 1, gr = 1, cl = 1, un = 1, pv = 1, pe = 1, po = 1, to = 1, ci = 1, sc = 1, pf = 1, sf = 1, tr = 1, st = 1, ds = 1, ts = 1, tg = 1, bv = 1, tv = 1, pr = 1, pi = 1, vs = 1, ["or"] = 1, sa = 1, pq = 1, qi = 1, ql = 1, pt = 1, - un = 1, oc = 1 } + un = 1, oc = 1, ni = 1 } local gregalllskinds = { c = 1, t = 1, s = 1, l = 1, x = 1, ["+"] = 1, a = 1, al = 1, am = 1, b = 1, cm = 1, co = 1, cw = 1, d = 1, e = 1, eq = 1, ew = 1, f = 1, fid = 1, fr = 1, g = 1, h = 1, hp = 1, hn = 1, i = 1, im = 1, iv = 1, k = 1, lb = 1, lc = 1, len = 1, lm = 1, lp = 1, lt = 1, m = 1, md = 1, moll = 1, n = 1, nl = 1, nt = 1, p = 1, par = 1, pfec = 1, pm = 1, q = 1,