summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/media9/media9.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-11 21:31:47 +0000
committerKarl Berry <karl@freefriends.org>2019-05-11 21:31:47 +0000
commit62bfad29ded6992b948a38080bbf0f42d1edeb6c (patch)
treef106f109efcbc54afd888d1383f762251f5d1e0f /Master/texmf-dist/tex/latex/media9/media9.sty
parentd9fc58602a96c5bb006e4e4a8764a8679d238bd0 (diff)
media9 (11may19)
git-svn-id: svn://tug.org/texlive/trunk@51092 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/media9/media9.sty')
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty148
1 files changed, 74 insertions, 74 deletions
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 2c0faa25a9c..e2c4fcd66f4 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -37,8 +37,8 @@
\RequirePackage{xparse}
\RequirePackage{atbegshi}
-\def\g@mix@date@tl{2019/05/02}
-\def\g@mix@version@tl{0.97}
+\def\g@mix@date@tl{2019/05/10}
+\def\g@mix@version@tl{0.98}
\def\g@mix@liiikerneldate{2019/02/15}
\def\g@mix@liiipkgdate{2018/10/17}
@@ -220,7 +220,7 @@
width .code:n = {
\tl_gset:Nn\g_mix_pkgwdarg_tl{#1}
\tl_if_exist:NF\l_mix_pkgwd_tl{
- \int_gadd:Nn\g_mix_pkgresizeflag_int{\c_four}
+ \int_gadd:Nn\g_mix_pkgresizeflag_int{4}
\tl_set:Nn\l_mix_pkgwd_tl{}
}
},
@@ -229,7 +229,7 @@
height .code:n = {
\tl_gset:Nn\g_mix_pkghtarg_tl{#1}
\tl_if_exist:NF\l_mix_pkght_tl{
- \int_gadd:Nn\g_mix_pkgresizeflag_int{\c_two}
+ \int_gadd:Nn\g_mix_pkgresizeflag_int{2}
\tl_set:Nn\l_mix_pkght_tl{}
}
},
@@ -238,7 +238,7 @@
totalheight .code:n = {
\tl_gset:Nn\g_mix_pkgttarg_tl{#1}
\tl_if_exist:NF\l_mix_pkgtt_tl{
- \int_gadd:Nn\g_mix_pkgresizeflag_int{\c_one}
+ \int_gadd:Nn\g_mix_pkgresizeflag_int{\c_one_int}
\tl_set:Nn\l_mix_pkgtt_tl{}
}
},
@@ -410,7 +410,7 @@
\iow_now:Nx\@mainaux{\token_to_str:N\mix@newkey{#1}{#2}}
\bool_if:nT{
!\cs_if_exist:cTF{#1}{
- \str_if_eq_x_p:nn{\tl_use:c{#1}}{#2}
+ \str_if_eq_p:ee{\tl_use:c{#1}}{#2}
}{
\c_false_bool
}
@@ -696,9 +696,9 @@
\cs_new:Nn\mix_scale:n{% #1 box number
%totalheight overrides height if both height & totalheight options were given
\bool_if:nT{
- \int_compare_p:n{\g_mix_resizeflag_int=\c_three} ||
- \int_compare_p:n{\g_mix_resizeflag_int=\c_seven}
- }{\int_gsub:Nn\g_mix_resizeflag_int{\c_two}}
+ \int_compare_p:n{\g_mix_resizeflag_int=3} ||
+ \int_compare_p:n{\g_mix_resizeflag_int=7}
+ }{\int_gsub:Nn\g_mix_resizeflag_int{2}}
\group_begin:
%natural dimensions \width, \height, \depth, \totalheight
\tl_set:Nn\width {\box_wd:N#1}
@@ -714,12 +714,12 @@
\dim_compare:nT{\width=\c_zero_dim}{\box_gset_wd:Nn#1{\g_mix_wd_tl}}
\dim_compare:nT{\totalheight=\c_zero_dim}{
\bool_if:nT{ %height option given
- \int_compare_p:n{\g_mix_resizeflag_int=\c_six}||
- \int_compare_p:n{\g_mix_resizeflag_int=\c_two}
+ \int_compare_p:n{\g_mix_resizeflag_int=6}||
+ \int_compare_p:n{\g_mix_resizeflag_int=2}
}{\box_gset_ht:Nn#1{\g_mix_ht_tl}}
\bool_if:nT{ %totalheight option given
- \int_compare_p:n{\g_mix_resizeflag_int=\c_five}||
- \int_compare_p:n{\g_mix_resizeflag_int=\c_one}
+ \int_compare_p:n{\g_mix_resizeflag_int=5}||
+ \int_compare_p:n{\g_mix_resizeflag_int=\c_one_int}
}{\box_gset_ht:Nn#1{\g_mix_tt_tl}}
}
\group_end:
@@ -732,16 +732,16 @@
}{
%bit 2^2=width, 2^1=height, 2^0=totalhight given
\int_case:nn{\g_mix_resizeflag_int}{
- {\c_one}{
+ {\c_one_int}{
\box_resize_to_ht_plus_dp:Nn#1{\g_mix_tt_tl}
}
- {\c_two}{
+ {2}{
\box_resize_to_ht:Nn#1{\g_mix_ht_tl}
}
- {\c_four}{
+ {4}{
\box_resize_to_wd:Nn#1{\g_mix_wd_tl}
}
- {\c_five}{
+ {5}{
\bool_if:NTF\g_mix_usriso_bool{
\dim_set:Nn\l_tmpa_dim{
(\box_ht:N#1+\box_dp:N#1)*\dim_ratio:nn{\g_mix_wd_tl}{\box_wd:N#1}
@@ -757,7 +757,7 @@
\box_resize_to_wd_and_ht_plus_dp:Nnn#1{\g_mix_wd_tl}{\g_mix_tt_tl}
}
}
- {\c_six}{
+ {6}{
\bool_if:NTF\g_mix_usriso_bool{
\dim_set:Nn\l_tmpa_dim{
\box_ht:N#1*\dim_ratio:nn{\g_mix_wd_tl}{\box_wd:N#1}
@@ -862,12 +862,12 @@
%environment for setting LTR typesetting direction with e-TeX based engines
\cs_new:Nn\mix_beginLTR:{
\cs_if_exist:NT\TeXXeTstate{
- \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL}
+ \int_compare:nT{\TeXXeTstate>\c_zero_int}{\beginL}
}
}
\cs_new:Nn\mix_endLTR:{
\cs_if_exist:NT\TeXXeTstate{
- \int_compare:nT{\TeXXeTstate>\c_zero}{\endL}
+ \int_compare:nT{\TeXXeTstate>\c_zero_int}{\endL}
}
}
@@ -949,7 +949,7 @@
\bool_gset_true:N\g_mix_iiid_bool
\tl_gset:Nn\g_mix_mainassetsub_tl{3D}
}{
- \str_case_x:nnF{\l_mix_base_tl}{
+ \str_case_e: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}}
@@ -1089,7 +1089,7 @@
/Height~<</Default~\tl_mix_fltht>>
/Position~<<
/HOffset~0/VOffset~0
- \str_case_x:nnF{\g_mix_winpos_tl}{
+ \str_case_e:nnF{\g_mix_winpos_tl}{
{tl}{/VAlign/Near/HAlign/Near}
{cl}{/VAlign/Center/HAlign/Near}
{bl}{/VAlign/Far/HAlign/Near}
@@ -1143,7 +1143,7 @@
annotRM['\g_mix_label_tl']=
this.getAnnotRichMedia(this.pageNum,'\g_mix_label_tl');
}
- \str_if_eq_x:nnF{\g_mix_usrpbtn_tl}{none}{
+ \str_if_eq:eeF{\g_mix_usrpbtn_tl}{none}{
if(typeof(ocgBtn\int_use:N\g_mix_rmcnt_int)=='undefined'){
var~ocgs=this.getOCGs(this.pageNum);
for(var~i=0;i<ocgs.length;i++){
@@ -1175,7 +1175,7 @@
}
\mix_appendtofields:n{\mix_pdflastann:}
\hbox_overlap_right:n{\box_use:N\l_mix_poster_box}
- \str_if_eq_x:nnTF{\g_mix_usrpbtn_tl}{none}{
+ \str_if_eq:eeTF{\g_mix_usrpbtn_tl}{none}{
\hbox_to_wd:nn{\g_mix_wd_tl}{
\vrule~width~\c_zero_dim~height~\g_mix_ht_tl~depth~\g_mix_dp_tl\hss
}
@@ -1411,7 +1411,7 @@
width .code:n = {
\tl_gset:Nn\g_mix_wdarg_tl{#1}
\tl_if_exist:NF\l_mix_usrwd_tl{
- \int_gadd:Nn\g_mix_resizeflag_int{\c_four}
+ \int_gadd:Nn\g_mix_resizeflag_int{4}
\tl_set:Nn\l_mix_usrwd_tl{}
}
},
@@ -1420,7 +1420,7 @@
height .code:n = {
\tl_gset:Nn\g_mix_htarg_tl{#1}
\tl_if_exist:NF\l_mix_usrht_tl{
- \int_gadd:Nn\g_mix_resizeflag_int{\c_two}
+ \int_gadd:Nn\g_mix_resizeflag_int{2}
\tl_set:Nn\l_mix_usrht_tl{}
}
},
@@ -1429,7 +1429,7 @@
totalheight .code:n = {
\tl_gset:Nn\g_mix_ttarg_tl{#1}
\tl_if_exist:NF\l_mix_usrtt_tl{
- \int_gadd:Nn\g_mix_resizeflag_int{\c_one}
+ \int_gadd:Nn\g_mix_resizeflag_int{\c_one_int}
\tl_set:Nn\l_mix_usrtt_tl{}
}
},
@@ -1699,7 +1699,7 @@
\cs_new:Nn\mix_arcsin:Nnnn{
%#1 result (rad), #2 argument, #3 current term no., #4 total number of
%terms
- \int_compare:nTF{#3==\c_zero}{
+ \int_compare:nTF{#3==\c_zero_int}{
\fp_set:Nn\l_mix_tmpa_fp{1.0}
\fp_set:Nn\l_mix_tmpb_fp{1.0}
\fp_set:Nn\l_mix_tmpc_fp{1.0}
@@ -1766,12 +1766,12 @@
\par .code:n = {}, %allow for but ignore empty lines
VIEW .code:n = {
- \int_compare:nF{\l_mix_level_tl<\c_zero}{
+ \int_compare:nF{\l_mix_level_tl<\c_zero_int}{
\msg_error:nnxx{media9}{nested~view}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}
}
- \tl_set:Nn\l_mix_level_tl{\c_zero}
- \tl_set:Nn\l_mix_cscount_tl{\c_zero}
+ \tl_set:Nn\l_mix_level_tl{\c_zero_int}
+ \tl_set:Nn\l_mix_cscount_tl{\c_zero_int}
\tl_set:Nx\l_mix_xname_tl{#1}%optional name of the view
\tl_trim_spaces:N\l_mix_xname_tl
%reset 3D settings to defaults
@@ -1780,7 +1780,7 @@
VIEW .default:n = {},
COO .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{COO}{a~VIEW}
}
@@ -1789,7 +1789,7 @@
COO .value_required:n = {true},
C2C .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{C2C}{a~VIEW}
}
@@ -1798,7 +1798,7 @@
C2C .value_required:n = {true},
C2W .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{C2W}{a~VIEW}
}
@@ -1808,7 +1808,7 @@
C2W .value_required:n = {true},
ROO .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{ROO}{a~VIEW}
}
@@ -1820,7 +1820,7 @@
ROO .value_required:n = {true},
AAC .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{AAC}{a~VIEW}
}
@@ -1829,7 +1829,7 @@
AAC .value_required:n = {true},
ORTHO .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{ORTHO}{a~VIEW}
}
@@ -1845,7 +1845,7 @@
ORTHO .default:n = {1},
PSOB .code:n = {
- \int_compare:nTF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nTF{\l_mix_level_tl=\c_zero_int}{
\tl_set:Nx\l_mix_psob_tl{#1}
}{
\msg_error:nnxxxx{media9}{key~not~allowed}
@@ -1856,7 +1856,7 @@
PSOB .value_required:n = {true},
ROLL .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{ROLL}{a~VIEW}
}
@@ -1865,7 +1865,7 @@
ROLL .value_required:n = {true},
BGCOLOR .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{BGCOLOR}{a~VIEW}
}
@@ -1874,7 +1874,7 @@
BGCOLOR .value_required:n = {true},
LIGHTS .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{LIGHTS}{a~VIEW}
}
@@ -1884,24 +1884,24 @@
RENDERMODE .code:n = {
\bool_if:nF{
- \int_compare_p:n{\l_mix_level_tl=\c_zero} ||
- \int_compare_p:n{\l_mix_level_tl=\c_one}
+ \int_compare_p:n{\l_mix_level_tl=\c_zero_int} ||
+ \int_compare_p:n{\l_mix_level_tl=\c_one_int}
}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}
{RENDERMODE}{a~VIEW~or~a~PART}
}
- \int_compare:nT{\l_mix_level_tl=\c_zero}{
+ \int_compare:nT{\l_mix_level_tl=\c_zero_int}{
\tl_set:Nx\l_mix_rm_tl{/RM<</Subtype/#1>>}
}
- \int_compare:nT{\l_mix_level_tl=\c_one}{
+ \int_compare:nT{\l_mix_level_tl=\c_one_int}{
\tl_set:Nx\l_mix_ndrm_tl{/RM<</Subtype/#1>>} %part (=node) render mode
}
},
RENDERMODE .value_required:n = {true},
PARTSATTRS .choices:nn = {keep,restore}{
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{PARTSATTRS}{VIEW}
}
@@ -1915,13 +1915,13 @@
PARTSATTRS .value_required:n = {true},
PART .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{section~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{PART}{VIEW}
}
\bool_set_true:N\l_mix_blankndname_bool
\bool_set:Nn\l_mix_blankndname_bool{\tl_if_blank_p:o{#1}}
- \tl_set:Nn\l_mix_level_tl{\c_one}
+ \tl_set:Nn\l_mix_level_tl{\c_one_int}
\tl_set:Nn\l_mix_ndname_tl{(#1)} %part (=node) name
\tl_set_eq:NN\l_mix_partlineno_int\l_mix_lineno_int
%default part settings
@@ -1933,7 +1933,7 @@
PART .default:n = {},
UTF16NAME .code:n = { %part (=node) name, UTF16, HEX encoded
- \int_compare:nF{\l_mix_level_tl=\c_one}{
+ \int_compare:nF{\l_mix_level_tl=\c_one_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{UTF16NAME}{PART}
}
@@ -1948,17 +1948,17 @@
OPACITY .code:n = {
\bool_if:nF{
- \int_compare_p:n{\l_mix_level_tl=\c_one} ||
- \int_compare_p:n{\l_mix_level_tl=\c_two}
+ \int_compare_p:n{\l_mix_level_tl=\c_one_int} ||
+ \int_compare_p:n{\l_mix_level_tl=2}
}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}
{OPACITY}{PART~or~CROSSSECT}
}
- \int_compare:nT{\l_mix_level_tl=\c_one}{ %part
+ \int_compare:nT{\l_mix_level_tl=\c_one_int}{ %part
\tl_set:Nx\l_mix_ndop_tl{/O~#1}
}
- \int_compare:nT{\l_mix_level_tl=\c_two}{ %crosssect
+ \int_compare:nT{\l_mix_level_tl=2}{ %crosssect
\tl_set:Nx\l_mix_csop_tl{/PO~#1}
}
},
@@ -1966,24 +1966,24 @@
VISIBLE .choices:nn = {true,false}{
\bool_if:nF{
- \int_compare_p:n{\l_mix_level_tl=\c_one} ||
- \int_compare_p:n{\l_mix_level_tl=\c_two}
+ \int_compare_p:n{\l_mix_level_tl=\c_one_int} ||
+ \int_compare_p:n{\l_mix_level_tl=2}
}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}
{VISIBLE}{PART~or~CROSSSECT}
}
- \int_compare:nT{\l_mix_level_tl=\c_one}{ %part
+ \int_compare:nT{\l_mix_level_tl=\c_one_int}{ %part
\tl_set:Nx\l_mix_ndvi_tl{/V~\l_keys_choice_tl}
}
- \int_compare:nT{\l_mix_level_tl=\c_two}{ %crosssect
+ \int_compare:nT{\l_mix_level_tl=2}{ %crosssect
\tl_set:Nx\l_mix_cspv_tl{/PV~\l_keys_choice_tl}
}
},
VISIBLE .default:n = {true},
INTERSECTIONVISIBLE .choices:nn = {true,false}{
- \int_compare:nF{\l_mix_level_tl=\c_two}{
+ \int_compare:nF{\l_mix_level_tl=2}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{INTERSECTIONVISIBLE}
{CROSSSECT}
@@ -1993,7 +1993,7 @@
INTERSECTIONVISIBLE .default:n = {true},
PLANECOLOR .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_two}{
+ \int_compare:nF{\l_mix_level_tl=2}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{PLANECOLOR}{CROSSSECT}
}
@@ -2002,7 +2002,7 @@
PLANECOLOR .value_required:n = {true},
INTERSECTIONCOLOR .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_two}{
+ \int_compare:nF{\l_mix_level_tl=2}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{INTERSECTIONCOLOR}
{CROSSSECT}
@@ -2012,7 +2012,7 @@
INTERSECTIONCOLOR .value_required:n = {true},
TRANSFORM .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_one}{
+ \int_compare:nF{\l_mix_level_tl=\c_one_int}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{TRANSLATE}{PART}
}
@@ -2026,15 +2026,15 @@
TRANSFORM .value_required:n = {true},
CROSSSECT .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_zero}{
+ \int_compare:nF{\l_mix_level_tl=\c_zero_int}{
\msg_error:nnxxxx{media9}{section~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{CROSSSECT}{VIEW}
}
- \int_compare:nT{\l_mix_cscount_tl>\c_zero}{
+ \int_compare:nT{\l_mix_cscount_tl>\c_zero_int}{
\msg_warning:nnxx{media9}{too~many~cross~sections}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}
}
- \tl_set:Nn\l_mix_level_tl{\c_two}
+ \tl_set:Nn\l_mix_level_tl{2}
%default settings
\tl_set:Nn\l_mix_cscentre_tl{0~0~0} %centre of clipping plane
\tl_set:Nn\l_mix_csorient_tl{null~0~0} %orientation of plane
@@ -2047,7 +2047,7 @@
CROSSSECT .value_forbidden:n = {true},
CENTER .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_two}{
+ \int_compare:nF{\l_mix_level_tl=2}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{CENTER}{CROSSSECT}
}
@@ -2065,7 +2065,7 @@
CENTER .value_required:n = {true},
NORMAL .code:n = {
- \int_compare:nF{\l_mix_level_tl=\c_two}{
+ \int_compare:nF{\l_mix_level_tl=2}{
\msg_error:nnxxxx{media9}{key~not~allowed}
{\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int}{NORMAL}{CROSSSECT}
}
@@ -2115,10 +2115,10 @@
}
\tl_put_right:Nx\l_mix_naarray_tl{~\mix_pdflastobj:}
- \tl_set:Nn\l_mix_level_tl{\c_zero}
+ \tl_set:Nn\l_mix_level_tl{\c_zero_int}
}
{2}{ %CROSSSECT
- \int_compare:nT{\l_mix_cscount_tl=\c_zero}{
+ \int_compare:nT{\l_mix_cscount_tl=\c_zero_int}{
\mix_pdfobj:nnn{}{dict}{
/Type/3DCrossSection
/C~[\l_mix_cscentre_tl]
@@ -2127,9 +2127,9 @@
\l_mix_csic_tl\l_mix_csiv_tl
}
\tl_put_right:Nx\l_mix_saarray_tl{~\mix_pdflastobj:}
- \tl_set:Nn\l_mix_cscount_tl{\c_one}
+ \tl_set:Nn\l_mix_cscount_tl{\c_one_int}
}
- \tl_set:Nn\l_mix_level_tl{\c_zero}
+ \tl_set:Nn\l_mix_level_tl{\c_zero_int}
}
}{
\msg_error:nnxx{media9}{no~end~here}
@@ -2191,7 +2191,7 @@
\regex_replace_once:nnN{([^:]+):??.*}{\1}\l_tmpa_tl
\tl_trim_spaces:N\l_tmpa_tl
\tl_if_exist:cTF{ann@\l_tmpa_tl}{
- \str_if_eq_x:nnF{\tl_use:c{ann@\l_tmpa_tl}}{draft}{
+ \str_if_eq:eeF{\tl_use:c{ann@\l_tmpa_tl}}{draft}{
\tl_set:Nx\l_tmpb_tl{#1} %extract idx
\regex_replace_once:nnN{[^:]+:?}{}\l_tmpb_tl
\tl_trim_spaces:N\l_tmpb_tl
@@ -2242,7 +2242,7 @@
\regex_replace_once:nnN{([^:]+):??.*}{\1}\l_tmpa_tl %extract ref
\tl_trim_spaces:N\l_tmpa_tl
\tl_if_exist:cTF{ann@\l_tmpa_tl}{
- \str_if_eq_x:nnF{\tl_use:c{ann@\l_tmpa_tl}}{draft}{
+ \str_if_eq:eeF{\tl_use:c{ann@\l_tmpa_tl}}{draft}{
\tl_set:Nx\l_tmpb_tl{#1}
\regex_replace_once:nnN{[^:]+\:?}{}\l_tmpb_tl
\tl_trim_spaces:N\l_tmpb_tl
@@ -2314,7 +2314,7 @@
\bool_lazy_and:nnT{
\tl_if_exist_p:c{ann@\l_tmpa_tl}
}{
- !\str_if_eq_x_p:nn{\tl_use:c{ann@\l_tmpa_tl}}{draft}
+ !\str_if_eq_p:ee{\tl_use:c{ann@\l_tmpa_tl}}{draft}
}{
\mix_pdfobj:nnn{}{dict}{
/S/JavaScript/JS~(
@@ -2332,7 +2332,7 @@
\bool_lazy_and_p:nn{
\tl_if_exist_p:c{ann@\l_tmpa_tl}
}{
- !\str_if_eq_x_p:nn{\tl_use:c{ann@\l_tmpa_tl}}{draft}
+ !\str_if_eq_p:ee{\tl_use:c{ann@\l_tmpa_tl}}{draft}
}
|| !\tl_if_blank_p:V\l_tmpb_tl
}{