summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv44
1 files changed, 29 insertions, 15 deletions
diff --git a/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv b/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv
index cbc26e6..8321dac 100644
--- a/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv
+++ b/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv
@@ -36,6 +36,7 @@
\setinterfacevariable {penwidth} {penwidth}
\setinterfacevariable {preferhundredk} {preferhundredk}
\setinterfacevariable {titlolocation} {titlolocation}
+ \setinterfacevariable {titlocolor} {titlocolor}
\setinterfacevariable {titlomode} {titlomode}
\setinterfacevariable {titlospan} {titlospan}
\setinterfacevariable {titlo} {titlo}
@@ -131,7 +132,8 @@
pickup pensquare yscaled \cyrnumparameter{penwidth} xscaled 1 rotated -30 ;
draw titlo
xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight)
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-Vfactor*OverlayHeight) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-Vfactor*OverlayHeight)
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}};
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -150,7 +152,8 @@
pickup pensquare yscaled penwidth xscaled 1 rotated 70 ;
draw titlo
xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight)
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight)
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}};
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -173,7 +176,8 @@
pickup pensquare yscaled penwidth xscaled 1 rotated 70 ;
draw titlo
xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight)
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight)
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}};
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -195,10 +199,12 @@
pickup pensquare yscaled penwidth xscaled 1 rotated 80 ;
draw titlo
xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight)
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight)
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}};
draw stroke
% xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight) %% doesn’t work as expected somehow
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth)-.5*penwidth,OverlayHeight-Vfactor*OverlayHeight)
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -213,7 +219,8 @@
pickup pensquare yscaled penwidth xscaled 2 rotated 85 ;
draw titlo
xysized (Hfactor*OverlayWidth-penwidth,Vfactor*OverlayHeight)
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-Vfactor*OverlayHeight) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-Vfactor*OverlayHeight)
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -232,7 +239,8 @@
pickup pensquare yscaled penwidth xscaled sqrt(2) rotated 90 ;
draw titlo
xysized (Hfactor*OverlayWidth-.5*penwidth,Vfactor*OverlayHeight)
- shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-(0.5*Vfactor*OverlayHeight)) ;
+ shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-(0.5*Vfactor*OverlayHeight))
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -252,7 +260,8 @@
draw titlo
xysized (Hfactor*OverlayWidth-2*penwidth,Vfactor*OverlayHeight)
shifted ((.5*penwidth+.5*(OverlayWidth-Hfactor*OverlayWidth)),
- (OverlayHeight-(0.7*Vfactor*OverlayHeight))) ;
+ (OverlayHeight-(0.7*Vfactor*OverlayHeight)))
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -284,12 +293,14 @@
draw titlo
xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight)
shifted ((.5*(OverlayWidth-Hfactor*OverlayWidth)),
- (OverlayHeight-(0.7*Vfactor*OverlayHeight))) ;
+ (OverlayHeight-(0.7*Vfactor*OverlayHeight)))
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
pickup pensquare yscaled 2 xscaled (0.5*penwidth) rotated 70;
draw stroke
% xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight)
shifted ((.6*(OverlayWidth-Hfactor*OverlayWidth)),
(OverlayHeight-Vfactor*OverlayHeight))
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
;
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -308,7 +319,8 @@
draw titlo
xysized (Hfactor*OverlayWidth-2*penwidth,Vfactor*OverlayHeight)
shifted ((.5*penwidth+.5*(OverlayWidth-Hfactor*OverlayWidth)),
- (OverlayHeight-(0.7*Vfactor*OverlayHeight))) ;
+ (OverlayHeight-(0.7*Vfactor*OverlayHeight)))
+ withcolor \MPcolor{\cyrnumparameter{titlocolor}} ;
setbounds currentpicture to boundingbox OverlayBox ;
\stopuniqueMPgraphic
@@ -371,11 +383,12 @@
}
\def\dodo_cyrnum[#1]{%
- \iffirstargument
- \doifassignmentelse{#1}{\setupcyrnum[\currentcyrnum][#1]}\relax
- \else
- \setupcyrnum
- \fi
+ % \iffirstargument
+ % \doifassignmentelse{#1}{\setupcyrnum[\currentcyrnum][#1]}\relax
+ \setupcyrnum[\currentcyrnum][#1]%
+ % \else
+ % \setupcyrnum
+ % \fi
\cyrnumparameter{command}\begingroup%
\dododo_cyrnum%
}
@@ -397,6 +410,7 @@
\v!penwidth=.66pt,
\v!preferhundredk=no,
\v!command=,
+ \v!titlocolor=black,
\v!titlolocation=\v!middle, % final|middle -- only effective if using the font’s titlo
\v!titlomode=5,
\v!titlospan=3, % n|all