← Back to branch summary

~reviczky/context/mirror

« back to all changes in this revision

Viewing changes to tex/context/base/mkiv/pack-mrl.mkxl

  • Committer: Context Git Mirror Bot
  • Author(s): Hans Hagen
  • Date: 2020-08-11 14:54:53 UTC
  • Revision ID: git-v1:4f97d7d7cd942dfe76cd4bb54fc3f5b890654235
2020-08-11 15:59:00

Show diffs side-by-side

added added

removed removed

Lines of Context:
tex/context/base/mkiv/pack-mrl.mkxl
52
52
   \edef\p_depth {\directblackrulesparameter\c!depth }%
53
53
   \ifx\p_height\v!max
54
54
     \setstrut
55
 
   \else\ifx\p_depth\v!max
 
55
   \orelse\ifx\p_depth\v!max
56
56
     \setstrut
57
 
   \fi\fi
 
57
   \fi
58
58
   \useblackrulesstyleandcolor\c!style\c!color
59
59
   \ifcsname\??blackruletype\directblackrulesparameter\c!type\endcsname
60
60
     \lastnamedcs
61
61
   \else
62
62
     \vrule
63
63
   \fi
64
 
   \ifx\p_width \v!max\s!width \emwidth\else\ifx\p_width \empty\else\s!width \p_width \fi\fi
65
 
   \ifx\p_height\v!max\s!height\strutht\else\ifx\p_height\empty\else\s!height\p_height\fi\fi
66
 
   \ifx\p_depth \v!max\s!depth \strutdp\else\ifx\p_depth \empty\else\s!depth \p_depth \fi\fi
 
64
   \ifx\p_width \v!max\s!width \emwidth\orelse\ifx\p_width \empty\else\s!width \p_width \fi
 
65
   \ifx\p_height\v!max\s!height\strutht\orelse\ifx\p_height\empty\else\s!height\p_height\fi
 
66
   \ifx\p_depth \v!max\s!depth \strutdp\orelse\ifx\p_depth \empty\else\s!depth \p_depth \fi
67
67
   \egroup}
68
68
 
69
69
\setupblackrules
283
283
   \linewidth\dimexpr\directthinrulesparameter\c!rulethickness/\plustwo\relax
284
284
   \ifzeropt\linewidth
285
285
     \c_pack_thinrules_type\zerocount
286
 
   \else\ifx\p_frame\v!on
 
286
   \orelse\ifx\p_frame\v!on
287
287
     \c_pack_thinrules_type\expandnamespaceparameter\??thinrulealternatives\directthinrulesparameter\c!alternative\v!b\relax
288
288
   \else
289
289
     \c_pack_thinrules_type\zerocount
290
 
   \fi\fi
 
290
   \fi
291
291
   \ifnum\c_pack_thinrules_type=\plusone
292
292
     \ifx\p_height\v!max
293
293
       \scratchheight\strutht
755
755
     \ifx\p_width\v!fit
756
756
       \scratchdistance\zeropoint
757
757
       \hbox
758
 
     \else\ifx\p_width\v!broad
 
758
     \orelse\ifx\p_width\v!broad
759
759
       \hbox
760
760
     \else
761
761
       \hbox to \directfillinrulesparameter\c!width
762
 
     \fi\fi
 
762
     \fi
763
763
     \bgroup
764
764
       \usefillinrulesstyleandcolor\c!style\c!color
765
765
       \strut