[dev-context] pack-rul.mkiv

2016-07-22 Thread Wolfgang Schuster

Hi,

\def\pack_framed_text_start_direct[#1]%
  {\usebodyfontparameter\framedtextparameter
   \iffirstargument
 \setupcurrentframedtext[#1]%
   \fi
-  \edef\p_framed_text_strut{\letframedtextparameter\c!strut}%
+  \edef\p_framed_text_strut{\framedtextparameter\c!strut}%
   \letframedtextparameter\c!strut\v!no
   \inheritedframedtextframed\bgroup
 \blank[\v!disable]%
 \let\\=\endgraf
 \useframedtextstyleandcolor\c!style\c!color
 \vskip-\strutdp % brrr why is this needed ... needs to be sorted 
out, see testcase 1

 \framedtextparameter\c!inner
 \ifx\p_framed_text_strut\v!no
\let\pack_framed_strut\relax
 \else
\let\pack_framed_strut\strut
 \fi
 \bgroup
 \aftergroup\pack_framed_text_stop_direct
 \afterassignment\ignorespaces
 \afterassignment\pack_framed_strut
 \let\next=}

Wolfgang
___
dev-context mailing list
dev-context@ntg.nl
https://mailman.ntg.nl/mailman/listinfo/dev-context


[dev-context] pack-rul.mkiv

2016-05-30 Thread Wolfgang Schuster

Hi Hans,

\def\pack_framed_start_content[#1]%
  {\bgroup
   \edef\currentframedcontent{#1}%
   \ifx\currentframedcontent\v!off
 \let\stopframedcontent\egroup
   \else
+\checkframedcontentparent
 \let\stopframedcontent\pack_framed_stop_content_indeed
 \expandafter\pack_framed_start_content_indeed
   \fi}

Wolfgang
___
dev-context mailing list
dev-context@ntg.nl
https://mailman.ntg.nl/mailman/listinfo/dev-context


[dev-context] pack-rul.mkiv: \fastlocalframed

2015-09-30 Thread Wolfgang Schuster

Hi,

\unexpanded\def\fastlocalframed[#1]#2[#3]#4% 3-4
  {\bgroup
   \edef\currentframed{#1}%
   \pack_framed_initialize
   \setbox\b_framed_normal\hbox{#4}%
   \edef\p_framed_region{\framedparameter\c!region}%
   \ifx\p_framed_region\v!yes % maybe later named
 \pack_framed_add_region
   \fi
-  \getparameters[\currentframed][#3]% no \expanded !
+  \setupcurrentframed[#3]%
   \edef\p_framed_rulethickness{\framedparameter\c!rulethickness}% also 
used in backgrounds
   \d_framed_frameoffset\framedparameter\c!frameoffset\relax % also 
used in backgrounds

   \edef\p_framed_frame{\framedparameter\c!frame}%
   \edef\p_framed_background{\framedparameter\c!background}%
   % not here, in calling macro: setups
   \pack_framed_remove_depth
   \ifx\p_framed_frame\v!overlay \else \ifx\p_framed_frame\v!none \else
 \ifx\p_framed_rulethickness\empty\else
\d_framed_linewidth\p_framed_rulethickness\relax
 \fi
 \pack_framed_add_outline % real or invisible frame
   \fi\fi
   \ifx\p_framed_background\empty \else
 \edef\p_framed_backgroundoffset{\framedparameter\c!backgroundoffset}%
 \d_framed_backgroundoffset
   \ifx\p_framed_backgroundoffset\v!frame
 \d_framed_frameoffset
   \else
 \p_framed_backgroundoffset
   \fi
 \edef\p_framed_component{\framedparameter\c!component}%
 \pack_framed_add_background
   \fi
   \pack_framed_restore_depth
   \box\b_framed_normal
   \egroup}

Wolfgang
___
dev-context mailing list
dev-context@ntg.nl
http://www.ntg.nl/mailman/listinfo/dev-context