summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/grph-inc.mkiv
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/grph-inc.mkiv')
-rw-r--r--Master/texmf-dist/tex/context/base/grph-inc.mkiv23
1 files changed, 11 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/context/base/grph-inc.mkiv b/Master/texmf-dist/tex/context/base/grph-inc.mkiv
index 8557bbb0b85..e8b63cc4bb9 100644
--- a/Master/texmf-dist/tex/context/base/grph-inc.mkiv
+++ b/Master/texmf-dist/tex/context/base/grph-inc.mkiv
@@ -297,11 +297,12 @@
%
\edef\p_width {\externalfigureparameter\c!width}%
\edef\p_height{\externalfigureparameter\c!height}%
+ \edef\p_label {\externalfigureparameter\c!label}%
%
\dostarttagged\t!image\empty
\ctxlua{figures.push {
name = "\p_grph_include_name",
- label = "\p_grph_include_label",
+ label = "\ifx\p_label\empty\p_grph_include_label\else\p_label\fi",
page = "\externalfigureparameter\c!page",
size = "\externalfigureparameter\c!size",
object = "\externalfigureparameter\c!object",
@@ -535,17 +536,13 @@
\c!offset=\v!overlay,\c!width=\v!fit,\c!height=\v!fit]
{\blank[\v!disable]#1\endgraf\removelastskip}} % disable should stay here!
-\def\grph_include_process_mps#1% retrofit into mkii
- {\global\setbox\foundexternalfigure\vbox{\convertMPtoPDF{#1}11}}
+% used al lua end:
-\def\grph_include_process_cld#1%
- {\global\setbox\foundexternalfigure\vbox{\cldprocessfile{#1}}}
-
-\unexpanded\def\docheckfigurebuffer #1{\grph_include_process_tex{\getbuffer[#1]}} % used al lua end
-\unexpanded\def\docheckfiguretex #1{\grph_include_process_tex{\input{#1}}} % used al lua end
-\unexpanded\def\docheckfigurecld #1{\grph_include_process_cld{#1}} % used al lua end
-\unexpanded\def\docheckfiguremps #1{\grph_include_process_mps{#1}} % used al lua end
-\unexpanded\def\docheckfiguremprun #1#2{\grph_include_process_tex{\useMPrun{#1}{#2}}} % used al lua end
+\unexpanded\def\docheckfigurebuffer #1{\grph_include_process_tex{\getbuffer[#1]}}
+\unexpanded\def\docheckfiguretex #1{\grph_include_process_tex{\input{#1}}}
+\unexpanded\def\docheckfigurecld #1{\global\setbox\foundexternalfigure\vbox{\cldprocessfile{#1}}}
+\unexpanded\def\docheckfiguremps #1{\global\setbox\foundexternalfigure\vbox{\convertMPtoPDF{#1}11}}
+\unexpanded\def\docheckfiguremprun #1#2{\global\setbox\foundexternalfigure\vbox{\useMPrun{#1}{#2}}}
\unexpanded\def\relocateexternalfigure % easier here than in lua
{\global\setbox\foundexternalfigure\vbox to \ht\foundexternalfigure\bgroup
@@ -610,7 +607,9 @@
\letexternalfigureparameter\c!offset\v!overlay
\letexternalfigureparameter\c!width \figurewidth
\letexternalfigureparameter\c!height\figureheight
- \inheritedexternalfigureframed{\vfilll\box\foundexternalfigure}%
+% \letexternalfigureparameter\c!align \v!middle
+% \letexternalfigureparameter\c!autowidth\v!no
+ \inheritedexternalfigureframed{\box\foundexternalfigure}%
\fi
\fi\fi
\fi