From a87765fc8ba61e73b88a10cafdf5711ffeb84117 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sat, 3 Dec 2011 12:22:02 +0100 Subject: integrated titlos and dots --- .../third/cyrillicnumbers/t-cyrillicnumbers.mkiv | 101 ++++++++++++--------- 1 file changed, 60 insertions(+), 41 deletions(-) (limited to 'tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv') diff --git a/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv b/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv index 5ebaf29..8788c5e 100644 --- a/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv +++ b/tex/context/third/cyrillicnumbers/t-cyrillicnumbers.mkiv @@ -28,9 +28,32 @@ \registerctxluafile{cyrillicnumbers} -\enablemode[cyrnum-titlo9] +\def\cyrnumsetvariables{% + \startluacode + local tc = thirddata.cyrnum + tc.placetitlo = "\cyrnumparameter{titlo}" + tc.titlospan = "\cyrnumparameter{titlospan}" + tc.titlolocation = "\cyrnumparameter{titlolocation}" + tc.drawdots = "\cyrnumparameter{dots}" == "yes" + tc.dotsymbol = "\cyrnumparameter{dotsymbol}" + \stopluacode% +} -\def\cyrnum_penwidth{12} +\appendtoks \cyrnumsetvariables \to \everysetupcyrnum + +\setupcyrnum[ + titlo=mp, % font|mp|no + titlospan=3, % n|all + titlolocation=middle, % final|middle -- only effective if span ~= all + dots=\v!yes, % yes|no + dotsymbol=ยท, + penwidth=3, + titlomode=5, +] + +\startmoduletestsection + \ctxlua{thirddata.cyrnum.debug = true} +\stopmoduletestsection \startuniqueMPgraphic{cyrnum-titlo1} path titlo ; @@ -41,7 +64,7 @@ ( 0.05, .4*Vfactor) .. ( 0.95, -.4*Vfactor) .. ( 1.00, Vfactor) ; - pickup pensquare yscaled \cyrnum_penwidth xscaled 1 rotated -30 ; + pickup pensquare yscaled \cyrnumparameter{penwidth} xscaled 1 rotated -30 ; draw titlo xysized (Hfactor*OverlayWidth,Vfactor*OverlayHeight) shifted (.5*(OverlayWidth-Hfactor*OverlayWidth),OverlayHeight-Vfactor*OverlayHeight) ; @@ -50,7 +73,7 @@ \startuniqueMPgraphic{cyrnum-titlo2} path titlo ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .15 ; save Hfactor ; Hfactor = .80 ; @@ -69,7 +92,7 @@ \startuniqueMPgraphic{cyrnum-titlo3} path titlo ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .15 ; save Hfactor ; Hfactor = .80 ; @@ -93,7 +116,7 @@ %%% Same as 2 with inner vertical stroke \startuniqueMPgraphic{cyrnum-titlo4} path titlo, stroke ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .15 ; save Hfactor ; Hfactor = .80 ; @@ -117,7 +140,7 @@ \startuniqueMPgraphic{cyrnum-titlo5} path titlo ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .20 ; save Hfactor ; Hfactor = .85 ; @@ -132,7 +155,7 @@ \startuniqueMPgraphic{cyrnum-titlo6} path titlo ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .20 ; save Hfactor ; Hfactor = .85 ; @@ -151,7 +174,7 @@ \startuniqueMPgraphic{cyrnum-titlo7} path titlo ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .20 ; save Hfactor ; Hfactor = .85 ; @@ -171,7 +194,7 @@ \startuniqueMPgraphic{cyrnum-titlo8} path titlo, stroke ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .20 ; save Hfactor ; Hfactor = .85 ; @@ -209,7 +232,7 @@ \startuniqueMPgraphic{cyrnum-titlo9} path titlo ; - save penwidth ; penwidth = \cyrnum_penwidth ; + save penwidth ; penwidth = \cyrnumparameter{penwidth} ; save High, Low ; save Vfactor ; Vfactor = .10 ; save Hfactor ; Hfactor = .85 ; @@ -225,41 +248,37 @@ setbounds currentpicture to boundingbox OverlayBox ; \stopuniqueMPgraphic -\startmode[cyrnum-titlo1] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo1}] -\stopmode %%% titlo1 -\startmode[cyrnum-titlo2] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo2}] -\stopmode -\startmode[cyrnum-titlo3] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{titlo3}] -\stopmode -\startmode[cyrnum-titlo4] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo4}] -\stopmode -\startmode[cyrnum-titlo5] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo5}] -\stopmode -\startmode[cyrnum-titlo6] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo6}] -\stopmode -\startmode[cyrnum-titlo7] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo7}] -\stopmode -\startmode[cyrnum-titlo8] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo8}] -\stopmode -\startmode[cyrnum-titlo9] - \defineoverlay[cyrnum-titlo-overlay][\uniqueMPgraphic{cyrnum-titlo9}] -\stopmode +\defineoverlay[cyrnum-titlo-overlay1][\uniqueMPgraphic{cyrnum-titlo1}] +\defineoverlay[cyrnum-titlo-overlay2][\uniqueMPgraphic{cyrnum-titlo2}] +\defineoverlay[cyrnum-titlo-overlay3][\uniqueMPgraphic{cyrnum-titlo3}] +\defineoverlay[cyrnum-titlo-overlay4][\uniqueMPgraphic{cyrnum-titlo4}] +\defineoverlay[cyrnum-titlo-overlay5][\uniqueMPgraphic{cyrnum-titlo5}] +\defineoverlay[cyrnum-titlo-overlay6][\uniqueMPgraphic{cyrnum-titlo6}] +\defineoverlay[cyrnum-titlo-overlay7][\uniqueMPgraphic{cyrnum-titlo7}] +\defineoverlay[cyrnum-titlo-overlay8][\uniqueMPgraphic{cyrnum-titlo8}] +\defineoverlay[cyrnum-titlo-overlay9][\uniqueMPgraphic{cyrnum-titlo9}] \defineframed[cyrnum_titloframe][ - location=low, - frame=off, - background=cyrnum-titlo-overlay, + location=low, + frame=off, + background=cyrnum-titlo-overlay\cyrnumparameter{titlomode}, ] \def\Titlo{\dontleavehmode\cyrnum_titloframe} +\let\cyrnumdrawtitlo\cyrnum_titloframe %% for protected context + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% Interfacing with the Lua functions. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\def\cyrillicnumerals#1{\ctxcommand{cyrillicnumerals(\number#1)}} +\def\Cyrillicnumerals#1{\ctxcommand{Cyrillicnumerals(\number#1)}} + +\defineconversion[cyrillicnumerals][\cyrillicnumerals] +\defineconversion[Cyrillicnumerals][\Cyrillicnumerals] +\defineconversion[cyr] [\cyrillicnumerals] +\defineconversion[Cyr] [\Cyrillicnumerals] + \unprotect \endinput -- cgit v1.2.3