diff options
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua')
-rw-r--r-- | Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua | 147 |
1 files changed, 110 insertions, 37 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua index bcc35a9bb69..091bfa24e90 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua @@ -1,3 +1,20 @@ +-- Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +-- +-- This file is part of Gregorio. +-- +-- Gregorio is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- Gregorio is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with Gregorio. If not, see <http://www.gnu.org/licenses/>. + local P = lpeg.P local R = lpeg.R local C = lpeg.C @@ -27,6 +44,8 @@ local EXCLUDE = { ['.notdef'] = true, ['.null'] = true, nonmarkingreturn = true, + AscendensOriscusLineBLTR = true, + AscendensOriscusLineTR = true, PunctumAuctusLineBL = true, PunctumLineBLBR = true, PunctumLineBR = true, @@ -34,7 +53,8 @@ local EXCLUDE = { PunctumSmall = true, FlexusLineBL = true, FlexusAmOneLineBL = true, - OriscusLineTR = true, + DescendensOriscusLineTR = true, + DescendensOriscusLineBLTR = true, QuilismaLineTR = true, VirgaLineBR = true, SalicusOriscus = true, @@ -58,6 +78,15 @@ local GABC = { AccentusReversus = [[\excluded{g}r2]], Ancus = [[gec]], AncusLongqueue = [[hfd]], + AscendensOriscusCavum = [[go1r]], + AscendensOriscusCavumHole = [[\excluded{gor}]], + AscendensOriscus = [[go1]], + AscendensOriscusLineBL = [[\excluded{e}@go1]], + AscendensOriscusLineTL = [[\excluded{i}@go1]], + AscendensOriscusScapus = [[gO1]], + AscendensOriscusScapusLongqueue = [[hO1]], + AscendensOriscusScapusOpenqueue = [[aO1]], + AscendensPunctumInclinatum = [[G1]], AuctumMora = [[\excluded{g}.]], BarBrace = [[\excluded{,}\_]], CClef = [[c3]], @@ -70,84 +99,93 @@ local GABC = { CustosUpLong = [[f+]], CustosUpMedium = [[a+]], CustosUpShort = [[g+]], + DescendensOriscusCavum = [[go0r]], + DescendensOriscusCavumHole = [[\excluded{go0r}]], + DescendensOriscus = [[go0]], + DescendensOriscusLineBL = [[\excluded{e}@go0]], + DescendensOriscusLineTL = [[\excluded{i}@go0]], + DescendensOriscusScapus = [[gO0]], + DescendensOriscusScapusLongqueue = [[hO0]], + DescendensOriscusScapusOpenqueue = [[aO0]], + DescendensPunctumInclinatum = [[G0]], DivisioDominican = [[,3]], DivisioDominicanAlt = [[,4]], DivisioMaior = [[:]], DivisioMinima = [[,]], DivisioMinor = [[;]], - FClef = [[f3]], FClefChange = [[f3]], + FClef = [[f3]], Flat = [[gx]], FlatHole = [[\excluded{gx}]], Flexus = [[ge]], FlexusLongqueue = [[hf]], FlexusNobar = [[@hf]], FlexusOriscus = [[goe]], + FlexusOriscusInusitatus = [[go1e]], FlexusOriscusScapus = [[gOe]], + FlexusOriscusScapusInusitatus = [[gO1e]], + FlexusOriscusScapusInusitatusLongqueue = [[hO1f]], FlexusOriscusScapusLongqueue = [[hOf]], LeadingOriscus = [[go\excluded{igig}]], LeadingPunctum = [[g\excluded{igig}]], LeadingQuilisma = [[gw\excluded{igig}]], Linea = [[g=]], - LineaPunctum = [[gR]], LineaPunctumCavum = [[gr0]], LineaPunctumCavumHole = [[\excluded{gr0}]], + LineaPunctum = [[gR]], Natural = [[gy]], NaturalHole = [[\excluded{gy}]], - Oriscus = [[go1]], - OriscusCavum = [[go1r]], - OriscusCavumDeminutus = [[gor\~{}]], + OblatusAscendensOriscus = [[go1]], + OblatusDescendensOriscus = [[go0]], + OblatusFlexusOriscus = [[goe]], + OblatusFlexusOriscusInusitatus = [[go1e]], + OblatusPesQuassus = [[goi]], + OblatusPesQuassusLongqueue = [[hoj]], + OblatusPesQuassusInusitatus = [[go0i]], + OblatusPesQuassusInusitatusLongqueue = [[ho0j]], + Oriscus = [[go]], -- for Deminutus + OriscusCavum = [[gor]], -- for Deminutus OriscusCavumDeminutusHole = [[\excluded{gor\~{}}]], - OriscusCavumHole = [[\excluded{gor}]], - OriscusCavumReversus = [[go0r]], - OriscusCavumReversusHole = [[\excluded{go0r}]], - OriscusLineBL = [[\excluded{e}@go]], - OriscusReversus = [[go0]], - OriscusReversusLineTL = [[\excluded{i}@go]], - OriscusScapus = [[gO1]], - OriscusScapusLongqueue = [[hO1]], - OriscusScapusOpenqueue = [[aO1]], - OriscusScapusReversus = [[gO0]], - OriscusScapusReversusLongqueue = [[hO0]], - OriscusScapusReversusOpenqueue = [[aO0]], Pes = [[gi]], PesQuadratum = [[gqi]], PesQuadratumLongqueue = [[hqj]], PesQuassus = [[goi]], + PesQuassusInusitatus = [[go0i]], + PesQuassusInusitatusLongqueue = [[ho0j]], PesQuassusLongqueue = [[hoj]], PesQuilisma = [[gwi]], PesQuilismaQuadratum = [[gWi]], PesQuilismaQuadratumLongqueue = [[hWj]], - Porrectus = [[geg]], PorrectusFlexus = [[gege]], PorrectusFlexusNobar = [[\excluded{e}gege]], + Porrectus = [[geg]], PorrectusLongqueue = [[hfh]], PorrectusNobar = [[@geg]], - Punctum = [[g]], PunctumCavum = [[gr]], PunctumCavumHole = [[\excluded{gr}]], - PunctumCavumInclinatum = [[Gr]], PunctumCavumInclinatumAuctus = [[Gr>]], PunctumCavumInclinatumAuctusHole = [[\excluded{Gr>}]], + PunctumCavumInclinatum = [[Gr]], PunctumCavumInclinatumHole = [[\excluded{Gr}]], - PunctumInclinatum = [[G]], + Punctum = [[g]], + PunctumInclinatum = [[G]], -- for deminutus PunctumInclinatumAuctus = [[G>]], PunctumLineBL = [[\excluded{e}@g]], PunctumLineTL = [[\excluded{i}@g]], Quilisma = [[gw]], - RoundBrace = '[ob:1;6mm]', RoundBraceDown = '[ub:1;6mm]', - Salicus = [[giOk]], + RoundBrace = '[ob:1;6mm]', SalicusFlexus = [[giOki]], + Salicus = [[giOk]], SalicusLongqueue = [[hjOl]], Scandicus = [[gik]], Semicirculus = [[\excluded{g}r4]], SemicirculusReversus = [[\excluded{g}r5]], Sharp = [[g\#{}]], SharpHole = [[\excluded{g\#{}}]], - Stropha = [[gs]], StrophaAucta = [[gs>]], StrophaAuctaLongtail = [[hs>]], + Stropha = [[gs]], Torculus = [[gig]], TorculusLiquescens = [[gige]], TorculusLiquescensQuilisma = [[gwige]], @@ -173,47 +211,80 @@ local GABC_AMBITUS_ONE = { PesQuadratumOpenqueue = [[aqb]], PesQuassusOpenqueue = [[aob]], PesQuilismaQuadratumOpenqueue = [[aWb]], + OblatusPesQuassusInusitatusOpenqueue = [[ao0b]], + OblatusPesQuassusOpenqueue = [[boc]], } -- if the item is a table, the values will replace fuse_head and gabc local GABC_FUSE = { Upper = { Punctum = [[\excluded{e}@]], - Oriscus = [[\excluded{e}@]], + AscendensOriscus = [[\excluded{e}@]], + DescendensOriscus = [[\excluded{e}@]], + OblatusAscendensOriscus = [[\excluded{f}@]], + OblatusFlexusOriscusInusitatus = [[\excluded{f}@]], + OblatusPesQuassus = [[\excluded{f}@]], + OblatusPesQuassusLongqueue = [[\excluded{g}@]], + OblatusPesQuassusOpenqueue = [[\excluded{a}@]], Pes = [[\excluded{e}@]], PesQuadratum = [[\excluded{e}@]], PesQuadratumLongqueue = [[\excluded{f}@]], - PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bq[ll:0]c]] }, + PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bqc]] }, PesQuassus = [[\excluded{e}@]], + PesQuassusInusitatus = [[\excluded{e}@]], + PesQuassusInusitatusLongqueue = [[\excluded{f}@]], PesQuassusLongqueue = [[\excluded{f}@]], - PesQuassusOpenqueue = { [[\excluded{a}@]], [[bo[ll:0]c]] }, + PesQuassusOpenqueue = { [[\excluded{a}@]], [[cod]] }, Flexus = [[\excluded{e}@]], + FlexusOriscus = [[\excluded{e}@]], + FlexusOriscusInusitatus = [[\excluded{e}@]], }, Lower = { Punctum = [[\excluded{i}@]], - Oriscus = [[\excluded{i}@]], + AscendensOriscus = [[\excluded{i}@]], + DescendensOriscus = [[\excluded{i}@]], + OblatusDescendensOriscus = [[\excluded{h}@]], + OblatusFlexusOriscus = [[\excluded{h}@]], + OblatusPesQuassusInusitatus = [[\excluded{h}@]], + OblatusPesQuassusInusitatusLongqueue = [[\excluded{i}@]], + OblatusPesQuassusInusitatusOpenqueue = [[\excluded{b}@]], Pes = [[\excluded{i}@]], PesQuadratum = [[\excluded{i}@]], PesQuadratumLongqueue = [[\excluded{j}@]], PesQuadratumOpenqueue = [[\excluded{b}@]], PesQuassus = [[\excluded{i}@]], + PesQuassusInusitatus = [[\excluded{i}@]], + PesQuassusInusitatusLongqueue = [[\excluded{j}@]], + PesQuassusLongqueue = [[\excluded{j}@]], + PesQuassusOpenqueue = [[\excluded{b}@]], Flexus = [[\excluded{i}@]], FlexusOriscus = [[\excluded{i}@]], + FlexusOriscusInusitatus = [[\excluded{i}@]], }, Up = { Punctum = [[\excluded{@ij}]], - Oriscus = [[\excluded{@ij}]], - OriscusScapus = [[\excluded{@ij}]], - OriscusScapusLongqueue = [[\excluded{@jk}]], + AscendensOriscus = [[\excluded{@ij}]], + AscendensOriscusScapus = [[\excluded{@ij}]], + AscendensOriscusScapusLongqueue = [[\excluded{@jk}]], + DescendensOriscus = [[\excluded{@ij}]], + DescendensOriscusScapus = [[\excluded{@ij}]], + DescendensOriscusScapusLongqueue = [[\excluded{@jk}]], + OblatusAscendensOriscus = [[\excluded{@i}]], + OblatusDescendensOriscus = [[\excluded{@i}]], Quilisma = [[\excluded{@ij}]], Flexus = [[\excluded{@gi}]], FlexusNobar = [[\excluded{@hj}]], }, Down = { Punctum = [[\excluded{@eg}]], - Oriscus = [[\excluded{@eg}]], - OriscusScapus = [[\excluded{@eg}]], - OriscusScapusLongqueue = [[\excluded{@eg}]], + AscendensOriscus = [[\excluded{@eg}]], + AscendensOriscusScapus = [[\excluded{@eg}]], + AscendensOriscusScapusLongqueue = [[\excluded{@eg}]], + DescendensOriscus = [[\excluded{@eg}]], + DescendensOriscusScapus = [[\excluded{@eg}]], + DescendensOriscusScapusLongqueue = [[\excluded{@eg}]], + OblatusAscendensOriscus = [[\excluded{@e}]], + OblatusDescendensOriscus = [[\excluded{@e}]], VirgaReversa = [[\excluded{@eg}]], VirgaReversaLongqueue = [[\excluded{@fg}]], }, @@ -304,6 +375,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano liq = '' end gabc = '('..fuse_head..DEBILIS[debilis]..gabc..LIQUESCENCE[liq]..fuse_tail..')' + else + texio.write_nl('GregorioRef Warning: missing GABC for '..name) end tex.sprint(string.format( [[{\scriptsize %s{\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&{\%s\char%d}&{\%s\char%d}&]], @@ -336,8 +409,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano local post_word_liquescentia = P'Nothing' + P'Deminutus' + P'Ascendens' + P'Descendens' local liquescentia = post_word_liquescentia + P'Up' + P'Down' - local word = (majuscule * minuscule^0) - fusion - ambitus - debilis - - post_word_liquescentia + local word = ((majuscule * minuscule^0) - fusion - ambitus - debilis - + post_word_liquescentia) + ((P'Ascendens' + P'Descendens') * P'Oriscus') local liquescence = debilis^-1 * liquescentia^-1 local pattern = C(fusion^-1) * C(word^1) * C(ambitus^0) * C(debilis^-1) * C(liquescentia^-1) * -1 |