From ede3d3d4cacfbc88f97445cf151c06610b541670 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Tue, 25 Jun 2002 13:58:12 +0000 Subject: [PATCH] Nearly complete rewrite; this will become V3.0 --- slides/Makefile | 2 +- slides/browser/overlay.js | 14 +- slides/browser/slides-default.css | 9 + slides/browser/slides-frames.css | 73 + slides/browser/slides-plain.css | 1 + slides/browser/slides-table.css | 41 + slides/browser/slides-w3c.css | 1 + slides/browser/slides.css | 170 +- slides/graphics/active/arr-next.png | Bin 0 -> 122 bytes slides/graphics/active/arr-prev.png | Bin 0 -> 118 bytes slides/graphics/{ => active}/but-fforward.png | Bin slides/graphics/{ => active}/but-info.png | Bin slides/graphics/{ => active}/but-next.png | Bin slides/graphics/{ => active}/but-prev.png | Bin slides/graphics/{ => active}/but-rewind.png | Bin slides/graphics/active/nav-home.png | Bin 0 -> 372 bytes slides/graphics/active/nav-next.png | Bin 0 -> 406 bytes slides/graphics/active/nav-prev.png | Bin 0 -> 405 bytes slides/graphics/active/nav-toc.png | Bin 0 -> 220 bytes slides/graphics/active/nav-up.png | Bin 0 -> 422 bytes .../{right.png => active/w3c-next.png} | Bin .../{left.png => active/w3c-prev.png} | Bin .../graphics/{toc.png => active/w3c-toc.png} | Bin slides/graphics/blank.png | Bin 97 -> 100 bytes slides/graphics/bullet.gif | Bin 835 -> 0 bytes .../but-fforward.png} | Bin slides/graphics/inactive/but-info.png | Bin 0 -> 301 bytes .../{but-xnext.png => inactive/but-next.png} | Bin .../{but-xprev.png => inactive/but-prev.png} | Bin .../but-rewind.png} | Bin slides/graphics/inactive/nav-home.png | Bin 0 -> 365 bytes slides/graphics/inactive/nav-next.png | Bin 0 -> 384 bytes slides/graphics/inactive/nav-prev.png | Bin 0 -> 420 bytes slides/graphics/inactive/nav-toc.png | Bin 0 -> 226 bytes slides/graphics/inactive/nav-up.png | Bin 0 -> 232 bytes .../{bright.png => inactive/w3c-next.png} | Bin .../{bleft.png => inactive/w3c-prev.png} | Bin slides/graphics/inactive/w3c-toc.png | Bin 0 -> 246 bytes slides/graphics/left.gif | Bin 846 -> 0 bytes slides/graphics/minus.gif | Bin 834 -> 0 bytes slides/graphics/plus.gif | Bin 843 -> 137 bytes slides/graphics/pointer.png | Bin 0 -> 172 bytes slides/graphics/right.gif | Bin 846 -> 0 bytes slides/graphics/toc/bullet.png | Bin 0 -> 167 bytes slides/graphics/toc/closed.png | Bin 0 -> 157 bytes slides/graphics/toc/open.png | Bin 0 -> 146 bytes slides/slides-custom.dtd | 4 +- slides/slides.mod | 13 +- slides/tests/dbgentext.xml | 24 +- slides/tests/minimal.xml | 12 + slides/tests/test-full.xml | 8 +- slides/tests/testhtml.xml | 4 +- slides/xsl/default.xsl | 261 ++++ slides/xsl/frames.xsl | 975 ++++++++---- slides/xsl/graphics.xsl | 89 +- slides/xsl/param.xweb | 424 ++++- slides/xsl/plain.xsl | 469 ++++++ slides/xsl/slides-common.xsl | 1320 ++++++++++++++++ slides/xsl/slides.xsl | 1364 ----------------- slides/xsl/tables.xsl | 451 ++---- slides/xsl/vslides.xsl | 192 ++- slides/xsl/w3c.xsl | 650 +++----- 62 files changed, 3961 insertions(+), 2610 deletions(-) create mode 100644 slides/browser/slides-default.css create mode 100644 slides/browser/slides-frames.css create mode 100644 slides/browser/slides-plain.css create mode 100644 slides/browser/slides-table.css create mode 100644 slides/browser/slides-w3c.css create mode 100644 slides/graphics/active/arr-next.png create mode 100644 slides/graphics/active/arr-prev.png rename slides/graphics/{ => active}/but-fforward.png (100%) rename slides/graphics/{ => active}/but-info.png (100%) rename slides/graphics/{ => active}/but-next.png (100%) rename slides/graphics/{ => active}/but-prev.png (100%) rename slides/graphics/{ => active}/but-rewind.png (100%) create mode 100644 slides/graphics/active/nav-home.png create mode 100644 slides/graphics/active/nav-next.png create mode 100644 slides/graphics/active/nav-prev.png create mode 100644 slides/graphics/active/nav-toc.png create mode 100644 slides/graphics/active/nav-up.png rename slides/graphics/{right.png => active/w3c-next.png} (100%) rename slides/graphics/{left.png => active/w3c-prev.png} (100%) rename slides/graphics/{toc.png => active/w3c-toc.png} (100%) delete mode 100644 slides/graphics/bullet.gif rename slides/graphics/{but-xfforward.png => inactive/but-fforward.png} (100%) create mode 100644 slides/graphics/inactive/but-info.png rename slides/graphics/{but-xnext.png => inactive/but-next.png} (100%) rename slides/graphics/{but-xprev.png => inactive/but-prev.png} (100%) rename slides/graphics/{but-xrewind.png => inactive/but-rewind.png} (100%) create mode 100644 slides/graphics/inactive/nav-home.png create mode 100644 slides/graphics/inactive/nav-next.png create mode 100644 slides/graphics/inactive/nav-prev.png create mode 100644 slides/graphics/inactive/nav-toc.png create mode 100644 slides/graphics/inactive/nav-up.png rename slides/graphics/{bright.png => inactive/w3c-next.png} (100%) rename slides/graphics/{bleft.png => inactive/w3c-prev.png} (100%) create mode 100644 slides/graphics/inactive/w3c-toc.png delete mode 100644 slides/graphics/left.gif delete mode 100644 slides/graphics/minus.gif create mode 100644 slides/graphics/pointer.png delete mode 100644 slides/graphics/right.gif create mode 100644 slides/graphics/toc/bullet.png create mode 100644 slides/graphics/toc/closed.png create mode 100644 slides/graphics/toc/open.png create mode 100644 slides/tests/minimal.xml create mode 100644 slides/xsl/default.xsl create mode 100644 slides/xsl/plain.xsl create mode 100644 slides/xsl/slides-common.xsl delete mode 100644 slides/xsl/slides.xsl diff --git a/slides/Makefile b/slides/Makefile index 9e9eda084..dc48b97de 100644 --- a/slides/Makefile +++ b/slides/Makefile @@ -5,7 +5,7 @@ NEWVER= all: slides.dtd -slides.dtd: slides-custom.dtd +slides.dtd: slides-custom.dtd slides.mod $(FLATTEN) $< > $@ check: diff --git a/slides/browser/overlay.js b/slides/browser/overlay.js index 644bb5b96..9b52d9b7c 100644 --- a/slides/browser/overlay.js +++ b/slides/browser/overlay.js @@ -19,7 +19,7 @@ var overlayIE = document.all ? 1 : 0; var overlayNS6 = document.getElementById && !document.all ? 1 : 0; var overlayPadX = 15; -var overlayPadY = 5; +var overlayPadY = 15; var overlayDelay = 60; var overlayCorner = 'ur'; // ul, ll, ur, lr, uc, lc, cl, cr @@ -47,19 +47,21 @@ function overlayRefresh() { } overlayH = overlayDiv.offsetHeight; - overlayW = overlayDiv.offsetWidth; + overlayW = body.offsetWidth; // overlayDiv.offsetWidth; contentH = body.offsetHeight; } else if (overlayNS4) { overlayLy = window.innerHeight; overlayLx = window.innerWidth; overlayH = document.overlayDiv.clip.height; - overlayW = document.overlayDiv.clip.width; + overlayW = body.clip.width; // document.overlayDiv.clip.width; contentH = body.clip.height; } else if (overlayNS6) { + var odiv = document.getElementById('overlayDiv'); + overlayLy = window.innerHeight; overlayLx = window.innerWidth; - overlayH = document.getElementById('overlayDiv').offsetHeight; - overlayW = document.getElementById('overlayDiv').offsetWidth; + overlayH = odiv.offsetHeight; + overlayW = body.offsetWidth; // odiv.offsetWidth; contentH = body.offsetHeight; } @@ -108,9 +110,11 @@ function overlayRefresh() { var div = document.getElementById("overlayDiv"); var leftpx = overlayX; var toppx = overlayY+window.pageYOffset; + var widthpx = overlayW; div.style.left = leftpx + "px"; div.style.top = toppx + "px"; + div.style.width = widthpx + "px"; if (contentH > overlayLy) { div.style.visibility = "hidden"; diff --git a/slides/browser/slides-default.css b/slides/browser/slides-default.css new file mode 100644 index 000000000..1022d6bc0 --- /dev/null +++ b/slides/browser/slides-default.css @@ -0,0 +1,9 @@ +@import url('slides.css'); + +.toclink { font-size: 10pt; + font-weight: normal; + } + +.toclink a { color: blue; } +.toclink a:link { color: blue; } +.toclink a:visited { color: blue; } diff --git a/slides/browser/slides-frames.css b/slides/browser/slides-frames.css new file mode 100644 index 000000000..47d6f8fb2 --- /dev/null +++ b/slides/browser/slides-frames.css @@ -0,0 +1,73 @@ +@import url('slides.css'); + +.toc-body { margin-left: 2px; + margin-right: 2px; + } + +.foil-body { margin-left: 2px; + margin-right: 2px; + } + +h1.title { margin-top: 0px; + padding-top: 0px; + } + +.navhead { display: visible; + } + +.navfoot { display: visible; + } + +/* ====================================================================== */ + +.navfoot { border-top: 1px solid black; + margin-top: 10px; + padding-top: 4px; + } +/* ====================================================================== */ + +.toc { font-weight: bold; + font-size: 10pt; + } + +.toc a { text-decoration: none; } +.toc a:link { color: blue; } +.toc a:visited { color: blue; } + +.toc .toc-foilgroup a { color: red; } +.toc .toc-foilgroup a:link { color: red; } +.toc .toc-foilgroup a:visited { color: red; } + +.toc .toc-titlefoil a { color: black; } +.toc .toc-titlefoil a:link { color: black; } +.toc .toc-titlefoil a:visited { color: black; } + +.toc .toc-foil a { color: blue; } +.toc .toc-foil a:link { color: blue; } +.toc .toc-foil a:visited { color: blue; } + +.toc-slidesinfo { font-family: sans-serif; + font-weight: bold; + text-align: center; + } + +.toc-titlefoil { font-family: sans-serif; + font-weight: bold; + text-align: center; + } + +.toc-foilgroup { font-family: sans-serif; + margin-left: 0.25in; + text-indent: -0.25in; + font-weight: bold; + color: red; + } + +.toc-foil { font-family: sans-serif; + font-size: 10pt; + margin-left: 0.25in; + text-indent: -0.4in; + font-weight: bold; + color: blue; + } + diff --git a/slides/browser/slides-plain.css b/slides/browser/slides-plain.css new file mode 100644 index 000000000..c22f2891c --- /dev/null +++ b/slides/browser/slides-plain.css @@ -0,0 +1 @@ +@import url('slides.css'); diff --git a/slides/browser/slides-table.css b/slides/browser/slides-table.css new file mode 100644 index 000000000..1c195c9e5 --- /dev/null +++ b/slides/browser/slides-table.css @@ -0,0 +1,41 @@ +@import url('slides.css'); + +.toc-body { margin-left: 2px; + margin-right: 2px; + } + +.foil-body { margin-left: 2px; + margin-right: 2px; + } + +.foilgroup-body { margin-left: 2px; + margin-right: 2px; + } + +h1.title { + margin-top: 0px; + padding-top: 0px; + } + +/* ToC Stuff */ + +.ttoc { + font-size: 10pt; + color: white; + } + +.ttoc a { text-decoration: none; } +.ttoc a:link { color: white } +.ttoc a:visited { color: white } + +.ttoc-title { + font-size: 10pt; + } + +.ttoc-foilset { + font-size: 10pt; + } + +.ttoc-foil { + font-size: 10pt; + } diff --git a/slides/browser/slides-w3c.css b/slides/browser/slides-w3c.css new file mode 100644 index 000000000..c22f2891c --- /dev/null +++ b/slides/browser/slides-w3c.css @@ -0,0 +1 @@ +@import url('slides.css'); diff --git a/slides/browser/slides.css b/slides/browser/slides.css index 85de086fe..0febaa465 100644 --- a/slides/browser/slides.css +++ b/slides/browser/slides.css @@ -1,143 +1,115 @@ -.slidesinfo { text-align: center } -.slidesinfo h1.title { color: blue; - font-family: Arial; +/* General formatting */ + +body { font-family: sans-serif; font-weight: bold; } + +.copyright { color: #7F7F7F; + } + +/* Title page formatting */ + +.slidesinfo { text-align: center; } + +.slidesinfo h1.title { color: blue; + } + .slidesinfo h1.author { color: green; } -.section { font-family: sans-serif; - font-size: 14pt; - font-weight: bold; +.slidesinfo .copyright { color: black; } -.section h1.title { text-align: center; - color: red; - font-family: Arial; + + +/* ToC page formatting */ + +.tocpage h1.title { color: blue; + text-align: center; } -.foil { font-family: sans-serif; - font-size: 14pt; - font-weight: bold; + +.tocpage a { text-decoration: none; } +.tocpage a:link { color: blue; } +.tocpage a:visited { color: blue; } + +.toc-body { margin-left: 0.5in; + margin-right: 0.5in; + } + +/* Foil page formatting */ + +.foil { font-size: 16pt; } -.foil h1.title { text-align: center; +.foil h1.title { text-align: center; color: blue; - font-family: Arial; padding-top: 0pt; margin-top: 0pt; } -.foil h2.subtitle { text-align: center; +.foil h2.subtitle { text-align: center; color: blue; - font-family: Arial; padding-top: 0pt; margin-top: 0pt; } -.mediaobject { text-align: center; +.foil pre { font-size: 18pt; } -/* ====================================================================== */ - -span.navheader { font-family: sans-serif; - font-size: 10pt; - font-weight: bold; - color: black; +.foil-body { margin-left: 0.5in; + margin-right: 0.5in; } -span.navfooter { font-family: sans-serif; - font-size: 8pt; - } - -/* ====================================================================== */ +/* Foilgroup page formatting */ -.toc { font-weight: bold; - font-size: 10pt; +.foilgroup { font-size: 16pt; } - -.toc a { text-decoration: none; } -.toc a:link { color: blue; } -.toc a:visited { color: blue; } - -.toc .toc-section a { color: red; } -.toc .toc-section a:link { color: red; } -.toc .toc-section a:visited { color: red; } - -.toc .toc-titlefoil a { color: black; } -.toc .toc-titlefoil a:link { color: black; } -.toc .toc-titlefoil a:visited { color: black; } - -.toc .toc-foil a { color: blue; } -.toc .toc-foil a:link { color: blue; } -.toc .toc-foil a:visited { color: blue; } - -.toc-slidesinfo { font-family: sans-serif; - font-weight: bold; - text-align: center; - } - -.toc-titlefoil { font-family: sans-serif; - font-weight: bold; - text-align: center; - } - -.toc-section { font-family: sans-serif; - margin-left: 0.25in; - text-indent: -0.25in; - font-weight: bold; +.foilgroup h1.title { text-align: center; color: red; + padding-top: 0pt; + margin-top: 0pt; } - -.toc-foil { font-family: sans-serif; - font-size: 10pt; - margin-left: 0.25in; - text-indent: -0.4in; - font-weight: bold; +.foilgroup h2.subtitle { text-align: center; color: blue; + padding-top: 0pt; + margin-top: 0pt; } -/* ====================================================================== */ - -.ttoc { - font-size: 10pt; - color: white; +.foilgroup-body { margin-left: 0.5in; + margin-right: 0.5in; } -.ttoc a { text-decoration: none; } -.ttoc a:link { color: white } -.ttoc a:visited { color: white } +/* Navigation header formatting */ -.ttoc-title { - font-size: 10pt; +.navhead { border-bottom: 1px solid black; + margin-bottom: 10px; + padding-bottom: 4px; } -.ttoc-section { +.navhead hr.top-nav-sep { display: none; } + +.navhead .slidestitle { font-weight: normal; font-size: 10pt; + font-style: italic; } -.ttoc-foil { - font-size: 10pt; +/* Navigation footer formatting */ + +.navfoot { border-top: 1px solid black; + margin-top: 10px; + padding-top: 4px; } -/* ====================================================================== */ +.navfoot hr.bottom-nav-sep { display: none; } -body.topnavigation { margin-top: 5px; - margin-left: 10px; - margin-right: 10px; - } +/* General navigation formatting */ -body.foil { margin-top: 5px; - margin-left: 10px; - margin-right: 10px; - } +.link-text { font-weight: bold + font-size: 10pt; + } -body.botnavigation { margin-top: 0px; - padding-top: 0px; - margin-left: 10px; - margin-right: 10px; - } -/* ====================================================================== */ +.link-text a { text-decoration: none; } +.link-text a:link { color: blue; } +.link-text a:visited { color: blue; } -div.vnav { - margin-top: 2in; - } +.no-link-text { color: #7F7F7F; } -/* ====================================================================== */ +/* EOF */ diff --git a/slides/graphics/active/arr-next.png b/slides/graphics/active/arr-next.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b8674aac20924216a2b64aaeea0aa371758b8f GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^!a&T)0VEi{mU+AdQcNX5e!&d?qbDkD1@V%+-CYrmYXt}J5Y-G$IYc=`*$sM74+;oHP650B zMA>@$Bn2K)O0Zuo04%o!x*g2<_1xaWpUqGQ0MK}}MIvHmkc-?RGgDPFL&WEph^VT4 z+2!rxOc=v-o%~KyrJU!PnVDHc{CkX%UZ}kJfQ2y-5df$vGnfA5vBp&O9(<~&&jsgn zu7}>H>qJCm<`Y9i`KYaGET=RxJfaUEzDGXQSOY7GNZUoi2 z3;=*f9EPE^vTqX+L@cM$x(T1S`j@-SstgY)rRBD)JN#2!xdD3?2LRxIYx)ajAAWQ! Sk?uqQ0000_pal{D){oExR^jB_Lk3a0=gDO>Hj(8$K(!{h65T^IiTJOT7q zCy+u3q($3Ld%xaV6b1k&@Qp{wsJ6O!K%uc30Mu4tAP@jDas`iSQ2<-&k`YSmr3*Lq zKRhFWVl~7u&*#ZpAx`cbuXam8J-Pv*>-i#3Kp^Q-TV13|~JYz(zk>EfKjA~|l9VUdIxwRH&+_KPGLjmB<&@y>Ec`fix^ z%O$gwT_+U0!rQcC03khLJo}mHvY+_|;D6Wj13JaY{l}x%djJ3c07*qoM6N<$g5d3? AyZ`_I literal 0 HcmV?d00001 diff --git a/slides/graphics/active/nav-prev.png b/slides/graphics/active/nav-prev.png new file mode 100644 index 0000000000000000000000000000000000000000..e744535b226201338bc686381f00b3587fb1a6e8 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1SD^+kpz+qY)RhkE)4%caKYZ?lYt_f1s;*b z3=G@?Ak4T{d2cCDkiEpy*OmPe8#kAP{K@B~@eB-%N}eu`Ar*7xPPQ#-G2m&nFMH(V z-gHxBM)7Ttl(POOPOO?LEw-C|A01-8@!s7($?E*%{p#baxSSS zy)C=ua&3C@H1WkWsjg&)5C+G9XQga^On%C?FXV9gboX3TR^{2!^>yl&cUip|dc6Y- zSN_>!xJ;%@E^X!XO|^09tADC(UEHB!;bdT6{CDL?RjzF}*d_}$U%wn~Jt@xMs1(DQ z*MIKaFRSh_k6kH{6+7dy$=91LBCkC8cr#8`2lZ`wsvB|k(1etxh52E#y;i3FzPBi_ zuV2Mf>Vn|*D=eB@bt(<3ioZIZWmuTDe(A2;*2nS!H*fr9KMp1!W^m)L|@+4Nsd$&ddIOkmdKI;Vst0H;$pi%|6<%n*1fY4NxhRnI>IIDP>s}{(G)URWk}Q%!lrq+MD0( zVc#{KP-mw0q)Z;|^YH4wKG|+;wdyq6=Y$H}x8KZC8#V>CL3YPX1HLBqFZV0R#Vc2R Qr2qf`07*qoM6N<$g2PU;7XSbN literal 0 HcmV?d00001 diff --git a/slides/graphics/right.png b/slides/graphics/active/w3c-next.png similarity index 100% rename from slides/graphics/right.png rename to slides/graphics/active/w3c-next.png diff --git a/slides/graphics/left.png b/slides/graphics/active/w3c-prev.png similarity index 100% rename from slides/graphics/left.png rename to slides/graphics/active/w3c-prev.png diff --git a/slides/graphics/toc.png b/slides/graphics/active/w3c-toc.png similarity index 100% rename from slides/graphics/toc.png rename to slides/graphics/active/w3c-toc.png diff --git a/slides/graphics/blank.png b/slides/graphics/blank.png index 9467705354c844ba2b36ce9ce7810ef01fcd6deb..8c58c6b9496429c02a3cb2c6df99ed1ad887b4c2 100644 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQ%R6tFvH%%&P<#jUXr)F3j@Qd tUS%U7kKfb9F{I*F@{Mj52{v(dhO|3bfljr@rvarHJYD@<);T3K0RUct6k4UEa{HEjtmSN`?>!lvI6-Mo-U3d s6?2jkBv=6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW00930EC2ui01W^Q000Oe0RIUbNU)&6g9sBUT*&aC8#f9cK1?VP NB1MZ0GiD4306T5Njq?Bi diff --git a/slides/graphics/but-xfforward.png b/slides/graphics/inactive/but-fforward.png similarity index 100% rename from slides/graphics/but-xfforward.png rename to slides/graphics/inactive/but-fforward.png diff --git a/slides/graphics/inactive/but-info.png b/slides/graphics/inactive/but-info.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf1f1d90ec0d2e1851563cf5ac0afe8427b25d4 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^@<1%a!2~3Af+lSMQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GGf*{OTpAtV2D9B#o>FdgViA|i3LFeVGGp~U{yF6VSLn`KMo#M#VV!-42*x&^VR|BgxD47ny0_T_^7jkDEdv1{4m zc1H2P?b^}-&BagMhWzCTDjHn~x8kFgTdyDvS@@17`D vls4KuclpJ?Ebrg;-ra5U;6KAA|Ie%|m@_30ymAf%`hvmJ)z4*}Q$iB}r-*#H literal 0 HcmV?d00001 diff --git a/slides/graphics/but-xnext.png b/slides/graphics/inactive/but-next.png similarity index 100% rename from slides/graphics/but-xnext.png rename to slides/graphics/inactive/but-next.png diff --git a/slides/graphics/but-xprev.png b/slides/graphics/inactive/but-prev.png similarity index 100% rename from slides/graphics/but-xprev.png rename to slides/graphics/inactive/but-prev.png diff --git a/slides/graphics/but-xrewind.png b/slides/graphics/inactive/but-rewind.png similarity index 100% rename from slides/graphics/but-xrewind.png rename to slides/graphics/inactive/but-rewind.png diff --git a/slides/graphics/inactive/nav-home.png b/slides/graphics/inactive/nav-home.png new file mode 100644 index 0000000000000000000000000000000000000000..734845adf42539c891283ac7d2a3991f24e484ca GIT binary patch literal 365 zcmV-z0h0cSP)&010qNS#tmY3k(1N3k(52KqANh000McNliru(gqR*015zXR>c4S0QyNp zK~#90y^|qx!!Qhm)m@Q|Wg4|G8|`RsG}r%}l&(0XRt6(1Q4gf&rkQuQ6imox`_p@p zPMeextdA`K#ILxD*;o6QC!_#i9mbJO4JMO+2~!)#(afB8WsD<>h^ZYvj+yD&t~oVj zlcsk0ywHw_h$H9wzV9*M{O1GKwH+b?fQZnJ^8FA8BKj4RQSu?Dmr+!8q4rQ)b80Z4 zsc~dg1pw#Vz{6a*fK4e?)q9^CaP6-@vBKP#xqhqX&KHFhuxXn0>kZ?`7;u_Z+2pxB z1Az1H@P4>UiA<$>@8@0FW|4}j#Tx)1A|i$m7J{3U(*JD$Jh!IbecgOb1Xw|)00000 LNkvXXu0mjf4eFL< literal 0 HcmV?d00001 diff --git a/slides/graphics/inactive/nav-next.png b/slides/graphics/inactive/nav-next.png new file mode 100644 index 0000000000000000000000000000000000000000..1d32d67c5bf08ab8e08da66c9e5c7138fe240177 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI z1_o|^5N4e8lX)pnkiEpy*OmPe8#kAXpqKI77zPGLUQZXtkcv5LCkN&oQQ&cDf0Ui0 zT4cE7ooms=*v`q3S?dyy)Ftp_hI%Y*l^6Q(xrcY%l%Nl7jtmFR>^F1bu=vqX!MN$) zmkp*@12|Z2Z+n@-O@1+>X@;aC3%3Br15uk5(M>$xBz;6TF}d&d zo{*OQEUP%cId|1v%N42Y2kwVP1}h(qX*%}i#NM>D&#O#NzdO2sUH+=wnCM9fX11}6{k9|I$_&Opx2x_8%LxDNY^+GGKKx#4I41~}ULkE>0 zh%t`LTaiK9Fth<^mpVV@TloffVq|P=o?`{Ey~(G>L4sTZ85@BhJ|gl@9?m^3hKU=%G=81cj8dz&ui@OB!C)FNg^NU|S(0Z{Io=PcYnx>P&zm8w_k);w`?*3f> O0000C literal 0 HcmV?d00001 diff --git a/slides/graphics/inactive/nav-toc.png b/slides/graphics/inactive/nav-toc.png new file mode 100644 index 0000000000000000000000000000000000000000..d63483beb7292ab90fa6d628900dc15c6f358d06 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1SD^+kpz+qY)RhkE)4e=9x~ixJ8RDj6yYrJ zh%9Dc;N}5gMtcXP6F@=s5>H=O_DgI+tc*fj(*G|3h4MXJ978JRB>(yU-=6tpLu+H> z!+(o^tGo=H6rQAXSc{E~t!u09ob3e<_p}z6g-vS6{pk6T`?;=*@Sj( z%-`Yipn-L@hKuPD`+~VA?n(319hPc5!La+jLgCQ{sYV`;d(s;FC$gP5y^LYmyTGPX TUo1p{Rx^0I`njxgN@xNAb$Cte literal 0 HcmV?d00001 diff --git a/slides/graphics/inactive/nav-up.png b/slides/graphics/inactive/nav-up.png new file mode 100644 index 0000000000000000000000000000000000000000..689af7e63b3797af929dbd8ec856491cfd75fe8c GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7a$D;Kb?2i11Zh|kH}&M z25tcmW?ZYhw-hMIUgGKN%6^HBn@dt9@%vgUpirr&i(^Q|oVS;~xeh4sxL%z8$Vz9I z;X-ch9YzOx_w?y}Su9u*^kVLF0S>`QM_PComdt4r*k7e%yp8dL>xszr9mfrUzopr0O3SS%>V!Z literal 0 HcmV?d00001 diff --git a/slides/graphics/bright.png b/slides/graphics/inactive/w3c-next.png similarity index 100% rename from slides/graphics/bright.png rename to slides/graphics/inactive/w3c-next.png diff --git a/slides/graphics/bleft.png b/slides/graphics/inactive/w3c-prev.png similarity index 100% rename from slides/graphics/bleft.png rename to slides/graphics/inactive/w3c-prev.png diff --git a/slides/graphics/inactive/w3c-toc.png b/slides/graphics/inactive/w3c-toc.png new file mode 100644 index 0000000000000000000000000000000000000000..458539d3487d588401fd98bbafa7824fbdbedf44 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W*pj^6T^Rm@;DWu&Cj&(|3p^r= z85p>QK$!8;-MT+OLG}_)Usv`^Y(i|zimkhyRxW814qM^mYGlIM9R*Hv_0}I#4B;a z3+sXdvJI>JSdJXtyKD8Tj-EqVp6m)rXaBBB^H5i=%DcsQ=BhrU+~vJC%jUCG_s#}L+Q;y8QXss({S=P-D>`njxgN@xNAwx(Tj literal 0 HcmV?d00001 diff --git a/slides/graphics/left.gif b/slides/graphics/left.gif deleted file mode 100644 index 8d04f7b1d8d806967a1cbf39b32aefb8c1948f1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmZ?wbhEHb6lUOL_|5$#yaIl$! onIU3^z{5lBY|>gS9vc@O?G|B8+EcM%(UBH@d$XPn0|f?a0B5QVr2qf` diff --git a/slides/graphics/minus.gif b/slides/graphics/minus.gif deleted file mode 100644 index 49c68b1cc757145388232462380530f6d70bafb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 834 zcmV-I1HJr5Nk%w1VGRHc0QUd@000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW00930EC2ui01W^Q000Od0RIUbNU)&6g9sBUT*&YrfQJwt7K|9N Mp~Z_B7X}0XJMZL=QUCw| diff --git a/slides/graphics/plus.gif b/slides/graphics/plus.gif index 530b337c286c066ff891c3cace785667a0853d4a..3cd2b081a12fda77ca2c696d1842e9615dc753a1 100644 GIT binary patch literal 137 zcmZ?wbhEHb6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW00930EC2ui01W^Q000Om0RIUbNU)&6g9r}-0FY4N!iN7IDqKiW V;=qa(5n9y9u;E6CAPoit06Q&Zlv4lz diff --git a/slides/graphics/pointer.png b/slides/graphics/pointer.png new file mode 100644 index 0000000000000000000000000000000000000000..35d48308dd8e15d16189e344fa3b600eb023a698 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=%3?!FCJ6-`&5&=FTu0WcBg~7nYATl;GF*UKT ztMC8+|3I;OnaKq}im@cfFPOpM*^M+1C&}C0g`tC0)&s~f^>lFzskoJ#(7+Vtx{yI3 zH7+iW=gE}m%crv&7);%{e5$sA!L+4ImvSG_SfLQY8N%#iEy2LhvYS8uT*CI-Km!;& MUHx3vIVCg!02xj&fB*mh literal 0 HcmV?d00001 diff --git a/slides/graphics/right.gif b/slides/graphics/right.gif deleted file mode 100644 index 0026633be9738c4d5e622887c7d0b0621ed7e0fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmZ?wbhEHb6lUOL_|5i_@% diff --git a/slides/graphics/toc/bullet.png b/slides/graphics/toc/bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..3878b5b8715a3e0f31eae20af294d8b92b22a8f5 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4u6ByT*@`3|I*lDyqr82-2SpV<%OaTa()7Bet# z3xY6XeM`sfB{p#$Yc(@Yxy3*s3r`ovkcv6Uf6g~>8$6t{aGwZw)5#MD z4jlL}zwx2H@+`d>EX>T0>mR-S#ebbk_2I6GJ*}MvLDnV=&o6UIyiSk22Q-7h)78&q Iol`;+05T;sv;Y7A literal 0 HcmV?d00001 diff --git a/slides/graphics/toc/closed.png b/slides/graphics/toc/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..b99daf70c186cced5230d313a03fb0d4623e3fbf GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4u6ByT*@`3|I*lDyqr82-2SpV<%OaTa()7Bet# z3xY6XeM`sfB{p#$3yoiM64HS}dY&$hAr*6y|D12&Hh4JYp!!j!WCN!a x|9N=+OKKWU_-H>V@Wcaq<+|9AayH3b42o4;q6>D0?*i&%@O1TaS?83{1OV(&Eg}E_ literal 0 HcmV?d00001 diff --git a/slides/graphics/toc/open.png b/slides/graphics/toc/open.png new file mode 100644 index 0000000000000000000000000000000000000000..e96afe3cbfdf1145a7fe4ce520c94ce8e80ab066 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4u6ByT*@`3|I*lDyqr82-2SpV<%OaTa()7Bet# z3xY6XeM`sfB{p#$D6%APKcAr*6y|D12&Hh4H?;c5|XW@hD< l)@N7#_f(V^^6}L(GWeFTNE%N!sR1fy@O1TaS?83{1OVAzCoup3 literal 0 HcmV?d00001 diff --git a/slides/slides-custom.dtd b/slides/slides-custom.dtd index 95f5df69a..6d56721cd 100644 --- a/slides/slides-custom.dtd +++ b/slides/slides-custom.dtd @@ -65,8 +65,8 @@ - + %sdocbook.dtd; diff --git a/slides/slides.mod b/slides/slides.mod index 17972b619..e195639f3 100644 --- a/slides/slides.mod +++ b/slides/slides.mod @@ -10,7 +10,8 @@ --> - + + - - - - diff --git a/slides/tests/dbgentext.xml b/slides/tests/dbgentext.xml index 8ad77b81b..dec7e6551 100644 --- a/slides/tests/dbgentext.xml +++ b/slides/tests/dbgentext.xml @@ -1,6 +1,6 @@ - + @@ -19,7 +19,13 @@ Sun Microsystems, Inc. -
The Problem +Introduction +This is the introductory slide + + +The Problem + +This is one the foilgroup slide. Generated Text @@ -54,8 +60,8 @@ naturally -
-
A Solution + +A Solution The Old Solution @@ -114,8 +120,8 @@ is taken from an independently maintained lookup table: -
-
A Better Solution + +A Better Solution Use Markup Templates @@ -176,9 +182,9 @@ subtitle of the component, respectively. ]]> -
+ -
Resources +Resources Resources , the @@ -195,5 +201,5 @@ queries. -
+
diff --git a/slides/tests/minimal.xml b/slides/tests/minimal.xml new file mode 100644 index 000000000..e60b02329 --- /dev/null +++ b/slides/tests/minimal.xml @@ -0,0 +1,12 @@ + + + + +Presentation Title + +Foil Title +Foil content + + + diff --git a/slides/tests/test-full.xml b/slides/tests/test-full.xml index 155d8df22..118fe9693 100644 --- a/slides/tests/test-full.xml +++ b/slides/tests/test-full.xml @@ -6,7 +6,7 @@ 2001Norman Walsh -
Section 1 +Section 1 Test Slides Title 1 ...X @@ -19,8 +19,8 @@ this is a screen -
-
Section 2 + +Section 2 Test Slides Title 1 ... @@ -33,6 +33,6 @@ this is a screen -
+ diff --git a/slides/tests/testhtml.xml b/slides/tests/testhtml.xml index 257a10d32..3f6c771eb 100644 --- a/slides/tests/testhtml.xml +++ b/slides/tests/testhtml.xml @@ -2,7 +2,7 @@ - + HTML Test Slides Title 2001Norman Walsh @@ -54,8 +54,10 @@ this is a screen this is a screen + This foil contains some XHTML: item 1item 2 + diff --git a/slides/xsl/default.xsl b/slides/xsl/default.xsl new file mode 100644 index 000000000..0f94a95c9 --- /dev/null +++ b/slides/xsl/default.xsl @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hide/Show TOC + + + + + toggletoc(this, + + ,' + + ',' + + '); + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/slides/xsl/frames.xsl b/slides/xsl/frames.xsl index 3082828c0..01043293c 100644 --- a/slides/xsl/frames.xsl +++ b/slides/xsl/frames.xsl @@ -2,7 +2,13 @@ - + + + + + + + @@ -15,7 +21,7 @@ - + @@ -64,7 +70,7 @@ -