diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/media9/ChangeLog | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/media9/media9.pdf | bin | 3828356 -> 3836549 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/media9/media9.tex | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/media9/media9.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/media9/pdfbase.sty | 61 |
5 files changed, 63 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index d37695d2f92..6670cd98b57 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,9 @@ +2017-04-25 + * v0.79 : media9.sty + * v0.14 : pdfbase.sty + * fix: improved A-Reader-related workaround for annotations/links + located on OCGs + 2017-03-23 * v0.78 : media9.sty * v0.13 : pdfbase.sty diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf Binary files differindex 6409ab0ea08..e4450f4c30c 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/source/latex/media9/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex index 8780849f110..60a0a1313f4 100644 --- a/Master/texmf-dist/source/latex/media9/media9.tex +++ b/Master/texmf-dist/source/latex/media9/media9.tex @@ -40,13 +40,9 @@ pdfsubject={Documentation}, pdfauthor={Alexander Grahn}, pdfkeywords={\keywords}, - citebordercolor={0 0 1}, - filebordercolor={0 0 1}, - linkbordercolor={0 0 1}, - menubordercolor={0 0 1}, - pagebordercolor={0 0 1}, - urlbordercolor={0 0 1} + allcolors=blue } +\usepackage[ocgcolorlinks]{ocgx2} %\usepackage{listings} \usepackage{minted} @@ -136,6 +132,7 @@ The final PDF can be viewed in current Adobe Readers on MS Windows and other pla \item Ghostscript, version $\ge8.31$ or Adobe Distiller for PS to PDF conversion \item dvipdfmx, version $\ge 20120420$ for DVI to PDF conversion \item Adobe Reader, version $\ge9$, but not greater than 9.4.1 on Linux; Foxit Reader (Flash, video, audio) +\item Adobe Flash Player plugin for Firefox \end{trivlist} \section{Installation} @@ -191,7 +188,7 @@ Except for `\verb+dvipdfmx+', `\verb+xetex+' and `\verb+bigfiles+', the options \begin{animateinline}[autoplay,loop,nomouse]{1}\strut\emph{Important:}\newframe[3]\end{animateinline} If PDF is generated via DVI and Postscript by the command sequence \verb+latex+ $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+, \verb+dvips+ option `\verb+-Ppdf+' should \emph{not} be set when converting the intermediate DVI into Postscript. If you cannot do without, put `\verb+-D 1200+' \emph{after} `\verb+-Ppdf+' on the command line. Users of \LaTeX-aware text editors with menu-driven toolchain invocation, such as \TeX{}nicCenter, should check the configuration of the \verb+dvips+ call. - Option `\verb+bigfiles+' is only relevant for the \verb+latex+ $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+ workflow. It may be needed if large media files cause \verb+latex+ to abort with error `\verb+TeX capacity exceeded+'. See Sect.\ \ref{bugs}.\enlargethispage{2\baselineskip} + Option `\verb+bigfiles+' is only relevant for the \verb+latex+ $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+ workflow. It may be needed if large media files cause \verb+latex+ to abort with error `\Verb+TeX capacity+ \Verb+exceeded+'. See Sect.\ \ref{bugs}.\enlargethispage{2\baselineskip} \section{The user interface} @@ -267,7 +264,7 @@ Decides on how to activate the media annotation. `\verb+activate=onclick+' is de \begin{verbatim} deactivate=onclick | pageclose | pageinvisible \end{verbatim} -Decides on how to de-activate the media annotation. `\verb+deactivate=pageclose+' is default behaviour and does not need be given explicitly; media is automatically de-activated when the user leaves the page containing the media. `\verb+pageinvisible+' is similar, but may be better for two-up and continuous page display. Setting `\verb+deactivate=onclick+' requires user interaction for de-activating the media, either by right-click and chosing `\emph{\sffamily Disable Content}' or by a JavaScript. +Decides on how to de-activate the media annotation. `\verb+deactivate=pageclose+' is default behaviour and does not need be given explicitly; media is automatically de-activated when the user leaves the page containing the media. `\verb+pageinvisible+' is similar, but may be better for two-up and continuous page display. Setting `\verb+deactivate+ \verb+=onclick+' requires user interaction for de-activating the media, either by right-click and chosing `\emph{\sffamily Disable Content}' or by a JavaScript. \hypertarget{draftfinal}{}% \begin{verbatim} draft @@ -784,11 +781,14 @@ parameter & description\\\hline\hline \caption{Configuration file template (XML format) for `SlideShow.swf'}\label{SlideShowXML} \end{figure} -\makeatletter% -\def\myAcrobatmenu#1#2{\leavevmode\pdfstartlink attr{\Hy@setpdfborder\ifx\@pdfhighlight\@empty\else/H\@pdfhighlight\fi\ifx\@menubordercolor\relax\else/C[\@menubordercolor]\fi} user{/Subtype/Link\ifHy@pdfa/F4\fi/A<</S/Named/N/#1>>}\relax\Hy@colorlink\@menucolor#2\close@pdflink}\makeatother -\savebox{\keyshift}{\keys{\shift+}} -\savebox{\spacebar}{\keys{\unexpanded{\makebox[2\width][c]{Space}}}} \begin{figure}[bp] +\makeatletter% +\begingroup% locally fixing \Acrobatmenu for use in \caption +\def\HyColor@UseColor#1{\color{#1}}% +\def\Acrobatmenu#1#2{\leavevmode\pdfstartlink attr{\Hy@setpdfborder\ifx\@pdfhighlight\@empty\else/H\@pdfhighlight\fi\ifx\@menubordercolor\relax\else/C[\@menubordercolor]\fi}user{/Subtype/Link\ifHy@pdfa/F 4\fi/A<</S/Named/N/#1>>}\relax\Hy@colorlink\@menucolor#2\close@pdflink}% +\makeatother% +\savebox{\keyshift}{\keys{\shift+}}% +\savebox{\spacebar}{\keys{\unexpanded{\makebox[2\width][c]{Space}}}}% \centering \begin{Verbatim} \includemedia[ @@ -812,7 +812,8 @@ parameter & description\\\hline\hline passcontext %show the player's context menu ]{}{SlideShow.swf} \hfill} -\caption{Slide-show example with one embedded and several remote image files, one of which is a live image. Images 2 and 3 are examples of remote images with variable resolution; the best fitting image resolution is requested from the server depending on the current display size. The listing in Fig.~\ref{SlideShowXML} is used as content of file \myAcrobatmenu{ShowHideFileAttachment}{`config.xml'}. Manually cycle forwards through the images by mouse-click or backwards by \usebox{\keyshift}+mouse-click. Play/pause auto-cycling through the slide-show by hitting \usebox{\spacebar}. Also, the context (right-click) menu of the player can be used.}\label{slideshowex} +\caption{Slide-show example with one embedded and several remote image files, one of which is a live image. Images 2 and 3 are examples of remote images with variable resolution; the best fitting image resolution is requested from the server depending on the current display size. The listing in Fig.~\ref{SlideShowXML} is used as content of file \Acrobatmenu{ShowHideFileAttachment}{`config.xml'}. Manually cycle forwards through the images by mouse-click or backwards by \usebox{\keyshift}+mouse-click. Play/pause auto-cycling through the slide-show by hitting \usebox{\spacebar}. Also, the context (right-click) menu of the player can be used.}\label{slideshowex} +\endgroup \end{figure} \begin{figure}[bp] diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index e1aae7a7777..5efe52989dc 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -40,8 +40,8 @@ \RequirePackage{xparse} \RequirePackage{atbegshi} -\def\g@mix@date@tl{2017/03/23} -\def\g@mix@version@tl{0.78} +\def\g@mix@date@tl{2017/04/25} +\def\g@mix@version@tl{0.79} \def\g@mix@liiikerneldate{2015/09/27} \def\g@mix@liiipkgdate{2015/09/27} diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index d71b2f2a41d..ff7bb3ee7d4 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -131,7 +131,7 @@ \RequirePackage{l3keys2e} \def\g@pbs@date@tl{2017/03/23} -\def\g@pbs@version@tl{0.15} +\def\g@pbs@version@tl{0.14} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -295,16 +295,26 @@ \tl_gset:Nx\g_pbs_pdflastobj_tl{\the\pdflastobj\space 0~R} } \cs_new_nopar:Nn\pbs_pdfannot:nnnn{ - %(hidden) dummy Widget, workaround for (pre?) AR-DC bug; + %dumb dummy Widget, workaround for AR bug; %see https://forums.adobe.com/message/5787612#5787612 \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ - \immediate\pdfannot~width~#1~height~#2~depth~#3 {/Subtype/Widget/F~2}} + \immediate\pdfannot~width~3pt~height~3pt~depth~\c_zero_dim { + /Ff~65537/FT/Btn/Subtype/Widget + } + } \immediate\pdfannot~width~#1~height~#2~depth~#3 { \cs_if_exist_use:N\ocgbase_insert_oc:~#4} \tl_gset:Nx\g_pbs_pdflastann_tl{\the\pdflastannot\space 0~R} } \cs_new:Nn\pbs_pdflink:nn{ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \immediate\pdfannot~width~3pt~height~3pt~depth~\c_zero_dim { + /Ff~65537/FT/Btn/Subtype/Widget + } + } \immediate\pdfstartlink~user~{ \cs_if_exist_use:N\ocgbase_insert_oc:~#1}#2\pdfendlink } @@ -447,13 +457,11 @@ \bool_if:NTF\g_pbs_lscape_bool{ %fix missing annotation rotation of (x)dvipdfmx on landscape pages \box_move_up:nn{\dim_eval:n{#2}}{\vbox:n{ - %(hidden) dummy Widget, workaround for (pre?) AR-DC bug; + %dumb dummy Widget, workaround for AR bug; %see https://forums.adobe.com/message/5787612#5787612 \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ \special{pdf:ann~ - width~\dim_eval:n{#2+#3}\space - height~\dim_eval:n{#1}\space - depth~\dim_eval:n{\c_zero_dim}~<</Subtype/Widget/F~2>> + width~3pt~height~3pt~depth~0pt~<</Ff~65537/FT/Btn/Subtype/Widget>> } } \special{pdf:ann~@pbs@obj\int_use:N\g_pbs_obj_int\space @@ -464,13 +472,11 @@ } }} }{ - %(hidden) dummy Widget, workaround for (pre?) AR-DC bug; + %dumb dummy Widget, workaround for AR bug; %see https://forums.adobe.com/message/5787612#5787612 \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ \special{pdf:ann~ - width~\dim_eval:n{#1}\space - height~\dim_eval:n{#2}\space - depth~\dim_eval:n{#3}~<</Subtype/Widget/F~2>> + width~3pt~height~3pt~depth~0pt~<</Ff~65537/FT/Btn/Subtype/Widget>> } } \special{pdf:ann~@pbs@obj\int_use:N\g_pbs_obj_int\space @@ -484,6 +490,13 @@ } \cs_new:Nn\pbs_pdflink:nn{ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \special{pdf:ann~ + width~3pt~height~3pt~depth~0pt~<</Ff~65537/FT/Btn/Subtype/Widget>> + } + } \special{pdf:bann~<<\cs_if_exist_use:N\ocgbase_insert_oc:~#1>>}#2 \special{pdf:eann} } @@ -701,28 +714,36 @@ } \end{picture} \group_end: + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ \special{ps:~ mark~ /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} /Rect~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] - /Subtype/Widget/F~2 + /Ff~65537/FT/Btn/Subtype/Widget /ANN~pdfmark } \int_gincr:N\g_pbs_obj_int } - \special{ps:~ - mark~ - /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} - /Rect~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] - \cs_if_exist_use:N\ocgbase_insert_oc:~#4 - /ANN~pdfmark + %the actual annotation + \str_if_eq_x:nnF{#4}{}{ + \special{ps:~ + mark~ + /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} + /Rect~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] + \cs_if_exist_use:N\ocgbase_insert_oc:~#4 + /ANN~pdfmark + } + \tl_gset:Nx\g_pbs_pdflastann_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} + \int_gincr:N\g_pbs_obj_int } - \tl_gset:Nx\g_pbs_pdflastann_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} - \int_gincr:N\g_pbs_obj_int } \cs_new:Nn\pbs_pdflink:nn{ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \pbs_pdfannot:nnnn{3pt}{3pt}{0pt}{} \cs_if_exist:NTF\pdfmark{ \pdfmark[#2]{pdfmark=/ANN,Raw={ \cs_if_exist_use:N\ocgbase_insert_oc:~#1}} |