[latex3-commits] [git/LaTeX3-latex3-pdfresources] textfields: merged (bd6dd33)

[Ulrike Fischer]

Repository : https://github.com/latex3/pdfresources
On branch  : textfields
Link       : https://github.com/latex3/pdfresources/commit/bd6dd336ba522d766bb3195521bf306c9f858f2b

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

commit bd6dd336ba522d766bb3195521bf306c9f858f2b
Merge: 268f96c 711e597
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Mon Apr 12 19:10:34 2021 +0200

    merged


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

bd6dd336ba522d766bb3195521bf306c9f858f2b
 experiments/testfield1.tex | 107 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 93 insertions(+), 14 deletions(-)

diff --cc experiments/testfield1.tex
index 82c2307,55f74e5..c70a477
--- a/experiments/testfield1.tex
+++ b/experiments/testfield1.tex
@@@ -60,7 -64,7 +64,7 @@@
             \c_space_tl
             Tf
             \c_space_tl
--           \l__pdffield_text_color_tl
++           \l__pdffield_text_fontcolor_tl
             \c_space_tl
             \l__pdffield_text_DAextra_tl
           )
@@@ -153,7 -157,7 +157,7 @@@
  \tl_new:N  \l__pdffield_text_fontname_tl
  \tl_new:N  \l__pdffield_text_DAextra_tl
  \dim_new:N \l__pdffield_text_fontsize_dim
--\tl_new:N  \l__pdffield_text_color_tl
++\tl_new:N  \l__pdffield_text_fontcolor_tl
  
  \keys_define:nn { pdffield / text }
    {
@@@ -197,6 -201,6 +201,17 @@@
      ,font .initial:n     = {Helv}
      ,fontsize .dim_set:N = \l__pdffield_text_fontsize_dim
      ,fontsize .initial:n = {10bp}
++    ,charsize .meta:n = {fontsize=#1}
++    ,fontcolor .code:n =
++       {
++         \__pdffield_color_export:nN {#1} \l__pdffield_text_fontcolor_tl
++         \str_case:Vn \l_pdffield_colormodel_str
++           {
++             {rgb} {\tl_put_right:Nn \l__pdffield_text_fontcolor_tl{~rg}}
++             {cmyk}{\tl_put_right:Nn \l__pdffield_text_fontcolor_tl{~k}}
++           }
++       },
++    fontcolor .initial:n = black,
      %not really useful, seems to affect only the value, not the input ...
      ,DAextra .tl_set:N = \l__pdffield_text_DAextra_tl
    }
@@@ -264,16 -268,16 +279,6 @@@
      align / center .code:n = \pdfdict_put:nnn { l__pdffield/text/field }{Q}{1},
      align / right  .code:n = \pdfdict_put:nnn { l__pdffield/text/field }{Q}{2},
      align .initial:n = left,
--    color .code:n =
--       {
--         \__pdffield_color_export:nN {#1} \l__pdffield_text_color_tl
--         \str_case:Vn \l_pdffield_colormodel_str
--           {
--             {rgb} {\tl_put_right:Nn \l__pdffield_text_color_tl{~rg}}
--             {cmyk}{\tl_put_right:Nn \l__pdffield_text_color_tl{~k}}
--           }
--       },
--    color .initial:n = black,
      bordercolor .code:n =
        {
           \__pdffield_color_export:nN {#1} \l__pdffield_tmpa_tl
@@@ -289,6 -293,6 +294,10 @@@
           \__pdffield_color_export:nN {#1} \l__pdffield_tmpa_tl
           \pdfdict_put:nnx {l__pdffield/text/annot/MK}{BG}{[\l__pdffield_tmpa_tl]}
        },
++    rotation .code:n =    
++      {
++         \pdfdict_put:nnx {l__pdffield/text/annot/MK}{R}{\int_eval:n{#1}}
++      },
    }
  
  
@@@ -369,10 -426,21 +431,27 @@@
  %\setmainfont{lmroman10-regular.otf} %replaced by arial CIDFontType0
  \begin{document}
  \ExplSyntaxOn
++
 +avb \sffamily abc
 +\bitset_set_true:Nn  \l__pdffield_Ff_bitset {DoNotScroll}
 +\__pdffield_text_add:n {width=4cm,name=default,height=\baselineskip}
 +
+ \ifluatex
+ avb \sffamily abc \__pdffield_setup_currentfont:n {blub}
+ \fontspec{Mukta}  \__pdffield_setup_currentfont:n {mukta}
+ \int_step_inline:nnn{"800}{"A00}
+          {
+            \directlua{pdf.includechar(font.current(),"0x\int_to_hex:n{#1}")}
+          }
+  \fi
+ aaaaaa
+ 
+ \__pdffield_text_add:n {setfieldflags=Multiline,width=4cm,height=3cm,name=default}
+ 
+ \par
+ \__pdffield_text_add:n {name=comb,setfieldflags={Comb,Password},maxlen=6,width=4cm,height=\baselineskip}
+ 
++
  \ExplSyntaxOff
  \end{document}
  %\pdfmanagement_add:nxx{Catalog/AcroForm/DR/Font}{MyBlub}{\pdf_object_ref_last:}
@@@ -420,7 -488,7 +499,7 @@@ a
  %\pdfmanagement_add:nxx{Catalog/AcroForm/DR/Font}{F\__pdffield_fontname:}{\__pdffield_fontobjnum:\c_space_tl0 \c_space_tl R}
  %\pdfdict_put:nnn {l__pdffield/text/annot}{MK}{<</BC[1~0~0]/BG[1~1~1]>>}
  %\pdfdict_put:nnn {l__pdffield/text/annot}{BS}{<</W~1 /S/S>>}
--%zzz\__pdffield_text_add:n {name=blub1,width=4cm,height=15pt,color=red}
++%zzz\__pdffield_text_add:n {name=blub1,width=4cm,height=15pt,fontcolor=red}
  
  %\sffamily
  %\newsavebox\textbox