summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/ocgx2/ChangeLog5
-rw-r--r--Master/texmf-dist/doc/latex/ocgx2/README.md10
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty36
3 files changed, 34 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index e25445944cc..ec21692b52e 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-12
+ * v0.26 : ocgx2.sty
+ * fix: OCView, OCPrint (ocgcolorlinks related OCGs) settings saved for
+ possible re-opening by the user
+
2017-04-25
* v0.25 : ocgx2.sty
* new:OCG switching links (\showocg, \hideocg etc.) with hyperref look
diff --git a/Master/texmf-dist/doc/latex/ocgx2/README.md b/Master/texmf-dist/doc/latex/ocgx2/README.md
index 7468aebd3c8..24b6be352d5 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/README.md
+++ b/Master/texmf-dist/doc/latex/ocgx2/README.md
@@ -7,10 +7,10 @@ https://github.com/agrahn/ocgx2
## Introduction
This package serves as a drop-in replacement for the already existing packages
-`ocgx` by Paul Gaborit and `ocg-p` by Werner Moshammer for the creation of PDF
+**`ocgx`** by Paul Gaborit and **`ocg-p`** by Werner Moshammer for the creation of PDF
Layers.
-It re-implements the functionality of the `ocg`, `ocgx` and `ocg-p` packages and
+It re-implements the functionality of the **`ocg`**, **`ocgx`** and **`ocg-p`** packages and
adds support for all known engines and back-ends including:
- LaTeX ⇒ dvips ⇒ ps2pdf/Distiller
@@ -24,15 +24,15 @@ of (nested) OCGs in the layers tab of PDF viewers, compatibility with the
`animate` and `media9` packages, a re-implementation of **`hyperref`**'s
**`ocgcolorlink`** option.
-To enable dvipdfmx support, pass `dvipdfmx` globally as a class option.
+To enable dvipdfmx support, pass **`dvipdfmx`** globally as a class option.
----
*New features:*
+ layers extending across **page breaks**
-+ grouping layers into **Radio Button Groups**
-+ re-implementing `hyperref`'s `ocgcolorlinks` option
++ grouping layers into **Radio Button Groups** (`ocg` environment option **`radiobtngrp=...`**)
++ re-implementing **`hyperref`**'s **`ocgcolorlinks`** option
for creating OCG coloured links, which are printed on paper in the default
text colour and which can, unlike the original `hyperref` implementation,
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index f1e91adbf63..23981b6cc8f 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -37,8 +37,8 @@
\RequirePackage{xparse}
\RequirePackage{l3keys2e}
-\def\g@ocgxii@date@tl{2017/04/25}
-\def\g@ocgxii@version@tl{0.25}
+\def\g@ocgxii@date@tl{2017/05/12}
+\def\g@ocgxii@version@tl{0.26}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -49,8 +49,11 @@
\AtBeginDocument{
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\ocgxii@newkey[2]{}
- \token_to_str:N\providecommand
- \token_to_str:N\ocgxii@ocg@stack@on@page[2]{}
+ }
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\providecommand\token_to_str:N\ocgxii@ocg@stack@on@page[2]{}
+ }
+ \iow_now:Nx\@mainaux{
\token_to_str:N\providecommand
\token_to_str:N\ocgxii@lnkcol@stack@on@page[2]{}
}
@@ -563,7 +566,7 @@
}
}{
\cs_if_exist:NTF\Hy@colorlink{
- \Hy@colorlink\@linkcolor#6\Hy@endcolorlink\Hy@VerboseLinkStop
+ \Hy@colorlink\@linkcolor#6\Hy@endcolorlink\Hy@VerboseLinkStop
}{#6}
}
}
@@ -683,9 +686,10 @@
\cs_new_nopar:Nn\ocgxii_colourlink_nobreak_end:{
\color@endgroup\egroup
\mbox{
- \ocgbase_oc_bdc:n{\g_ocgxii_ocgprint_tl}
+ \ocgbase_oc_bdc:n{\ocgxii@OCPrint}
\hbox_to_zero:n{\box_use:N0\hss}
- \ocgbase_oc_emc:\ocgbase_oc_bdc:n{\g_ocgxii_ocgview_tl}
+ \ocgbase_oc_emc:
+ \ocgbase_oc_bdc:n{\ocgxii@OCView}
\group_begin:
\exp_after:wN\HyColor@UseColor\l_ocgxii_lnkcol_tl
\box_use_clear:N0
@@ -760,10 +764,10 @@
\hbox_to_zero:n{\skip_horizontal:n{2\paperwidth}.\hss}
\skip_vertical:n{2\paperheight}
}
- \ocgbase_oc_bdc:n{\g_ocgxii_ocgprint_tl}
+ \ocgbase_oc_bdc:n{\ocgxii@OCPrint}
\ocgxii_literal_page:n{-88888~-88888~99999~99999~re~f}
\ocgbase_oc_emc:
- \ocgbase_oc_bdc:n{\g_ocgxii_ocgview_tl}
+ \ocgbase_oc_bdc:n{\ocgxii@OCView}
\group_begin:
\exp_after:wN\HyColor@UseColor\g_ocgxii_lnkcol_tl
\ocgxii_literal_page:n{-88888~-88888~99999~99999~re~f}
@@ -799,12 +803,20 @@
\bool_if:NT\l_ocgxii_ocgcolorlinks_bool{
\@ifpackageloaded{hyperref}{
\Hy@colorlinkstrue
- \Hy@AtBeginDocument{
+ \AtBeginDocument{
\ocgbase_new_ocg:nnn{OCView}{/Print<</PrintState/OFF>>}{on}
- \tl_gset:Nx\g_ocgxii_ocgview_tl{\ocgbase_last_ocg:}
+ \tl_gset:Nx\ocgxii@OCView{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgxii@OCView.opts}{showingui=never,printocg=never}
\ocgbase_new_ocg:nnn{OCPrint}{/Print<</PrintState/ON>>}{off}
- \tl_gset:Nx\g_ocgxii_ocgprint_tl{\ocgbase_last_ocg:}
+ \tl_gset:Nx\ocgxii@OCPrint{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgxii@OCPrint.opts}{showingui=never,printocg=always}
\ocgxii_enable_ocglinks:
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{\ocgxii@OCView}
+ }
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCPrint}{\ocgxii@OCPrint}
+ }
}
}{
\msg_error:nnn{ocgx2}{missing~package}{hyperref}