summaryrefslogtreecommitdiff
path: root/tex/context/base/mkiv/grph-inc.mkiv
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2018-01-17 13:51:05 +0100
committerContext Git Mirror Bot <phg42.2a@gmail.com>2018-01-17 13:51:05 +0100
commit84591a31c39887dbf582df5d535f1de1a115fd62 (patch)
tree1c4613a1c79db3cdfb41b977c64e993492fbdd88 /tex/context/base/mkiv/grph-inc.mkiv
parenta16cd078a5cc00d7c789093b5209b6f8d2dfdb1a (diff)
downloadcontext-84591a31c39887dbf582df5d535f1de1a115fd62.tar.gz
2018-01-17 13:16:00
Diffstat (limited to 'tex/context/base/mkiv/grph-inc.mkiv')
-rw-r--r--tex/context/base/mkiv/grph-inc.mkiv18
1 files changed, 14 insertions, 4 deletions
diff --git a/tex/context/base/mkiv/grph-inc.mkiv b/tex/context/base/mkiv/grph-inc.mkiv
index a44d81e15..677883fbb 100644
--- a/tex/context/base/mkiv/grph-inc.mkiv
+++ b/tex/context/base/mkiv/grph-inc.mkiv
@@ -872,18 +872,28 @@
[\v!inline]
[\c!height=\lineheight]
-\defineexternalfigure
+\definemeasure
[\v!combination]
- [\c!width=\dimexpr(%
- \textwidth-\effectiveleftskip-\effectiverightskip
+ [(\textwidth
+ -\effectiveleftskip
+ -\effectiverightskip
-\numexpr\combinationparameter\c!nx-\plusone\relax\dimexpr\combinationparameter\c!distance\relax
- )/\combinationparameter\c!nx\relax]
+ )/\combinationparameter\c!nx]
+
+\defineexternalfigure
+ [\v!combination]
+ [\c!width=\measure{\v!combination}]
% \startcombination[nx=2,ny=1]
% {\externalfigure[dummy][combination]} {}
% {\externalfigure[dummy][combination]} {}
% \stopcombination
+% \startcombination[nx=2,ny=1]
+% {\externalfigure[dummy][width=\measure{combination}]} {}
+% {\externalfigure[dummy][width=\measure{combination}]} {}
+% \stopcombination
+
% \startcombination[nx=2,ny=2]
% {\externalfigure[dummy][combination]} {}
% {\externalfigure[dummy][combination]} {}