media9 (25sep13)

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

3 files changed, 35 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 3f80bea4ae2..151ee765822 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-24
+	* v0.33
+	* Fix: Adobe Reader prompting for "save changes" on closing
+
 2013-09-06
 	* v0.32
 	* change: `bigfiles' package option no longer requires `-dNOSAFER' with
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index dd6b2ba1d7b..989721e57d3 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 813fd34c956..605494acf4e 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -41,8 +41,8 @@
 \RequirePackage{ifpdf}
 \RequirePackage{atbegshi}
 
-\def\g@mix@date@tl{2013/09/06}
-\def\g@mix@version@tl{0.32}
+\def\g@mix@date@tl{2013/09/24}
+\def\g@mix@version@tl{0.33}
 
 \def\g@mix@liiikerneldate{2013/07/28}
 \def\g@mix@liiipkgdate{2013/07/28}
@@ -96,7 +96,7 @@
 
 %unknown package option error message
 \msg_set:nnnn{media9}{unknown~package~option}{Unknown~package~option~`#1'.}{
-  Package option~'#1'~is~not~known~by~media9:\\
+  Package option~'#1'~is~unknown;\\
   perhaps~it~is~spelled~incorrectly.
 }
 
@@ -459,25 +459,6 @@
 }
 \group_end:
 
-%add AcroForm entry to PDF Catalog
-\AtBeginDocument{
-  \@ifpackageloaded{animate}{}{
-    \bool_if:NTF\g_mix_pdfoutput_bool{
-      \pdfcatalog{/AcroForm~<</Fields~[]/NeedAppearances~true>>}
-    }{
-      \bool_if:NTF\g_mix_dvipdfmx_bool{ %dvipdfmx/XeTeX
-        \special{pdf:put~@catalog~<<
-          /AcroForm~<</Fields~[]/NeedAppearances~true>>>>}
-      }{
-        \special{ps:
-          mark~{Catalog}~<</AcroForm~<</Fields~[]/NeedAppearances~true>>>>~
-            /PUT~pdfmark
-        }
-      }
-    }
-  }
-}
-
 %commands for creating PDF objects, annots etc.
 \bool_if:NTF\g_mix_pdfoutput_bool{
   %helper func to remove `0 R' part from pdf obj reference
@@ -540,6 +521,14 @@
     %converted to binary UTF16BE using \pdfunescapehex (pdfTeX only)
     \tl_set:Nn\l_mix_ndname_tl{\mix_unescapehex:n{#1}}
   }
+
+  %macro for adding AcroForm entry to PDF Catalog
+  \cs_new:Nn\mix_insert_acroform:{
+    \tl_if_exist:cF{Acro@Form@added}{
+      \pdfcatalog{/AcroForm~<</Fields~[]/NeedAppearances~true>>}
+      \tl_gset:cn{Acro@Form@added}{}
+    }
+  }  
 }{
   \int_new:N\g_mix_obj_int % object ID
   \bool_if:NTF\g_mix_dvipdfmx_bool{ %dvipdfmx/XeTeX
@@ -620,6 +609,14 @@
     \cs_new:Nn\mix_ndname:n{%#1:HEX encoded UTF16BE string
       \tl_set:Nn\l_mix_ndname_tl{<#1>}
     }
+
+    \cs_new:Nn\mix_insert_acroform:{
+      \tl_if_exist:cF{Acro@Form@added}{
+        \special{pdf:put~@catalog~<<
+          /AcroForm~<</Fields~[]/NeedAppearances~true>>>>}
+        \tl_gset:cn{Acro@Form@added}{}
+      }
+    }  
   }{
     % dvips
     \bool_new:N\g_mix_powerdot_bool %to cope with some powerdot oddity
@@ -889,6 +886,16 @@
       %converted to binary UTF16BE by ps2pdf
       \tl_set:Nn\l_mix_ndname_tl{mix@unicode}
     }
+
+    \cs_new:Nn\mix_insert_acroform:{
+      \tl_if_exist:cF{Acro@Form@added}{
+        \special{ps:
+          mark~{Catalog}~<</AcroForm~<</Fields~[]/NeedAppearances~true>>>>~
+            /PUT~pdfmark
+        }
+        \tl_gset:cn{Acro@Form@added}{}
+      }
+    }  
   }
 }
 
@@ -1361,6 +1368,7 @@
         /T~(fd@\g_mix_label_tl)
         /AA~<</PO~\g_mix_pdflastobj_tl~/PV~\g_mix_pdflastobj_tl>>
       }
+      \mix_insert_acroform:
     }
     \hbox_to_wd:nn{\c_zero_dim}{
       \box_move_down:nn{\l_mix_dp_tl-\box_dp:N\l_mix_poster_box}{
@@ -2447,6 +2455,7 @@
         \tl_if_empty:NF\g_mix_btnactions_tl{/Next~[\g_mix_btnactions_tl]}
       >>
     }
+    \mix_insert_acroform:
     \hbox_to_wd:nn{\width}{
       \vrule~width~\c_zero_dim~height~\height~depth~\depth\hss
     }