From dc56a5bbe8069dd54fad6f8777e836f9deda7908 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Mar 2021 21:11:17 +0000 Subject: optex (18mar21) git-svn-id: svn://tug.org/texlive/trunk@58515 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/optex/base/slides.opm | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/optex/base/slides.opm') diff --git a/Master/texmf-dist/tex/luatex/optex/base/slides.opm b/Master/texmf-dist/tex/luatex/optex/base/slides.opm index 5ee4346674a..94fa3afac83 100644 --- a/Master/texmf-dist/tex/luatex/optex/base/slides.opm +++ b/Master/texmf-dist/tex/luatex/optex/base/slides.opm @@ -1,6 +1,6 @@ % This is part of the OpTeX project, see http://petr.olsak.net/optex -\_codedecl \slideshow {Slides style for OpTeX <2021-01-16>} % loaded on demand by \slides +\_codedecl \slideshow {Slides style for OpTeX <2021-03-10>} % loaded on demand by \slides \_doc ----------------------------- Default margins and design is declared here. @@ -79,7 +79,7 @@ \_newcount\_gilevel \_def\*{*} -\_adef*{\_startitem} +\_adef*{\_relax\_ifmmode*\_else\_ea\_startitem\_fi} \_sdef{_item:X}{\Blue\_raise.2ex\_fullrectangle{.8ex}\_kern.5em} \_sdef{_item:x}{\Blue\_raise.3ex\_fullrectangle{.6ex}\_kern.4em} \_style X @@ -146,9 +146,10 @@ \_newbox\_slidepage \_newbox\_slidepageB \_countdef\_slidelayer=1 -\_def\_decr#1{\_global\_advance#1 by-1 } -\_def\_slideshow{\_slidelayer=1 \_slideshowactive \_setbox\_slidepage=\_vbox\_bgroup} +\_def\_slideshow{\_slidelayer=1 \_slideshowactive + \_let\slideopen=\_relax % first wins + \_setbox\_slidepage=\_vbox\_bgroup\_bgroup} \_def\_slideshowactive{% \_sdef{_spg:;}{\_closepage \_global\_slidelayer=1 \_resetpage \_openslide} @@ -159,11 +160,11 @@ } \_def\_destboxslide{\_def\_destbox[##1:##2]{\_isequal{##1}{ref}\_iffalse \_destboxori[##1:##2]\_fi}} -\_def\_openslide{\_setbox\_slidepage=\_vbox\_bgroup \_setilevel +\_def\_openslide{\_setbox\_slidepage=\_vbox\_bgroup\_bgroup \_setilevel \_ifvoid\_slidepage \_else \_unvbox\_slidepage \_nointerlineskip\_lastbox \_fi} \_def\_setilevel{\_loop \_decr\_gilevel \_ifnum\_gilevel<0 \_else \_begitems \_repeat} -\_def\_closepage{\_egroups +\_def\_closepage{\_egroups \_egroup \_ifnum \_maxlayers=0 \_unvcopy\_slidepage \_vfil\_break \_else \_begingroup \_setwarnslides \_layernum=0 \_loop @@ -202,7 +203,14 @@ \_global\_maxlayers=#1 \_setbox\_slidepageB=\_vbox\_bgroup } -\_public \subtit \slideshow \pg \wideformat \use \pshow \layernum ; +\_def\_slideopen{\_let\slideshow=\_relax % first wins + \_sdef{_spg:;}{\_egroups\_vfil\_break \_lfnotenumreset\_bgroup \_setilevel} + \_sdef{_spg:.}{\_egroups\_endslides} + \_sdef{_spg:+}{\_egroups\_bgroup \_setilevel} + \_bgroup +} + +\_public \subtit \slideshow \slideopen \pg \wideformat \use \pshow \layernum ; \_doc ----------------------------- Default \`\layers` `` macro (when \^`\slideshow` is not activated) is simple. @@ -232,5 +240,8 @@ The user manual of \OpTeX/ slides are in `op-slides.tex` file. +2021-03-10 \slideopen introduced, bug with colors in \setbox fixed +2021-03-10 \ifmmode* added to \adef* +2021-02-15 \_def\_decr removed 2021-01-16 \layers at empty page raises error: problem fixed 2020-03-19 slides introduced -- cgit v1.2.3