media9 (20jul15)

git-svn-id: svn://tug.org/texlive/trunk@37909 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 97 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 9a2760963db..6a12b7a1e51 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-20
+	* v0.55
+	* fix: expl3-related adjustments
+
 2015-06-23
 	* v0.54
 	* fix: flashing of videos when played in a loop
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 39a872a6df6..d3bcc9f3c94 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index c220d3a8a22..8bedbff3730 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -43,11 +43,11 @@
 \RequirePackage{atenddvi}
 \RequirePackage{tikz}
 
-\def\g@mix@date@tl{2015/06/23}
-\def\g@mix@version@tl{0.54}
+\def\g@mix@date@tl{2015/07/20}
+\def\g@mix@version@tl{0.55}
 
-\def\g@mix@liiikerneldate{2014/07/20}
-\def\g@mix@liiipkgdate{2014/07/20}
+\def\g@mix@liiikerneldate{2015/06/15}
+\def\g@mix@liiipkgdate{2015/06/15}
 
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
 {acrobat-9/X compatible media}
@@ -194,12 +194,14 @@
   activate / pagevisible .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/PV}},
   activate / pageopen .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/PO}},
   activate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgact_tl{/XA}},
+%  activate .value_required:n = true,
   activate .value_required:,
 
   deactivate .choice:,
   deactivate / pageinvisible .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/PI}},
   deactivate / pageclose .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/PC}},
   deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_pkgdeact_tl{/XD}},
+%  deactivate .value_required:n = true,
   deactivate .value_required:,
 
   transparent .choices:nn = {true,false}{
@@ -232,6 +234,7 @@
       \tl_set:Nn\l_mix_pkgwd_tl{}
     }
   },
+%  width .value_required:n = true,
   width .value_required:,
 
   height .code:n = {
@@ -241,6 +244,7 @@
       \tl_set:Nn\l_mix_pkght_tl{}
     }
   },
+%  height .value_required:n = true,
   height .value_required:,
 
   totalheight .code:n = {
@@ -250,6 +254,7 @@
       \tl_set:Nn\l_mix_pkgtt_tl{}
     }
   },
+%  height .value_required:n = true,
   height .value_required:,
 
   depth .code:n = {
@@ -264,6 +269,7 @@
   keepaspectratio .default:n = {true},
 
   scale .code:n = {\tl_gset:Nx\g_mix_pkgscalearg_tl{#1}},
+%  scale .value_required:n = true,
   scale .value_required:,
 
   %3D specific options
@@ -272,13 +278,15 @@
   3Dplaytype / linear .code:n = {\tl_gset:Nn\g_mix_pkgplaytpe_tl{Linear}},
   3Dplaytype / oscillating .code:n = {
     \tl_gset:Nn\g_mix_pkgplaytpe_tl{Oscillating}},
+%  3Dplaytype .value_required:n = true,
   3Dplaytype .value_required:,
 
-  3Dplaycount .code:n = {\tl_gset:Nn\g_mix_pkgplaycnt_tl{
-    \exp_after:wN\int_value:w \dim_eval:w#1sp\dim_eval_end:}},
+  3Dplaycount .code:n = {\tl_gset:Nx\g_mix_pkgplaycnt_tl{\fp_eval:n{trunc(#1)}}}
+%  3Dplaycount .value_required:n = true,
   3Dplaycount .value_required:,
 
   3Dplayspeed .tl_gset_x:N = \g_mix_pkgplayspd_tl,
+%  3Dplayspeed .value_required:n = true,
   3Dplayspeed .value_required:,
 
   3Dtoolbar .choices:nn = {true,false}{
@@ -299,6 +307,7 @@
       \tl_gset:Nn\g_mix_pkgnrdflt_tl{/NR~true}
     }
   },
+%  3Dpartsattrs .value_required:n = true,
   3Dpartsattrs .value_required:,
 
   3Dmenu .bool_gset:N = \g_mix_pkgiiidcalc_bool,
@@ -307,16 +316,19 @@
     \tl_gset:Nx\g_mix_pkgopt_bg_tl{
       /BG<</Subtype/SC/CS/DeviceRGB/C[#1]/EA~true>>}
   },
+%  3Dbg .value_required:n = true,
   3Dbg .value_required:,
 
   3Dlights .code:n = {
     \tl_gset:Nx\g_mix_pkgopt_ls_tl{/LS<</Subtype/#1>>}
   },
+%  3Dlights .value_required:n = true,
   3Dlights .value_required:,
 
   3Drender .code:n = {
     \tl_gset:Nx\g_mix_pkgopt_rm_tl{/RM<</Subtype/#1>>}
   },
+%  3Drender .value_required:n = true,
   3Drender .value_required:,
 
   unknown .code:n = {
@@ -395,7 +407,12 @@
 \cs_gset:Nn\mix_keytoaux_now:nn{
   \iow_now:Nx\@auxout{\token_to_str:N\mix@newkey{#1}{#2}}
   \bool_if:nT{
-    !\cs_if_exist_p:c{#1} || !\str_if_eq_x_p:nn{\tl_use:c{#1}}{#2}
+%    !\cs_if_exist_p:c{#1} || !\str_if_eq_x_p:nn{\tl_use:c{#1}}{#2}
+    !\cs_if_exist:cTF{#1}{
+      \str_if_eq_x_p:nn{\tl_use:c{#1}}{#2}
+    }{
+      \c_false_bool
+    }
   }{
     \cs_if_exist:NF\g_mix_rerunwarned_tl{
       \tl_new:N\g_mix_rerunwarned_tl
@@ -614,12 +631,12 @@
     \bool_if:nTF{\tl_if_blank_p:o{#1}&&\tl_if_blank_p:o{#3}}{
       \pdfobj~reserveobjnum
     }{
-      \str_case:nnn{#2}{
+      \str_case:nn{#2}{
         {dict}{\immediate\pdfobj~\l_mix_usenum_tl~{<<#3>>}}
         {array}{\immediate\pdfobj~\l_mix_usenum_tl~{[#3]}}
         {stream}{\immediate\pdfobj~\l_mix_usenum_tl~stream~{#3}}
         {fstream}{\immediate\pdfobj~\l_mix_usenum_tl~stream~file~{#3}}
-      }{}
+      }
     }
     \tl_gset:Nx\g_mix_pdflastobj_tl{\the\pdflastobj\space 0~R}
   }
@@ -706,7 +723,7 @@
         \tl_set:Nx\l_mix_usenum_tl{#1}
       }
       \tl_if_blank:oF{#3}{
-        \str_case:nnn{#2}{
+        \str_case:nn{#2}{
           {dict}{\special{pdf:obj~\l_mix_usenum_tl\space<<#3>>}}
           {array}{\special{pdf:obj~\l_mix_usenum_tl\space[#3]}}
           {stream}{\special{pdf:stream~\l_mix_usenum_tl\space(#3)}}
@@ -714,7 +731,7 @@
             \message{<#3>}
             \special{pdf:fstream~\l_mix_usenum_tl\space(#3)}
           }
-        }{}
+        }
       }
       \tl_gset_eq:NN\g_mix_pdflastobj_tl\l_mix_usenum_tl
     }
@@ -854,16 +871,16 @@
           }
         }{
           \special{ps:~mark~/_objdef~\l_mix_usenum_tl\space/type
-            \str_case:nnn{#2}{
+            \str_case:nn{#2}{
               {dict}{/dict}
               {array}{/array}
               {stream}{/stream}
               {fstream}{/stream}
-            }{}~
+            }~
             /OBJ~pdfmark~
           }
         }
-        \str_case:nnn{#2}{
+        \str_case:nn{#2}{
           {dict}{\special{ps:~mark~\l_mix_usenum_tl~<<#3>>/PUT~pdfmark~}}
           {array}{
             \special{ps:~mark~\l_mix_usenum_tl~0~[#3]/PUTINTERVAL~pdfmark~}
@@ -906,7 +923,7 @@
               }
             }
           }
-        }{}
+        }
       }
       \tl_gset_eq:NN\g_mix_pdflastobj_tl\l_mix_usenum_tl
     }
@@ -1422,7 +1439,7 @@
       \xetex_if_engine:T{\tl_gset:Nn\g_mix_usrpbtn_tl{plain}}
     }
     %embed main asset
-	  \mix_uribegin:
+    \mix_uribegin:
     \mix_embedasset:n{#3}
     \bool_if:nTF{
       \str_if_eq_p:Vn\l_mix_ext_tl{prc}||\str_if_eq_p:Vn\l_mix_ext_tl{u3d}
@@ -1430,7 +1447,7 @@
       \bool_gset_true:N\g_mix_iiid_bool
       \tl_gset:Nn\g_mix_mainassetsub_tl{3D}
     }{
-      \str_case_x:nnn{\l_mix_base_tl}{
+      \str_case_x:nnF{\l_mix_base_tl}{
         {APlayer}{\tl_gset:Nn\g_mix_mainassetsub_tl{Sound}}
         {AudioPlayer}{\tl_gset:Nn\g_mix_mainassetsub_tl{Sound}}
         {VPlayer}{\tl_gset:Nn\g_mix_mainassetsub_tl{Video}}
@@ -1570,7 +1587,7 @@
               /Height~<</Default~\tl_mix_fltht>>
               /Position~<<
                 /HOffset~0/VOffset~0
-                \str_case_x:nnn{\g_mix_winpos_tl}{
+                \str_case_x:nnF{\g_mix_winpos_tl}{
                   {tl}{/VAlign/Near/HAlign/Near}
                   {cl}{/VAlign/Center/HAlign/Near}
                   {bl}{/VAlign/Far/HAlign/Near}
@@ -1887,6 +1904,7 @@
       \tl_new:c{rm@#1}
     }
   },
+%  label .value_required:n = true,
   label .value_required:,
 
   width .code:n = {
@@ -1896,6 +1914,7 @@
       \tl_set:Nn\l_mix_usrwd_tl{}
     }
   },
+%  width .value_required:n = true,
   width .value_required:,
 
   height .code:n = {
@@ -1905,6 +1924,7 @@
       \tl_set:Nn\l_mix_usrht_tl{}
     }
   },
+%  height .value_required:n = true,
   height .value_required:,
 
   totalheight .code:n = {
@@ -1914,6 +1934,7 @@
       \tl_set:Nn\l_mix_usrtt_tl{}
     }
   },
+%  height .value_required:n = true,
   height .value_required:,
 
   depth .code:n = {
@@ -1928,6 +1949,7 @@
   keepaspectratio .default:n = {true},
 
   scale .code:n = {\tl_gset:Nx\g_mix_scalearg_tl{#1}},
+%  scale .value_required:n = true,
   scale .value_required:,
 
   url .code:n = {
@@ -1937,24 +1959,29 @@
   },
 
   addresource .code:n = {\seq_gput_right:Nn\g_mix_res_seq{#1}},
+%  addresource .value_required:n = true,
   addresource .value_required:,
 
   add3Djscript .code:n = {\seq_gput_right:Nn\g_mix_script_seq{#1}},
+%  add3Djscript .value_required:n = true,
   add3Djscript .value_required:,
 
   flashvars .tl_gset_x:N = \g_mix_flashvars_tl,
+%  flashvars .value_required:n = true,
   flashvars .value_required:,
 
   activate .choice:,
   activate / pagevisible .code:n = {\tl_gset:Nn\g_mix_act_tl{/PV}},
   activate / pageopen .code:n = {\tl_gset:Nn\g_mix_act_tl{/PO}},
   activate / onclick .code:n = {\tl_gset:Nn\g_mix_act_tl{/XA}},
+%  activate .value_required:n = true,
   activate .value_required:,
 
   deactivate .choice:,
   deactivate / pageinvisible .code:n = {\tl_gset:Nn\g_mix_deact_tl{/PI}},
   deactivate / pageclose .code:n = {\tl_gset:Nn\g_mix_deact_tl{/PC}},
   deactivate / onclick .code:n = {\tl_gset:Nn\g_mix_deact_tl{/XD}},
+%  deactivate .value_required:n = true,
   deactivate .value_required:,
 
   draft .choice:,
@@ -2009,13 +2036,15 @@
   3Dplaytype / linear .code:n = {\tl_gset:Nn\g_mix_playtpe_tl{Linear}},
   3Dplaytype / oscillating .code:n = {
     \tl_gset:Nn\g_mix_playtpe_tl{Oscillating}},
+%  3Dplaytype .value_required:n = true,
   3Dplaytype .value_required:,
 
-  3Dplaycount .code:n = {\tl_gset:Nn\g_mix_playcnt_tl{
-    \exp_after:wN\int_value:w \dim_eval:w#1sp\dim_eval_end:}},
+  3Dplaycount .code:n = {\tl_gset:Nx\g_mix_playcnt_tl{\fp_eval:n{trunc(#1)}}}
+%  3Dplaycount .value_required:n = true,
   3Dplaycount .value_required:,
 
   3Dplayspeed .tl_gset_x:N = \g_mix_playspd_tl,
+%  3Dplayspeed .value_required:n = true,
   3Dplayspeed .value_required:,
 
   3Dtoolbar .choices:nn = {true,false}{
@@ -2034,14 +2063,17 @@
       \tl_gset:Nn\g_mix_nrdflt_tl{/NR~true}
     }
   },
+%  3Dpartsattrs .value_required:n = true,
   3Dpartsattrs .value_required:,
 
   3Dcoo .code:n = {\tl_gset:Nn\g_mix_opt_coo_tl{#1}
     \bool_gset_true:N\g_mix_opt_iiidview_bool},
+%  3Dcoo .value_required:n = true,
   3Dcoo .value_required:,
 
   3Dc2c .code:n = {\tl_gset:Nn\g_mix_opt_ctoc_tl{#1}
     \bool_gset_true:N\g_mix_opt_iiidview_bool},
+%  3Dc2c .value_required:n = true,
   3Dc2c .value_required:,
 
   3Dc2w .code:n = {
@@ -2049,6 +2081,7 @@
     \bool_gset_true:N\g_mix_opt_iiidview_bool
     \bool_gset_true:N\g_mix_opt_ciiw_bool
   },
+%  3Dc2w .value_required:n = true,
   3Dc2w .value_required:,
 
   3Droo .code:n = {
@@ -2058,10 +2091,12 @@
     \bool_gset_true:N\g_mix_opt_iiidview_bool
     \bool_set_true:N\l_mix_roo_bool
   },
+%  3Droo .value_required:n = true,
   3Droo .value_required:,
 
   3Daac .code:n = {\fp_gset:Nn\g_mix_opt_aac_fp{#1}
     \bool_gset_true:N\g_mix_opt_iiidview_bool},
+%  3Daac .value_required:n = true,
   3Daac .value_required:,
 
   3Dortho .code:n = {
@@ -2079,6 +2114,7 @@
 
   3Droll .code:n = {\fp_gset:Nn\g_mix_opt_roll_fp{#1}
     \bool_gset_true:N\g_mix_opt_iiidview_bool},
+%  3Droll .value_required:n = true,
   3Droll .value_required:,
 
   3Dmenu .bool_gset:N = \g_mix_iiidcalc_bool,
@@ -2086,11 +2122,13 @@
   3Dbg .code:n = {
     \tl_gset:Nx\g_mix_opt_bg_tl{/BG<</Subtype/SC/CS/DeviceRGB/C[#1]/EA~true>>}
   },
+%  3Dbg .value_required:n = true,
   3Dbg .value_required:,
 
   3Dlights .code:n = {
     \tl_gset:Nx\g_mix_opt_ls_tl{/LS<</Subtype/#1>>}
   },
+%  3Dlights .value_required:n = true,
   3Dlights .value_required:,
 
   3Drender .code:n = {
@@ -2106,11 +2144,13 @@
       \tl_gset:Nx\g_mix_opt_rm_tl{/RM<</Subtype/#1>>}
     }
   },
+%  3Drender .value_required:n = true,
   3Drender .value_required:,
 
   3Dpsob .code:n = {
     \tl_gset:Nx\g_mix_opt_psob_tl{#1}
   },
+%  3Dpsob .value_required:n = true,
   3Dpsob .value_required:,
 
   3Dviews .code:n = {
@@ -2121,6 +2161,7 @@
       \msg_error:nnx{media9}{file~not~found}{#1}
     }
   },
+%  3Dviews .value_required:n = true,
   3Dviews .value_required:,
 
   unknown .code:n = {
@@ -2268,6 +2309,7 @@
     }
     \tl_set:Nx\l_mix_coo_tl{#1}
   },
+%  COO .value_required:n = true,
   COO .value_required:,
 
   C2C .code:n = {
@@ -2277,6 +2319,7 @@
     }
     \tl_set:Nx\l_mix_ctoc_tl{#1}
   },
+%  C2C .value_required:n = true,
   C2C .value_required:,
 
   C2W .code:n = {
@@ -2287,6 +2330,7 @@
     \tl_set:Nx\l_mix_ciiw_tl{#1}
     \bool_set_true:N\l_mix_ciiw_bool
   },
+%  C2W .value_required:n = true,
   C2W .value_required:,
 
   ROO .code:n = {
@@ -2299,6 +2343,7 @@
       \fp_set:Nn\l_mix_roo_fp{1e-9}}
     \bool_set_true:N\l_mix_roo_bool
   },
+%  ROO .value_required:n = true,
   ROO .value_required:,
 
   AAC .code:n = {
@@ -2308,6 +2353,7 @@
     }
     \fp_set:Nn\l_mix_aac_fp{#1}
   },
+%  AAC .value_required:n = true,
   AAC .value_required:,
 
   ORTHO .code:n = {
@@ -2335,6 +2381,7 @@
         {PSOB}{a~VIEW}
     }
   },
+%  PSOB .value_required:n = true,
   PSOB .value_required:,
 
   ROLL .code:n = {
@@ -2344,6 +2391,7 @@
     }
     \fp_set:Nn\l_mix_roll_fp{#1}
   },
+%  ROLL .value_required:n = true,
   ROLL .value_required:,
 
   BGCOLOR .code:n = {
@@ -2353,6 +2401,7 @@
     }
     \tl_set:Nx\l_mix_bg_tl{/BG<</CS/DeviceRGB/C[#1]/EA~true>>}
   },
+%  BGCOLOR .value_required:n = true,
   BGCOLOR .value_required:,
 
   LIGHTS .code:n = {
@@ -2362,6 +2411,7 @@
     }
     \tl_set:Nx\l_mix_ls_tl{/LS<</Subtype/#1>>}
   },
+%  LIGHTS .value_required:n = true,
   LIGHTS .value_required:,
 
   RENDERMODE .code:n = {
@@ -2380,6 +2430,7 @@
       \tl_set:Nx\l_mix_ndrm_tl{/RM<</Subtype/#1>>} %part (=node) render mode
     }
   },
+%  RENDERMODE .value_required:n = true,
   RENDERMODE .value_required:,
 
   PARTSATTRS .choices:nn = {keep,restore}{
@@ -2394,6 +2445,7 @@
       \tl_set:Nn\l_mix_nr_tl{/NR~true}
     }
   },
+%  PARTSATTRS .value_required:n = true,
   PARTSATTRS .value_required:,
 
   PART .code:n = {
@@ -2444,6 +2496,7 @@
       \tl_set:Nx\l_mix_csop_tl{/PO~#1}
     }
   },
+%  OPACITY .value_required:n = true,
   OPACITY .value_required:,
 
   VISIBLE .choices:nn = {true,false}{
@@ -2481,6 +2534,7 @@
     }
     \tl_set:Nx\l_mix_cspc_tl{/PC~[/DeviceRGB~#1]}
   },
+%  PLANECOLOR .value_required:n = true,
   PLANECOLOR .value_required:,
 
   INTERSECTIONCOLOR .code:n = {
@@ -2491,6 +2545,7 @@
     }
     \tl_set:Nx\l_mix_csic_tl{/IC~[/DeviceRGB~#1]}
   },
+%  INTERSECTIONCOLOR .value_required:n = true,
   INTERSECTIONCOLOR .value_required:,
 
   TRANSFORM .code:n = {
@@ -2505,6 +2560,7 @@
       \tl_put_right:Nx\l_mix_ndtrans_tl{~\l_mix_tmpa_tl}
     }
   },
+%  TRANSFORM .value_required:n = true,
   TRANSFORM .value_required:,
 
   CROSSSECT .code:n = {
@@ -2526,6 +2582,7 @@
     \tl_clear:N\l_mix_csic_tl %intersection colour
     \tl_clear:N\l_mix_csiv_tl %intersection visibility
   },
+%  CROSSSECT .value_forbidden:n = true,
   CROSSSECT .value_forbidden:,
 
   CENTER .code:n = {
@@ -2544,6 +2601,7 @@
       \l_mix_z_tl
     }
   },
+%  CENTER .value_required:n = true,
   CENTER .value_required:,
 
   NORMAL .code:n = {
@@ -2564,10 +2622,11 @@
     \tl_set:Nx\l_mix_rotz_tl{\fp_to_decimal:n{round((\l_mix_rotz_fp),9)}}
     \tl_set:Nx\l_mix_csorient_tl{null~\l_mix_roty_tl\space\l_mix_rotz_tl}
   },
+%  NORMAL .value_required:n = true,
   NORMAL .value_required:,
 
   END .code:n = {
-    \int_case:nnn{\l_mix_level_tl}{
+    \int_case:nnF{\l_mix_level_tl}{
       {0}{ %VIEW
         \bool_if:NF\l_mix_ciiw_bool{
           \tl_set:Nx\l_mix_args_tl{\l_mix_coo_tl\space\l_mix_ctoc_tl\space}
@@ -2618,6 +2677,7 @@
         {\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}
     }
   },
+%  END .value_forbidden:n = true,
   END .value_forbidden:,
 }
 
@@ -2650,6 +2710,7 @@
   final .code:n = {},
 
   tooltip .tl_gset_x:N = \g_mix_tooltip_tl,
+%  tooltip .value_required:n = true,
   tooltip .value_required:,
 
   overface .code:n = {
@@ -2657,6 +2718,7 @@
     \mix_pdfxform:n{\l_mix_poster_box}
     \tl_gset:Nx\g_mix_overbtn_tl{\g_mix_pdflastxform_tl}
   },
+%  overface .value_required:n = true,
   overface .value_required:,
 
   downface .code:n = {
@@ -2664,6 +2726,7 @@
     \mix_pdfxform:n{\l_mix_poster_box}
     \tl_gset:Nx\g_mix_downbtn_tl{\g_mix_pdflastxform_tl}
   },
+%  downface .value_required:n = true,
   downface .value_required:,
 
   3Dgotoview .code:n = {
@@ -2715,6 +2778,7 @@
       }
     }
   },
+%  3Dgotoview .value_required:n = true,
   3Dgotoview .value_required:,
 
   mediacommand .code:n = {
@@ -2766,6 +2830,7 @@
       }
     }
   },
+%  mediacommand .value_required:n = true,
   mediacommand .value_required:,
 
   jsaction .code:n = {
@@ -2815,6 +2880,7 @@
       \tl_gput_right:Nx\g_mix_btnactions_tl{~\g_mix_pdflastobj_tl}
     }
   },
+%  jsaction .value_required:n = true,
   jsaction .value_required:,
 
   unknown .code:n = {
@@ -2848,7 +2914,12 @@
     \mix_pdfxform:n{\l_mix_poster_box}
     \tl_set:Nx\g_mix_normalbtn_tl{\g_mix_pdflastxform_tl}
     \bool_if:nT{ %dummy Widget for fixocgx, AR seems to need it
-      \cs_if_exist_p:N\fxocg@insert@OC && !\tl_if_blank_p:V\fxocg@insert@OC
+%      \cs_if_exist_p:N\fxocg@insert@OC && !\tl_if_blank_p:V\fxocg@insert@OC
+      !\cs_if_exist:NTF\fxocg@insert@OC{
+        \tl_if_blank_p:V\fxocg@insert@OC
+      }{
+        \c_true_bool
+      }
     }{\mix_pdfannot:nnnn{\width}{\height}{\depth}{/Subtype/Widget/F~2}}
     %insert widget annotation
     \mix_pdfannot:nnnn{\width}{\height}{\depth}{