[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid keyvals in l3image (def96a5)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/def96a5c27454072eb76d4d733f644cd051c0f69

>---------------------------------------------------------------

commit def96a5c27454072eb76d4d733f644cd051c0f69
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Feb 15 19:11:21 2019 +0000

    Avoid keyvals in l3image
    
    wrong level ...


>---------------------------------------------------------------

def96a5c27454072eb76d4d733f644cd051c0f69
 l3trial/l3image/l3image.dtx |   33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/l3trial/l3image/l3image.dtx b/l3trial/l3image/l3image.dtx
index 43d40e8..d6b845c 100644
--- a/l3trial/l3image/l3image.dtx
+++ b/l3trial/l3image/l3image.dtx
@@ -52,23 +52,6 @@
 %
 % \section{\pkg{l3image} documentation}
 %
-% \begin{variable}{interpolate}
-%   Indicates whether interpolation should be applied to bitmap image files.
-%   This key will be ignored for vector image files.
-% \end{variable}
-%
-% \begin{variable}{page}
-%   The page number of an image to be used when including a multi-page
-%   PDF file as an image. This key will be ignored for non-PDF images.
-% \end{variable}
-%
-% \begin{variable}{pagebox}
-%   The page box setting used when determining the bounding box of an image:
-%   used for |.pdf| images which may present multiple page boxes. Valid
-%   settings are |artbox|, |bleedbox|, |cropbox| (the standard setting),
-%   |mediabox| and |trimbox|.
-% \end{variable}
-%
 % \subsection{Driver functions}
 %
 % Inclusion of image files requires a range of low-level data be passed to
@@ -217,21 +200,15 @@
 %     \l_image_page_int        ,
 %     \l_image_pagebox_tl
 %   }
-%   Keys which control features of images. The standard value of |[pagebox|
+%   Keys which control features of images. The standard value of |pagebox|
 %   set up here should match the default for the drivers themselves: in
 %   the absence of any other setting the |cropbox| should be used.
 %    \begin{macrocode}
+\tl_new:N \l_image_decodearray_tl 
 \tl_new:N \l_image_pagebox_tl
-\keys_define:nn { image }
-  {
-    decode      .tl_set:N   = \l_image_decodearray_tl        ,
-    interpolate .bool_set:N = \l_image_interpolate_bool ,
-    page        .int_set:N  = \l_image_page_int         ,
-    pagebox     .choices:nn =
-      { artbox , bleedbox , cropbox , mediabox , trimbox }
-      { \tl_set:Nn \l_image_pagebox_tl {#1} },
-    pagebox     .initial:n  = cropbox
-  }
+\tl_new:N \l_image_interpolate_bool
+\tl_set:Nn \l_image_pagebox_tl { cropbox }
+\int_new:N \l_image_page_int
 %    \end{macrocode}
 % \end{macro}
 %