summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex')
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex123
1 files changed, 60 insertions, 63 deletions
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
index 79edaf7ad73..7b56622e351 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
@@ -23,7 +23,7 @@
\def\gregoriotex@symbols@loaded{}%
\gre@debugmsg{general}{Loading gregoriotex-symbols.tex}%
-\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0-beta1}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
@@ -34,8 +34,8 @@
% #2 = font name
% #3 = glyph name or code point
\def\gredefsymbol#1#2#3{%
- \directlua{gregoriotex.init_variant_font([[#2]],false)}%
- \directlua{gregoriotex.def_symbol([[#1]],[[#2]],[[#3]],false)}%
+ \directlua{gregoriotex.init_variant_font([[#2]],false)}%
+ \directlua{gregoriotex.def_symbol([[#1]],[[#2]],[[#3]],false)}%
}%
% Defines a symbol which takes a point size as argument
@@ -43,8 +43,8 @@
% #2 = font name
% #3 = glyph name or code point
\def\gredefsizedsymbol#1#2#3{%
- \directlua{gregoriotex.init_variant_font([[#2]],false)}%
- \directlua{gregoriotex.def_symbol([[#1]],[[#2]],[[#3]],true)}%
+ \directlua{gregoriotex.init_variant_font([[#2]],false)}%
+ \directlua{gregoriotex.def_symbol([[#1]],[[#2]],[[#3]],true)}%
}%
%%%%%%%%%%%%%
@@ -83,8 +83,8 @@
\gredefsizedsymbol{greVBarAlt}{greextra}{VBar.alt}
\def\grebarredsymbol#1#2#3#4#5{%
- \leavevmode\hbox to 0pt{}\kern #4\lower#5%
- \hbox{\csname #2\endcsname{#3}}\kern -#4\relax #1%
+ \leavevmode\hbox to 0pt{}\kern #4\lower#5%
+ \hbox{\csname #2\endcsname{#3}}\kern -#4\relax #1%
}%
%% Intermediate version or barred glyph definition
@@ -95,16 +95,16 @@
%% #5: the kern of the bar from the beggining of the glyph
%% #6: greextra glyph lowering
\def\gredefbarredsymbol#1#2#3#4#5#6{%
- \expandafter\gdef\csname #1\endcsname {%
- \grebarredsymbol{#2}{#3}{#4}{#5}{#6}%
- }%
+ \expandafter\gdef\csname #1\endcsname {%
+ \grebarredsymbol{#2}{#3}{#4}{#5}{#6}%
+ }%
}%
%% Most simple version or barred glyph definition
%% #1: A, R or V
%% #2: the negative kern
\def\gresimpledefbarredsymbol#1#2{%
- \gredefbarredsymbol{#1bar}{#1}{gre#1Bar}{\f@size}{#2}{0pt}%
+ \gredefbarredsymbol{#1bar}{#1}{gre#1Bar}{\f@size}{#2}{0pt}%
}%
% defining \ABar, \VBar and \RBar for libertine font, define yours for your font
@@ -113,44 +113,44 @@
\gresimpledefbarredsymbol{V}{.10em}%
\gre@iflatex{%
- \def\gre@latex@barredsymbol#1#2#3#4{%
- \IfStrEq{\f@series/\f@shape}{#1}{\grebarredsymbol{#2}{#3}{\f@size}{#4}{0pt}}%
- }%
-
- %% define a barred symbol that handles italic, slanted, and small cap shapes
- %% simply (LaTeX-only)
- %% Most simple version or barred glyph definition
- %% #1: A, R or V
- %% #2: the negative kern for upright shape
- %% #3: idem, for italic/slanted shape
- %% #4: idem, for bold shape
- %% #5: idem, for bold and italic/slanted shape
- \def\grelatexsimpledefbarredsymbol#1#2#3#4#5{%
- \expandafter\gdef\csname #1bar\endcsname {%
- \gre@latex@barredsymbol{m/n}{#1}{gre#1Bar}{#2}{%
- \gre@latex@barredsymbol{m/it}{#1}{gre#1BarSlant}{#3}{%
- \gre@latex@barredsymbol{m/sl}{#1}{gre#1BarSlant}{#3}{%
- \gre@latex@barredsymbol{bx/n}{#1}{gre#1Bar}{#4}{%
- \gre@latex@barredsymbol{bx/it}{#1}{gre#1BarSlant}{#5}{%
- \gre@latex@barredsymbol{bx/sl}{#1}{gre#1BarSlant}{#5}{%
- \gre@latex@barredsymbol{b/n}{#1}{gre#1Bar}{#4}{%
- \gre@latex@barredsymbol{b/it}{#1}{gre#1BarSlant}{#5}{%
- \gre@latex@barredsymbol{b/sl}{#1}{gre#1BarSlant}{#5}{%
- }%
- }%
- }%
- }%
- }%
- }%
- }%
- }%
- }%
- }%
- }%
-
- \grelatexsimpledefbarredsymbol{A}{.30em}{.35em}{.30em}{.33em}%
- \grelatexsimpledefbarredsymbol{R}{.35em}{.38em}{.45em}{.48em}%
- \grelatexsimpledefbarredsymbol{V}{.10em}{.12em}{.14em}{.18em}%
+ \def\gre@latex@barredsymbol#1#2#3#4{%
+ \IfStrEq{\f@series/\f@shape}{#1}{\grebarredsymbol{#2}{#3}{\f@size}{#4}{0pt}}%
+ }%
+
+ %% define a barred symbol that handles italic, slanted, and small cap shapes
+ %% simply (LaTeX-only)
+ %% Most simple version or barred glyph definition
+ %% #1: A, R or V
+ %% #2: the negative kern for upright shape
+ %% #3: idem, for italic/slanted shape
+ %% #4: idem, for bold shape
+ %% #5: idem, for bold and italic/slanted shape
+ \def\grelatexsimpledefbarredsymbol#1#2#3#4#5{%
+ \expandafter\gdef\csname #1bar\endcsname {%
+ \gre@latex@barredsymbol{m/n}{#1}{gre#1Bar}{#2}{%
+ \gre@latex@barredsymbol{m/it}{#1}{gre#1BarSlant}{#3}{%
+ \gre@latex@barredsymbol{m/sl}{#1}{gre#1BarSlant}{#3}{%
+ \gre@latex@barredsymbol{bx/n}{#1}{gre#1Bar}{#4}{%
+ \gre@latex@barredsymbol{bx/it}{#1}{gre#1BarSlant}{#5}{%
+ \gre@latex@barredsymbol{bx/sl}{#1}{gre#1BarSlant}{#5}{%
+ \gre@latex@barredsymbol{b/n}{#1}{gre#1Bar}{#4}{%
+ \gre@latex@barredsymbol{b/it}{#1}{gre#1BarSlant}{#5}{%
+ \gre@latex@barredsymbol{b/sl}{#1}{gre#1BarSlant}{#5}{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+
+ \grelatexsimpledefbarredsymbol{A}{.30em}{.35em}{.30em}{.33em}%
+ \grelatexsimpledefbarredsymbol{R}{.35em}{.38em}{.45em}{.48em}%
+ \grelatexsimpledefbarredsymbol{V}{.10em}{.12em}{.14em}{.18em}%
}%
% the gothic R and V
@@ -184,18 +184,15 @@
%#1 is the type of line (1-5)
%#2 is the number of pt of the font it will use
\def\greseparator#1#2{%
- \ifcase#1\relax %
- \or\greLineOne{#2}%
- \or\greLineTwo{#2}%
- \or\greLineThree{#2}%
- \or\greLineFour{#2}%
- \or\greLineFive{#2}%
- \fi%
+ \ifcase#1\relax %
+ \or\greLineOne{#2}%
+ \or\greLineTwo{#2}%
+ \or\greLineThree{#2}%
+ \or\greLineFour{#2}%
+ \or\greLineFive{#2}%
+ \fi%
}%
-\def\gresep#1#2{%OBSOLETE
- \gre@obsolete{\protect\gresep}{\protect\greseparator}%
-}
%%%%%%%%%%%
%% Ornamentation
@@ -205,10 +202,10 @@
\gredefsizedsymbol{greOrnamentTwo}{greextra}{Drawing2}%
\def\greornamentation#1#2{%
- \ifcase#1\relax%
- \or\greOrnamentOne{#2}%
- \or\greOrnamentTwo{#2}%
- \fi%
+ \ifcase#1\relax%
+ \or\greOrnamentOne{#2}%
+ \or\greOrnamentTwo{#2}%
+ \fi%
}%
%% Specials