diff options
Diffstat (limited to 'Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua')
| -rw-r--r-- | Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua | 112 |
1 files changed, 71 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua index a846f99a79d..3f6e7e88099 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua @@ -27,6 +27,8 @@ local EXCLUDE = { ['.notdef'] = true, ['.null'] = true, nonmarkingreturn = true, + AscendensOriscusLineBLTR = true, + AscendensOriscusLineTR = true, PunctumAuctusLineBL = true, PunctumLineBLBR = true, PunctumLineBR = true, @@ -34,7 +36,8 @@ local EXCLUDE = { PunctumSmall = true, FlexusLineBL = true, FlexusAmOneLineBL = true, - OriscusLineTR = true, + DescendensOriscusLineTR = true, + DescendensOriscusLineBLTR = true, QuilismaLineTR = true, VirgaLineBR = true, SalicusOriscus = true, @@ -58,6 +61,14 @@ 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]], AuctumMora = [[\excluded{g}.]], BarBrace = [[\excluded{,}\_]], CClef = [[c3]], @@ -70,84 +81,84 @@ 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]], 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\~{}]], + 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]], PunctumInclinatumAuctus = [[G>]], + PunctumInclinatum = [[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]], @@ -179,41 +190,60 @@ local GABC_AMBITUS_ONE = { local GABC_FUSE = { Upper = { Punctum = [[\excluded{e}@]], - Oriscus = [[\excluded{e}@]], + AscendensOriscus = [[\excluded{e}@]], + DescendensOriscus = [[\excluded{e}@]], Pes = [[\excluded{e}@]], PesQuadratum = [[\excluded{e}@]], PesQuadratumLongqueue = [[\excluded{f}@]], PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bq[ll:0]c]] }, PesQuassus = [[\excluded{e}@]], + PesQuassusInusitatus = [[\excluded{e}@]], + PesQuassusInusitatusLongqueue = [[\excluded{f}@]], + PesQuassusInusitatusOpenqueue = { [[\excluded{a}@]], [[bo0[ll:0]c]] }, PesQuassusLongqueue = [[\excluded{f}@]], PesQuassusOpenqueue = { [[\excluded{a}@]], [[bo[ll:0]c]] }, Flexus = [[\excluded{e}@]], + FlexusOriscus = [[\excluded{e}@]], + FlexusOriscusInusitatus = [[\excluded{e}@]], }, Lower = { Punctum = [[\excluded{i}@]], - Oriscus = [[\excluded{i}@]], + AscendensOriscus = [[\excluded{i}@]], + DescendensOriscus = [[\excluded{i}@]], Pes = [[\excluded{i}@]], PesQuadratum = [[\excluded{i}@]], PesQuadratumLongqueue = [[\excluded{j}@]], PesQuadratumOpenqueue = [[\excluded{b}@]], PesQuassus = [[\excluded{i}@]], + PesQuassusInusitatus = [[\excluded{i}@]], + PesQuassusInusitatusLongqueue = [[\excluded{j}@]], + PesQuassusInusitatusOpenqueue = [[\excluded{b}@]], + 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}]], 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}]], VirgaReversa = [[\excluded{@eg}]], VirgaReversaLongqueue = [[\excluded{@fg}]], }, @@ -234,11 +264,11 @@ local LIQUESCENCE = { GregorioRef = {} -function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) +function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano) local common_glyphs = {} local greciliae = {} local gregorio = {} - local parmesan = {} + local granapadano = {} local function index_font(csname, variants, common) local glyphs = font.fonts[font.id(csname)].resources.unicodes @@ -264,7 +294,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) index_font(cs_greciliae, greciliae, common_glyphs) index_font(cs_gregorio, gregorio) - index_font(cs_parmesan, parmesan) + index_font(cs_granapadano, granapadano) local function maybe_emit_glyph(csname, variants, name, variant) local cp = variants[name] @@ -307,10 +337,10 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) 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}&]], - fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_parmesan, char + fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_granapadano, char )) local emitted = false, i, variant - for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], parmesan[name]}) do + for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], granapadano[name]}) do if emitted then tex.sprint([[\nopagebreak&&&&&]]) else @@ -319,7 +349,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) tex.sprint(string.format([[{\scriptsize %s}]], variant)) maybe_emit_glyph('greciliae', greciliae, name, variant) maybe_emit_glyph('gregorio', gregorio, name, variant) - maybe_emit_glyph('parmesan', parmesan, name, variant) + maybe_emit_glyph('granapadano', granapadano, name, variant) tex.print([[\\]]) end if not emitted then @@ -336,8 +366,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) 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 |