diff options
author | Mojca Miklavec <mojca.miklavec@gmail.com> | 2012-05-14 17:38:55 +0000 |
---|---|---|
committer | Mojca Miklavec <mojca.miklavec@gmail.com> | 2012-05-14 17:38:55 +0000 |
commit | 15995e10bfc68edf79970c4ea4fbb6678566c46e (patch) | |
tree | 2de7ca2a83f2d37ef043ad7429a5cb945bb79ddb /Master/texmf-dist/tex/context/base/scrn-hlp.mkvi | |
parent | c9a39f716f1e5ec820ed3aab2c9aef25c5a9d730 (diff) |
ConTeXt 2012.05.14 16:00
git-svn-id: svn://tug.org/texlive/trunk@26371 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/scrn-hlp.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/scrn-hlp.mkvi | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/context/base/scrn-hlp.mkvi b/Master/texmf-dist/tex/context/base/scrn-hlp.mkvi index d9782430056..f5a78fb0891 100644 --- a/Master/texmf-dist/tex/context/base/scrn-hlp.mkvi +++ b/Master/texmf-dist/tex/context/base/scrn-hlp.mkvi @@ -5,7 +5,7 @@ %D subtitle=Help (Experimental), %D author={Hans Hagen \& Ton Otten}, %D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C %C This module is part of the \CONTEXT\ macro||package and is %C therefore copyrighted by \PRAGMA. See mreadme.pdf for @@ -55,12 +55,14 @@ % also status -\newbox \scrn_help_box -\newcount\scrn_help_n +\newbox \b_scrn_help_box +\newcount\c_scrn_help_n \definesystemattribute[help][public] -\installcommandhandler \??wp {help} \??wp +\installcorenamespace{popuphelp} + +\installframedcommandhandler \??popuphelp {help} \??popuphelp \setuphelp [\c!frame=\v!off, @@ -68,8 +70,6 @@ \c!background=\v!color, \c!backgroundcolor=gray] -\presetlocalframed[\??wp] - \appendtoks \setuevalue \currenthelp {\scrn_help_argument{\currenthelp}}% \setuevalue{\e!start\currenthelp}{\scrn_help_start {\currenthelp}}% @@ -78,8 +78,8 @@ \unexpanded\def\scrn_help_argument#category% {\def\currenthelp{#category}% - \global\advance\scrn_help_n\plusone - \edef\currenthelpname{help:\number\scrn_help_n}% + \global\advance\c_scrn_help_n\plusone + \edef\currenthelpname{help:\number\c_scrn_help_n}% \doifelselocation {\dosingleempty\scrn_help_argument_indeed} {\dosingleempty\scrn_help_argument_ignore}} @@ -88,25 +88,25 @@ {\edef\currenthelpreference{#reference}% \dontleavehmode \hbox \bgroup \dontcomplain - \setbox\scrn_help_box\hbox{\strut#text}% + \setbox\b_scrn_help_box\hbox{\strut#text}% \doregisterhelp{#target}% \egroup % can be usernode instead \goto - {\helpsignal{\number\scrn_help_n}#target}% - [\helpaction{\number\scrn_help_n}]} + {\helpsignal{\number\c_scrn_help_n}#target}% + [\helpaction{\number\c_scrn_help_n}]} \def\scrn_help_argument_ignore[#reference]#text#target% {#target} \unexpanded\def\scrn_help_start#category% {\def\currenthelp{#category}% - \global\advance\scrn_help_n\plusone - \edef\currenthelpname{help:\number\scrn_help_n}% + \global\advance\c_scrn_help_n\plusone + \edef\currenthelpname{help:\number\c_scrn_help_n}% \dosingleempty\scrn_help_start_indeed} \def\scrn_help_start_indeed[#reference]% {\edef\currenthelpreference{#reference}% - \dostartbuffer[\currenthelp][\e!start\currenthelp][\e!stop\currenthelp]} + \grabbufferdatadirect\currenthelp{\e!start\currenthelp}{\e!stop\currenthelp}} \unexpanded\def\scrn_help_stop {\iflocation @@ -114,34 +114,33 @@ \fi} \def\scrn_help_register#text% - {\setbox\scrn_help_box\hbox - {\localframed[\??wp\currenthelp]{#text}}% + {\setbox\b_scrn_help_box\hbox{\inheritedhelpframed{#text}}% \definesymbol [\currenthelpname] - [\copy\scrn_help_box]% + [\copy\b_scrn_help_box]% \definefieldbody [\currenthelpname] [\c!type=push, - \c!width=\wd\scrn_help_box, - \c!height=\ht\scrn_help_box, - \c!depth=\dp\scrn_help_box, + \c!width=\wd\b_scrn_help_box, + \c!height=\ht\b_scrn_help_box, + \c!depth=\dp\b_scrn_help_box, \c!option=\v!hidden, \c!clickin=action(hide{\currenthelpname}), \c!closepage=action(hide{\currenthelpname}), \c!values=\currenthelpname]% - \setbox\scrn_help_box\hbox + \setbox\b_scrn_help_box\hbox {\fieldbody[\currenthelpname]}% - \ctxcommand{registerhelp(\number\scrn_help_n,"\currenthelpreference",\number\scrn_help_box)}} + \ctxcommand{registerhelp(\number\c_scrn_help_n,"\currenthelpreference",\number\b_scrn_help_box)}} \def\doifelsehelp - {\ifcase\scrn_help_n + {\ifcase\c_scrn_help_n \expandafter\firstoftwoarguments \else \expandafter\secondoftwoarguments \fi} \def\placehelp % was \helpdata - {\ifinpagebody\ifcase\scrn_help_n\else + {\ifinpagebody\ifcase\c_scrn_help_n\else \ctxcommand{collecthelp(255)}% rather hard coded ... bad \fi\fi} |