- dev-context - NTG Mailing Lists

2 patches for grph-inc
by Peter Münster 21 Oct '12

21 Oct '12

Hi Hans, Could you please add these 2 patches (or something similar), because the grph-downsample module¹ would work much better then: 1.) To get the width and the height into the name of the file, because when the figure dimensions change, there must be a new conversion: --8<---------------cut here---------------start------------->8--- --- grph-inc.lua~ 2012-06-05 10:37:01.000000000 +0200 +++ grph-inc.lua 2012-07-31 22:40:39.214426838 +0200 @@ -528,6 +528,9 @@ if resolution and resolution ~= "" then -- the order might change newbase = newbase .. "_" .. resolution end + local width = figures.current().request.width + local height = figures.current().request.height + newbase = newbase .. "_" .. width .. "_" .. height -- -- see *, we had: -- --8<---------------cut here---------------end--------------->8--- 2.) To avoid crap in the width and height options: --8<---------------cut here---------------start------------->8--- --- grph-inc.mkiv~ 2012-07-20 23:26:52.000000000 +0200 +++ grph-inc.mkiv 2012-08-01 00:02:23.851094854 +0200 @@ -293,6 +293,10 @@ % \the\t_grph_include_local_settings \dostarttagged\t!image\empty + \edef\current_width{\externalfigureparameter\c!width}% + \edef\current_height{\externalfigureparameter\c!height}% + \def\nocrap##1{\doifnotemptyvalue{##1}{% + \the\dimexpr\csname##1\endcsname\relax}}% \ctxlua{figures.push { name = "\p_grph_include_name", label = "\p_grph_include_label", @@ -312,8 +316,8 @@ resolution = "\externalfigureparameter\c!resolution", color = "\internalspotcolorparent{\externalfigureparameter\c!color}", % hack is needed ["repeat"] = "\externalfigureparameter\c!repeat", - width = "\externalfigureparameter\c!width", % can be crap - height = "\externalfigureparameter\c!height", % can be crap + width = "\nocrap{current_width}", % no more crap + height = "\nocrap{current_height}", % no more crap } }% \ctxlua{figures.identify()}% % also mode: checkpresense only --8<---------------cut here---------------end--------------->8--- ¹ http://modules.contextgarden.net/grph-downsample TIA, -- Peter

2 6

Wrong counter settings
by Wolfgang Schuster 18 Oct '12

18 Oct '12

Hi Hans, in the following three files the additional check is necessary because otherwise changes for the counter (e.g. prefix=…) would also change the global counter settings from \setupstructurecounting. strc-not.mkvi: \appendtoks - \strc_notes_setup_counter\currentnotation + \ifx\currentnotation\empty \else + \strc_notes_setup_counter\currentnotation + \fi \to \everysetupnotation strc-enu.mkvi: \appendtoks - \strc_enumerations_setup_counter\currentenumeration + \ifx\currentenumeration\empty \else + \strc_enumerations_setup_counter\currentenumeration + \fi \to \everysetupenumeration strc-lab.mkvi \appendtoks - \strc_labels_setup_counter\currentlabel + \ifx\currentlabel\empty \else + \strc_labels_setup_counter\currentlabel + \fi \to \everysetuplabel In the following two files you can remove the \strc_counters_check_setup\… line because it’s already called from \strc_counter_setup_using_parameter in the previous line. strc-flt.mkvi: \appendtoks \let\currentfloat\currentfloatcaption \ifx\currentfloat\empty \else \strc_counter_setup_using_parameter\currentfloatcaption\floatcaptionparameter - \strc_counters_check_setup\currentfloatcaption \fi \to \everysetupfloatcaption strc-mat.mkiv: \appendtoks \strc_counter_setup_using_parameter\v!formula\formulaparameter - \strc_counters_check_setup\v!formula % yes or no \to \everysetupformula Wolfgang

2 1

\note doesn’t work when notes are placed in the text
by Wolfgang Schuster 17 Oct '12

17 Oct '12

Hi, in the following example the \note commands shows only unknown references. It has something to do with “location=text” because “location=page” or “location=column” have working references. \setupfootnotes[location=text] \starttext Second Note\note[footnote][2] First Note\note[footnote][1] \setnotetext[footnote][1]{Footnote 1} \setnotetext[footnote][2]{Footnote 2} Second Note\note[footnote][2] First Note\note[footnote][1] \placenotes[footnote] \stopfootnote I tried to find a fix for thus bug but wasn’t able to find a good solution. There is a little hack below which works (it is only used for “location=text” and “location=none”) but I guess there is a better solution. \unexpanded\setvalue{\??constructionnotehandler\v!notation:\v!note}% in the running text {\ifnotesenabled % do be done elsewhere % %let\currentnote\currentconstructionmain \let\currentnote\currentconstruction % else wrong inheritance % \iftrialtypesetting \strc_notes_inject_dummy \else \begingroup \edef\currentnotenumber{\ctxcommand{storenote("\currentnote",\currentconstructionlistentry)}}% \settrue\processingnote \ifconditional\c_strc_notes_skip \globallet\lastnotesymbol\strc_notes_inject_symbol + \ifconditional\c_strc_notes_delayed + \currentconstructionsynchronize + \fi \else \iftypesettinglines % otherwise problems with \type <crlf> {xxx} \ignorelines % makes footnotes work in \startlines ... \stoplines \fi \ifconditional\c_strc_notes_symbol \strc_notes_inject_symbol \else \unskip\unskip \globallet\lastnotesymbol\strc_notes_inject_symbol \fi \fi \ifconditional\postponingnotes % todo: per note class \global\settrue\postponednote \else\ifconditional\inlocalnotes % todo: per note class \global\settrue\postponednote \else \handlenoteinsert\currentnote\currentnotenumber % either an insert or just delayed \fi\fi \endgroup \fi \fi \ifconditional\c_strc_notes_skip \global\setfalse\c_strc_notes_skip \else \kern\notesignal\relax % \relax is needed to honor spaces \fi} Wolfgang

2 1

Subfootnotes
by Wolfgang Schuster 15 Oct '12

15 Oct '12

Hi Hans, subfootnotes don’t work because 1. \noteparameter has no parent set which can be used for undefined values which can be solved with the extra line in \strc_define_commands_notation \unexpanded\def\strc_define_commands_notation#1#2#3% current level parent {\doifelsenothing{#3} {\normalexpanded{\defineconstruction[#1][\s!handler=\v!notation,\c!level=#2]}% \setevalue{\??notation#1:\s!parent}{\??notation}}% {\normalexpanded{\defineconstruction[#1][#3][\s!handler=\v!notation,\c!level=#2]}% + \setevalue{\??note #1:\s!parent}{\??note #3}% \setevalue{\??notation#1:\s!parent}{\??notation#3}}% \setuevalue{\e!next #1}{\strc_notations_next }% \setuevalue{\c!reset#1}{\strc_notations_reset }% %setuevalue{\c!set #1}{\strc_notations_set }% %setuevalue {#1}{\strc_notations_command{\currentnotation}}% %setuevalue{\e!start#1}{\strc_notations_start {\currentnotation}{#1}}% \setuevalue {#1}{\strc_notations_command{#1}}% \setuevalue{\e!start#1}{\strc_notations_start {#1}{#1}}% okay? \setuevalue{\e!stop #1}{\strc_notations_stop }} 2. the name for the insert is wrong because it uses the name of the command (e.g. subfootnote) and not the name of the note type, e.g. in this code block \namedinsertionnumber and \page_inserts_set_location get “subfootnote” as argument but it has to be always “footnote”. \def\strc_notes_set_location_text % we don't use inserts anyway (e.g. endnotes) {\settrue\c_strc_notes_delayed \ctxcommand{setnotestate("\currentnote","store")}% \page_inserts_set_location\currentnote\v!text % \setupinsertion[\currentnote][\c!location=\v!text]% \global\count\namedinsertionnumber\currentnote\zerocount \global\dimen\namedinsertionnumber\currentnote\maxdimen \global\skip \namedinsertionnumber\currentnote\zeropoint} One way to fix is to store the note type in a key when \definenote is called (e.g. “insert=\currentote” but only when \footnote is created and not for \subfootnote) and use this key as argument for \namedinsertionnumber etc. Wolfgang

4 4

font-new.mkiv
by Wolfgang Schuster 15 Oct '12

15 Oct '12

Hi, \def\strc_formulas_handle_sub_numbering {\iftrialtypesetting \strc_counters_save\v!formula - \strc_formulas_handle_sub_numbering + \strc_formulas_handle_sub_numbering_indeed \strc_counters_restore\v!formula \else - \strc_formulas_handle_sub_numbering + \strc_formulas_handle_sub_numbering_indeed \fi} Wolfgang

2 1

pack-com.mkiv
by Wolfgang Schuster 14 Oct '12

14 Oct '12

Hi, a typo (missing “other” \pack_topofeach_two) in and to many hash signs: -\def\pack_topofeachother_one{\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_topofeach_two \hbox} +\def\pack_topofeachother_one{\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_topofeachother_two\hbox} \def\pack_sidebyside_one {\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_sidebyside_two\hbox} -\def\pack_topofeachother_two{\setbox2\box\nextbox\halign{\hss####\hss\cr\box0\cr\box2\cr}\egroup\egroup} -\def\pack_sidebyside_two {\setbox2\box\nextbox\valign{\vss####\vss\cr\box0\cr\box2\cr}\egroup\egroup} +\def\pack_topofeachother_two{\setbox2\box\nextbox\halign{\hss##\hss\cr\box0\cr\box2\cr}\egroup\egroup} +\def\pack_sidebyside_two {\setbox2\box\nextbox\valign{\vss##\vss\cr\box0\cr\box2\cr}\egroup\egroup} Wolfgang

1 0

symb-run.mkiv
by Wolfgang Schuster 06 Oct '12

06 Oct '12

Hi Hans, -\unexpanded\gdef\symb_show_set - {\dosingleargument\doshowsymbolset} +\unexpanded\gdef\showsymbolset + {\dosingleargument\symb_show_set} Wolfgang

1 0

Reset counter with each heading
by Wolfgang Schuster 02 Oct '12

02 Oct '12

Hi Hans, can you add a option for the “way” key for \setupcounter which resets a counter for every section independent of the level which was requested by Peter Schorsch on the mailing list. I looked into the source file (strc-num.lua and strc-sec.mkiv) and only four lines have to be changed to add this feature (I used “head” for the name because there was a predefined variable). strc-sec.mkiv: \setvalue{\??headlevel\v!block}{0} \setvalue{\??headlevel\v!none }{-1} \setvalue{\??headlevel\v!text }{-2} +\setvalue{\??headlevel\v!head }{-3} strc-num.lua: function counters.setown(name,n,value) local cd = counterdata[name] if cd then local d = allocate(name,n) d.own = value d.number = (d.number or d.start or 0) + (d.step or 0) local level = cd.level if not level or level == -1 then -- -1 is signal that we reset manually - elseif level > 0 then + elseif level > 0 or level == -3 then check(name,d,n+1) elseif level == 0 then -- happens elsewhere, check this for block end synchronize(name,d) end end function counters.add(name,n,delta) local cd = counterdata[name] if cd and (cd.state == v_start or cd.state == "") then local data = cd.data local d = allocate(name,n) d.number = (d.number or d.start or 0) + delta*(d.step or 0) -- d.own = nil local level = cd.level if not level or level == -1 then -- -1 is signal that we reset manually if trace_counters then report_counters("adding, name: %s, level: manually, action: no checking",name) end elseif level == -2 then -- -2 is signal that we work per text if trace_counters then report_counters("adding, name: %s, level: text, action: checking",name) end check(name,data,n+1) - elseif level > 0 then + elseif level > 0 or level == -3 then -- within countergroup if trace_counters then report_counters("adding, name: %s, level: %s, action: checking within group",name,level) end check(name,data,n+1) elseif level == 0 then -- happens elsewhere if trace_counters then report_counters("adding, name: %s, level: %s, action: no checking",name,level) end else if trace_counters then report_counters("adding, name: %s, level: unknown, action: no checking",name) end end synchronize(name,d) return d.number -- not needed end return 0 end function counters.check(level) for name, cd in next, counterdata do - if cd.level == level then + if cd.level == level or level > 0 and cd.level == -3 then if trace_counters then report_counters("resetting, name: %s, level: %s",name,level) end reset(name) end end end The question for the counter.check function is if it should also reset the counter for each new sectionblock (replace my change above with “if cd.level == level then”) or only at the start of a new section (that’s how my change behaves now). Wolfgang

2 2

supp-mat.mkiv
by Wolfgang Schuster 16 Sep '12

16 Sep '12

Hi Hans, \let\normalsuperscript \Usuperscript \let\normalsubscript \Usubscript \let\normalstartimath \Ustartmath \let\normalstopimath \Ustopmath \let\normalstartdmath \Ustartdisplaymath -\let\normalstopdmath \Ustopmath +\let\normalstopdmath \Ustopdisplaymath \def\normalmathaligntab{&} % \let\normalmathaligntab\aligntab does to work well in a let to & (a def works ok) \let\normalsuper \Usuperscript % obsolete \let\normalsuber \Usubscript % obsolete \let\startimath \Ustartmath \let\stopimath \Ustopmath \let\startdmath \Ustartdisplaymath -\let\stopdmath \Ustopmath +\let\stopdmath \Ustopdisplaymath Wolfgang

2 1

Spurious parameter in m-visual.mkiv
by Marco 16 Jul '12

16 Jul '12

Hi! There's a spurious parameter in \ruledbaseline, which breaks the visual module. I guess it's a leftover from the clean-up. I assume the parameter can simply be omitted (untested): \unexpanded\def\ruledbaseline {\vrule \!!width \zeropoint \bgroup \dontinterfere \doglobal\increment\ruledbaselines \scratchdimen\nofruledbaselines\baselineskip \setbox\scratchbox\normalvbox to 2\scratchdimen {\leaders \normalhbox {\strut \vrule \!!height \testrulewidth \!!depth \testrulewidth \!!width 120\points} \normalvfill}% \smashbox\scratchbox \advance\scratchdimen \strutheightfactor\baselineskip \setbox\scratchbox\normalhbox {\normalhskip -48\points \normalhbox to 24\points {\normalhss - {\ttxx#1}% - \ruledbaselines + {\ttxx\ruledbaselines}% \normalhskip6\points}% \raise\scratchdimen\box\scratchbox}% \smashbox\scratchbox \box\scratchbox \egroup} Marco

2 1