diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv | 101 |
1 files changed, 28 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv b/Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv index 20e7c11a61b..677883fbb59 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/grph-inc.mkiv @@ -20,15 +20,7 @@ \writestatus{loading}{ConTeXt Graphic Macros / Figure Inclusion} -\ifcase\contextlmtxmode - \registerctxluafile{grph-inc}{} -\else - \registerctxluafile{grph-img}{} - \registerctxluafile{grph-inc}{} - \registerctxluafile{grph-bmp}{} - \registerctxluafile{grph-chk}{} -\fi - +\registerctxluafile{grph-inc}{} \registerctxluafile{grph-con}{} \registerctxluafile{grph-fil}{} \registerctxluafile{grph-mem}{} @@ -40,7 +32,7 @@ %D Including graphics is complicated by the fact that we need to locate them first, %D optionally manipulate them and scale then next. Lookups are to be done as efficient %D as possible and inclusion of the data might happens only once. In \MKIV\ much of this -%D is delegated to the \LUA\ end. There is not so much less code as in \MKII\ but it's +%D is delegated to the \LUA\ end. There is nor so much less code as in \MKII\ but it's %D more powerful, flexible, pluggable and some of the extended functionality has been %D moved from modules to the core. The overall functionality is rather stable and has %D not changed much over the years. @@ -113,9 +105,6 @@ \c!align =\v!none, % New, for Tacos extremely large graphics. \c!crossreference =\v!no, \c!transform =\v!auto, - \c!userpassword =, - \c!ownerpassword =, - \c!compact =, ] %D Defining figures. @@ -212,7 +201,7 @@ {\grph_include_use_indeed{#1}{#2}{#3}{#4}}}}} \def\grph_include_use_indeed#1#2#3#4% - {\dodoglobal\setvalue{\??externalfigureinstance#1}{\grph_include_setup{#2}{#3}{#4}}% + {\setvalue{\??externalfigureinstance#1}{\grph_include_setup{#2}{#3}{#4}}% \grph_include_analyze_collection[#2][#4]} % inclusion @@ -328,30 +317,27 @@ % \dostarttagged\t!image\empty \clf_figure_push { - name {\p_grph_include_name}% - label {\ifx\p_label\empty\p_grph_include_label\else\p_label\fi}% - page {\externalfigureparameter\c!page}% - file {\externalfigureparameter\c!file}% - size {\externalfigureparameter\c!size}% - object {\externalfigureparameter\c!object}% - prefix {\externalfigureparameter\c!prefix}% - cache {\externalfigureparameter\c!cache}% - format {\externalfigureparameter\c!method}% - preset {\externalfigureparameter\c!prefix}% - controls {\externalfigureparameter\c!controls}% - resources {\externalfigureparameter\c!resources}% - preview {\externalfigureparameter\c!preview}% - display {\externalfigureparameter\c!display}% - mask {\externalfigureparameter\c!mask}% - conversion {\externalfigureparameter\c!conversion}% - resolution {\externalfigureparameter\c!resolution}% - color {\externalfigureparameter\c!color}% unprocessed raw key - arguments {\externalfigureparameter\c!arguments}% used for converters - repeat {\externalfigureparameter\c!repeat}% - transform {\externalfigureparameter\c!transform}% - compact {\externalfigureparameter\c!compact}% experiment, share fonts - userpassword {\externalfigureparameter\c!userpassword}% - ownerpassword{\externalfigureparameter\c!ownerpassword}% + name {\p_grph_include_name}% + label {\ifx\p_label\empty\p_grph_include_label\else\p_label\fi}% + page {\externalfigureparameter\c!page}% + file {\externalfigureparameter\c!file}% + size {\externalfigureparameter\c!size}% + object {\externalfigureparameter\c!object}% + prefix {\externalfigureparameter\c!prefix}% + cache {\externalfigureparameter\c!cache}% + format {\externalfigureparameter\c!method}% + preset {\externalfigureparameter\c!prefix}% + controls {\externalfigureparameter\c!controls}% + resources {\externalfigureparameter\c!resources}% + preview {\externalfigureparameter\c!preview}% + display {\externalfigureparameter\c!display}% + mask {\externalfigureparameter\c!mask}% + conversion {\externalfigureparameter\c!conversion}% + resolution {\externalfigureparameter\c!resolution}% + color {\externalfigureparameter\c!color}% unprocessed raw key + arguments {\externalfigureparameter\c!arguments}% used for converters + repeat {\externalfigureparameter\c!repeat}% + transform {\externalfigureparameter\c!transform}% \ifx\p_width\empty \else width \dimexpr\p_width\relax \fi @@ -603,9 +589,9 @@ \def\grph_include_set_mode {\ifcase\figurestatus - \globalresetsystemmode\v!figure % todo, also: \v!resource + \global\resetsystemmode\v!figure % todo, also: \v!resource \else - \globalsetsystemmode \v!figure % todo, also: \v!resource + \global\setsystemmode \v!figure % todo, also: \v!resource \fi} \appendtoks @@ -655,41 +641,10 @@ \unexpanded\def\docheckfiguremps #1{\global\setbox\foundexternalfigure\vpack{\convertMPtoPDF{#1}11}} \unexpanded\def\docheckfiguremprun #1#2{\global\setbox\foundexternalfigure\vpack{\useMPrun{#1}{#2}}} -% \unexpanded\def\relocateexternalfigure % easier here than in lua -% {\global\setbox\foundexternalfigure\vpack to \ht\foundexternalfigure\bgroup -% \vss -% \ht\foundexternalfigure\zeropoint -% \hpack to \wd\foundexternalfigure\bgroup -% \box\foundexternalfigure -% \hss -% \egroup -% \egroup} - -\unexpanded\def\relocateexternalfigure +\unexpanded\def\relocateexternalfigure % easier here than in lua {\global\setbox\foundexternalfigure\vpack to \ht\foundexternalfigure\bgroup - % - % The \vss can (!) introduce 1 sp excess visible in xform which in itself - % is not that important but some don't like these cosmetic side effects, for - % instance we can get: - % - % vss : \vbox(845.1575+0.0)x597.23125, glue set 845.15747fil, direction TLT - % vskip : \vbox(845.1575+0.0)x597.23125, direction TLT - % - % or - % - % 1 0 0 1 0 0.00003 cm - % 1 0 0 1 0 0 cm - % - % This is a known property of using glue and can even depend on the architecture - % (float implementation). Anyway, let's for now use a skip. Of course this can - % shift the issue elsewhere, as vss is used a lot elsewhere. - % - % \vss - \vkern\ht\foundexternalfigure - % - % \parfillskip\zeropoint + \vss \ht\foundexternalfigure\zeropoint - \dp\foundexternalfigure\zeropoint \hpack to \wd\foundexternalfigure\bgroup \box\foundexternalfigure \hss |