slideshow 0.7.8 → 0.8

data/lib/slideshow/opts.rb

@@ -50,6 +50,18 @@ class Opts
     get_boolean( 'generate', false )
   end
   
+  def list?
+    get_boolean( 'list', false )
+  end
+  
+  def fetch?
+    get( 'fetch_uri', nil ) != nil
+  end
+  
+  def fetch_uri
+    get( 'fetch_uri', '-fetch uri required-' )
+  end
+  
   def has_includes?
     @hash[ :include ]
   end
@@ -71,6 +83,10 @@ class Opts
     get( 'manifest', 's6.txt' )
   end
   
+  def config_path
+    get( 'config_path', nil )
+  end
+  
   def output_path
     get( 'output', '.' )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: "0.8"
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -04:00
+date: 2009-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,22 +86,6 @@ files:
 - templates/s5/s5-core.css
 - templates/s5/slides.js
 - templates/s5/style.css.erb
-- templates/s5blank.txt.gen
-- templates/s5blank.txt.sample
-- templates/s5blank/blank.textile
-- templates/s5blank/footer.html.erb
-- templates/s5blank/header.html.erb
-- templates/s5blank/ui/default/blank.gif
-- templates/s5blank/ui/default/bodybg.gif
-- templates/s5blank/ui/default/framing.css
-- templates/s5blank/ui/default/iepngfix.htc
-- templates/s5blank/ui/default/opera.css
-- templates/s5blank/ui/default/outline.css
-- templates/s5blank/ui/default/pretty.css
-- templates/s5blank/ui/default/print.css
-- templates/s5blank/ui/default/s5-core.css
-- templates/s5blank/ui/default/slides.css
-- templates/s5blank/ui/default/slides.js
 - templates/s6.txt
 - templates/s6.txt.gen
 - templates/s6.txt.sample

data/templates/s5blank.txt.gen

@@ -1,17 +0,0 @@
-# manifest to generate sample template package using S5 v1.1 blank package
-
-s5blank.txt              s5blank.txt.sample
-blank.textile            s5blank/blank.textile
-header.html.erb          s5blank/header.html.erb
-footer.html.erb          s5blank/footer.html.erb
-ui/default/blank.gif     s5blank/ui/default/blank.gif
-ui/default/bodybg.gif    s5blank/ui/default/bodybg.gif
-ui/default/framing.css   s5blank/ui/default/framing.css
-ui/default/iepngfix.htc  s5blank/ui/default/iepngfix.htc
-ui/default/opera.css     s5blank/ui/default/opera.css
-ui/default/outline.css   s5blank/ui/default/outline.css
-ui/default/pretty.css    s5blank/ui/default/pretty.css
-ui/default/print.css     s5blank/ui/default/print.css
-ui/default/s5-core.css   s5blank/ui/default/s5-core.css
-ui/default/slides.css    s5blank/ui/default/slides.css
-ui/default/slides.js     s5blank/ui/default/slides.js

data/templates/s5blank.txt.sample

@@ -1,28 +0,0 @@
-# Sample template package manifest using S5.11 blank package
-# Change as desired/needed
-#
-# Configured to use the following headers in header.html.erb:
-# 
-# author: Your Name Here
-# company: Your Company Here
-# title: Your Slide Show Title Here
-# subtitle: Your Subtitle Here
-# footer: Your Footer Here
-# subfooter: Your Subfooter Here
-#
-# Questions? Comments?
-# Send them along to the Free Web Slide Show Alternatives (S5, S6, S9 And Friends) Forum/Mailing List. 
-# http://groups.google.com/group/webslideshow
-
-__file__.html header.html.erb + footer.html.erb
-ui/default/blank.gif
-ui/default/bodybg.gif
-ui/default/framing.css
-ui/default/iepngfix.htc
-ui/default/opera.css
-ui/default/outline.css
-ui/default/pretty.css
-ui/default/print.css
-ui/default/s5-core.css
-ui/default/slides.css
-ui/default/slides.js

data/templates/s5blank/blank.textile

@@ -1,20 +0,0 @@
-author: Your Name Here
-company: Your Company Here
-title: Your Slide Show Title Here
-subtitle: Your Subtitle Here
-footer: Your Footer Here
-subfooter: Your Subfooter Here
-
-
-h1. Slide Title Here
-
-* Point One Here
-* Point Two Here
-
-h1. Another Slide Title Here
-
-Questions? Comments?
-
-Send them along to the
-"Free Web Slide Show Alternatives (S5, S6, S9 And Friends) Forum/Mailing List":http://groups.google.com/group/webslideshow.
-Thanks!

data/templates/s5blank/footer.html.erb

@@ -1,4 +0,0 @@
-</div>
-
-</body>
-</html>

data/templates/s5blank/header.html.erb

@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<title><%= @headers['title'] %></title>
-<!-- metadata -->
-<meta name="generator" content="Slide Show (S9)" />
-<meta name="version" content="S5 1.1" />
-<meta name="author" content="<%= @headers['author']%>" />
-<meta name="company" content="<%= @headers['company']%>" />
-<!-- configuration parameters -->
-<meta name="defaultView" content="slideshow" />
-<meta name="controlVis" content="hidden" />
-<!-- style sheet links -->
-<link rel="stylesheet" href="ui/default/slides.css" type="text/css" media="projection" id="slideProj" />
-<link rel="stylesheet" href="ui/default/outline.css" type="text/css" media="screen" id="outlineStyle" />
-<link rel="stylesheet" href="ui/default/print.css" type="text/css" media="print" id="slidePrint" />
-<link rel="stylesheet" href="ui/default/opera.css" type="text/css" media="projection" id="operaFix" />
-<!-- S5 JS -->
-<script src="ui/default/slides.js" type="text/javascript"></script>
-</head>
-<body>
-
-<div class="layout">
-<div id="controls"><!-- DO NOT EDIT --></div>
-<div id="currentSlide"><!-- DO NOT EDIT --></div>
-<div id="header"></div>
-<div id="footer">
-<h1><%= @headers['footer'] %></h1>
-<h2><%= @headers['subfooter'] %></h2>
-</div>
-
-</div>
-
-
-<div class="presentation">
-
-<div class="slide">
-<h1><%= @headers['title'] %></h1>
-<h2><%= @headers['subtitle'] %></h2>
-<h3><%= @headers['author']%></h3>
-<h4><%= @headers['company']%></h4>
-</div>
-
-
-

data/templates/s5blank/ui/default/framing.css

@@ -1,23 +0,0 @@
-/* The following styles size, place, and layer the slide components.
-   Edit these if you want to change the overall slide layout.
-   The commented lines can be uncommented (and modified, if necessary) 
-    to help you with the rearrangement process. */
-
-/* target = 1024x768 */
-
-div#header, div#footer, .slide {width: 100%; top: 0; left: 0;}
-div#header {top: 0; height: 3em; z-index: 1;}
-div#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;}
-.slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2;  list-style: none;}
-div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;}
-div#controls form {position: absolute; bottom: 0; right: 0; width: 100%;
-  margin: 0;}
-#currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; z-index: 10;}
-html>body #currentSlide {position: fixed;}
-
-/*
-div#header {background: #FCC;}
-div#footer {background: #CCF;}
-div#controls {background: #BBD;}
-div#currentSlide {background: #FFC;}
-*/

data/templates/s5blank/ui/default/iepngfix.htc

@@ -1,42 +0,0 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script>
-
-// IE5.5+ PNG Alpha Fix v1.0 by Angus Turnbull http://www.twinhelix.com
-// Free usage permitted as long as this notice remains intact.
-
-// This must be a path to a blank image. That's all the configuration you need here.
-var blankImg = 'ui/default/blank.gif';
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m) {
- if (filters[f]) {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- } else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix() {
- if ((parseFloat(navigator.userAgent.match(/MSIE (\S+)/)[1]) < 5.5) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- if (tagName == 'IMG') {
-  if ((/\.png$/i).test(src)) {
-   filt(src, 'image');  // was 'scale'
-   src = blankImg;
-  } else if (src.indexOf(blankImg) < 0) filt();
- } else if (style.backgroundImage) {
-  if (style.backgroundImage.match(/^url[("']+(.*\.png)[)"']+$/i)) {
-   var s = RegExp.$1;
-   style.backgroundImage = '';
-   filt(s, 'crop');
-  } else filt();
- }
-}
-
-doFix();
-
-</script>
-</public:component>

data/templates/s5blank/ui/default/opera.css

@@ -1,7 +0,0 @@
-/* DO NOT CHANGE THESE unless you really want to break Opera Show */
-.slide {
-	visibility: visible !important;
-	position: static !important;
-	page-break-before: always;
-}
-#slide0 {page-break-before: avoid;}

data/templates/s5blank/ui/default/outline.css

@@ -1,15 +0,0 @@
-/* don't change this unless you want the layout stuff to show up in the outline view! */
-
-.layout div, #footer *, #controlForm * {display: none;}
-#footer, #controls, #controlForm, #navLinks, #toggle {
-  display: block; visibility: visible; margin: 0; padding: 0;}
-#toggle {float: right; padding: 0.5em;}
-html>body #toggle {position: fixed; top: 0; right: 0;}
-
-/* making the outline look pretty-ish */
-
-#slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;}
-#slide0 h1 {padding-top: 1.5em;}
-.slide h1 {margin: 1.5em 0 0; padding-top: 0.25em;
-  border-top: 1px solid #888; border-bottom: 1px solid #AAA;}
-#toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;}

data/templates/s5blank/ui/default/pretty.css

@@ -1,86 +0,0 @@
-/* Following are the presentation styles -- edit away! */
-
-body {background: #FFF url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;}
-:link, :visited {text-decoration: none; color: #00C;}
-#controls :active {color: #88A !important;}
-#controls :focus {outline: 1px dotted #227;}
-h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;}
-ul, pre {margin: 0; line-height: 1em;}
-html, body {margin: 0; padding: 0;}
-
-blockquote, q {font-style: italic;}
-blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em; text-align: center; font-size: 1em;}
-blockquote p {margin: 0;}
-blockquote i {font-style: normal;}
-blockquote b {display: block; margin-top: 0.5em; font-weight: normal; font-size: smaller; font-style: normal;}
-blockquote b i {font-style: italic;}
-
-kbd {font-weight: bold; font-size: 1em;}
-sup {font-size: smaller; line-height: 1px;}
-
-.slide code {padding: 2px 0.25em; font-weight: bold; color: #533;}
-.slide code.bad, code del {color: red;}
-.slide code.old {color: silver;}
-.slide pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;}
-.slide pre code {display: block;}
-.slide ul {margin-left: 5%; margin-right: 7%; list-style: disc;}
-.slide li {margin-top: 0.75em; margin-right: 0;}
-.slide ul ul {line-height: 1;}
-.slide ul ul li {margin: .2em; font-size: 85%; list-style: square;}
-.slide img.leader {display: block; margin: 0 auto;}
-
-div#header, div#footer {background: #005; color: #AAB;
-  font-family: Verdana, Helvetica, sans-serif;}
-div#header {background: #005 url(bodybg.gif) -16px 0 no-repeat;
-  line-height: 1px;}
-div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;}
-#footer h1, #footer h2 {display: block; padding: 0 1em;}
-#footer h2 {font-style: italic;}
-
-div.long {font-size: 0.75em;}
-.slide h1 {position: absolute; top: 0.7em; left: 87px; z-index: 1;
-  margin: 0; padding: 0.3em 0 0 50px; white-space: nowrap;
-  font: bold 150%/1em Helvetica, sans-serif; text-transform: capitalize;
-  color: #DDE; background: #005;}
-.slide h3 {font-size: 130%;}
-h1 abbr {font-variant: small-caps;}
-
-div#controls {position: absolute; left: 50%; bottom: 0;
-  width: 50%;
-  text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;}
-html>body div#controls {position: fixed; padding: 0 0 1em 0;
-  top: auto;}
-div#controls form {position: absolute; bottom: 0; right: 0; width: 100%;
-  margin: 0; padding: 0;}
-#controls #navLinks a {padding: 0; margin: 0 0.5em; 
-  background: #005; border: none; color: #779; 
-  cursor: pointer;}
-#controls #navList {height: 1em;}
-#controls #navList #jumplist {position: absolute; bottom: 0; right: 0; background: #DDD; color: #227;}
-
-#currentSlide {text-align: center; font-size: 0.5em; color: #449;}
-
-#slide0 {padding-top: 3.5em; font-size: 90%;}
-#slide0 h1 {position: static; margin: 1em 0 0; padding: 0;
-   font: bold 2em Helvetica, sans-serif; white-space: normal;
-   color: #000; background: transparent;}
-#slide0 h2 {font: bold italic 1em Helvetica, sans-serif; margin: 0.25em;}
-#slide0 h3 {margin-top: 1.5em; font-size: 1.5em;}
-#slide0 h4 {margin-top: 0; font-size: 1em;}
-
-ul.urls {list-style: none; display: inline; margin: 0;}
-.urls li {display: inline; margin: 0;}
-.note {display: none;}
-.external {border-bottom: 1px dotted gray;}
-html>body .external {border-bottom: none;}
-.external:after {content: " \274F"; font-size: smaller; color: #77B;}
-
-.incremental, .incremental *, .incremental *:after {color: #DDE; visibility: visible;}
-img.incremental {visibility: hidden;}
-.slide .current {color: #B02;}
-
-
-/* diagnostics
-
-li:after {content: " [" attr(class) "]"; color: #F88;}
- */

data/templates/s5blank/ui/default/print.css

@@ -1 +0,0 @@
-/* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */

data/templates/s5blank/ui/default/s5-core.css

@@ -1,9 +0,0 @@
-/* Do not edit or override these styles! The system will likely break if you do. */
-
-div#header, div#footer, div#controls, .slide {position: absolute;}
-html>body div#header, html>body div#footer, 
-  html>body div#controls, html>body .slide {position: fixed;}
-.handout {display: none;}
-.layout {display: block;}
-.slide, .hideme, .incremental {visibility: hidden;}
-#slide0 {visibility: visible;}

data/templates/s5blank/ui/default/slides.css

@@ -1,3 +0,0 @@
-@import url(s5-core.css); /* required to make the slide show run at all */
-@import url(framing.css); /* sets basic placement and size of slide components */
-@import url(pretty.css);  /* stuff that makes the slides look better than blah */

data/templates/s5blank/ui/default/slides.js

@@ -1,553 +0,0 @@
-// S5 v1.1 slides.js -- released into the Public Domain
-//
-// Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information 
-// about all the wonderful and talented contributors to this code!
-
-var undef;
-var slideCSS = '';
-var snum = 0;
-var smax = 1;
-var incpos = 0;
-var number = undef;
-var s5mode = true;
-var defaultView = 'slideshow';
-var controlVis = 'visible';
-
-var isIE = navigator.appName == 'Microsoft Internet Explorer' && navigator.userAgent.indexOf('Opera') < 1 ? 1 : 0;
-var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0;
-var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0;
-
-function hasClass(object, className) {
-	if (!object.className) return false;
-	return (object.className.search('(^|\\s)' + className + '(\\s|$)') != -1);
-}
-
-function hasValue(object, value) {
-	if (!object) return false;
-	return (object.search('(^|\\s)' + value + '(\\s|$)') != -1);
-}
-
-function removeClass(object,className) {
-	if (!object) return;
-	object.className = object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'), RegExp.$1+RegExp.$2);
-}
-
-function addClass(object,className) {
-	if (!object || hasClass(object, className)) return;
-	if (object.className) {
-		object.className += ' '+className;
-	} else {
-		object.className = className;
-	}
-}
-
-function GetElementsWithClassName(elementName,className) {
-	var allElements = document.getElementsByTagName(elementName);
-	var elemColl = new Array();
-	for (var i = 0; i< allElements.length; i++) {
-		if (hasClass(allElements[i], className)) {
-			elemColl[elemColl.length] = allElements[i];
-		}
-	}
-	return elemColl;
-}
-
-function isParentOrSelf(element, id) {
-	if (element == null || element.nodeName=='BODY') return false;
-	else if (element.id == id) return true;
-	else return isParentOrSelf(element.parentNode, id);
-}
-
-function nodeValue(node) {
-	var result = "";
-	if (node.nodeType == 1) {
-		var children = node.childNodes;
-		for (var i = 0; i < children.length; ++i) {
-			result += nodeValue(children[i]);
-		}		
-	}
-	else if (node.nodeType == 3) {
-		result = node.nodeValue;
-	}
-	return(result);
-}
-
-function slideLabel() {
-	var slideColl = GetElementsWithClassName('*','slide');
-	var list = document.getElementById('jumplist');
-	smax = slideColl.length;
-	for (var n = 0; n < smax; n++) {
-		var obj = slideColl[n];
-
-		var did = 'slide' + n.toString();
-		obj.setAttribute('id',did);
-		if (isOp) continue;
-
-		var otext = '';
-		var menu = obj.firstChild;
-		if (!menu) continue; // to cope with empty slides
-		while (menu && menu.nodeType == 3) {
-			menu = menu.nextSibling;
-		}
-	 	if (!menu) continue; // to cope with slides with only text nodes
-
-		var menunodes = menu.childNodes;
-		for (var o = 0; o < menunodes.length; o++) {
-			otext += nodeValue(menunodes[o]);
-		}
-		list.options[list.length] = new Option(n + ' : '  + otext, n);
-	}
-}
-
-function currentSlide() {
-	var cs;
-	if (document.getElementById) {
-		cs = document.getElementById('currentSlide');
-	} else {
-		cs = document.currentSlide;
-	}
-	cs.innerHTML = '<span id="csHere">' + snum + '<\/span> ' + 
-		'<span id="csSep">\/<\/span> ' + 
-		'<span id="csTotal">' + (smax-1) + '<\/span>';
-	if (snum == 0) {
-		cs.style.visibility = 'hidden';
-	} else {
-		cs.style.visibility = 'visible';
-	}
-}
-
-function go(step) {
-	if (document.getElementById('slideProj').disabled || step == 0) return;
-	var jl = document.getElementById('jumplist');
-	var cid = 'slide' + snum;
-	var ce = document.getElementById(cid);
-	if (incrementals[snum].length > 0) {
-		for (var i = 0; i < incrementals[snum].length; i++) {
-			removeClass(incrementals[snum][i], 'current');
-			removeClass(incrementals[snum][i], 'incremental');
-		}
-	}
-	if (step != 'j') {
-		snum += step;
-		lmax = smax - 1;
-		if (snum > lmax) snum = lmax;
-		if (snum < 0) snum = 0;
-	} else
-		snum = parseInt(jl.value);
-	var nid = 'slide' + snum;
-	var ne = document.getElementById(nid);
-	if (!ne) {
-		ne = document.getElementById('slide0');
-		snum = 0;
-	}
-	if (step < 0) {incpos = incrementals[snum].length} else {incpos = 0;}
-	if (incrementals[snum].length > 0 && incpos == 0) {
-		for (var i = 0; i < incrementals[snum].length; i++) {
-			if (hasClass(incrementals[snum][i], 'current'))
-				incpos = i + 1;
-			else
-				addClass(incrementals[snum][i], 'incremental');
-		}
-	}
-	if (incrementals[snum].length > 0 && incpos > 0)
-		addClass(incrementals[snum][incpos - 1], 'current');
-	ce.style.visibility = 'hidden';
-	ne.style.visibility = 'visible';
-	jl.selectedIndex = snum;
-	currentSlide();
-	number = 0;
-}
-
-function goTo(target) {
-	if (target >= smax || target == snum) return;
-	go(target - snum);
-}
-
-function subgo(step) {
-	if (step > 0) {
-		removeClass(incrementals[snum][incpos - 1],'current');
-		removeClass(incrementals[snum][incpos], 'incremental');
-		addClass(incrementals[snum][incpos],'current');
-		incpos++;
-	} else {
-		incpos--;
-		removeClass(incrementals[snum][incpos],'current');
-		addClass(incrementals[snum][incpos], 'incremental');
-		addClass(incrementals[snum][incpos - 1],'current');
-	}
-}
-
-function toggle() {
-	var slideColl = GetElementsWithClassName('*','slide');
-	var slides = document.getElementById('slideProj');
-	var outline = document.getElementById('outlineStyle');
-	if (!slides.disabled) {
-		slides.disabled = true;
-		outline.disabled = false;
-		s5mode = false;
-		fontSize('1em');
-		for (var n = 0; n < smax; n++) {
-			var slide = slideColl[n];
-			slide.style.visibility = 'visible';
-		}
-	} else {
-		slides.disabled = false;
-		outline.disabled = true;
-		s5mode = true;
-		fontScale();
-		for (var n = 0; n < smax; n++) {
-			var slide = slideColl[n];
-			slide.style.visibility = 'hidden';
-		}
-		slideColl[snum].style.visibility = 'visible';
-	}
-}
-
-function showHide(action) {
-	var obj = GetElementsWithClassName('*','hideme')[0];
-	switch (action) {
-	case 's': obj.style.visibility = 'visible'; break;
-	case 'h': obj.style.visibility = 'hidden'; break;
-	case 'k':
-		if (obj.style.visibility != 'visible') {
-			obj.style.visibility = 'visible';
-		} else {
-			obj.style.visibility = 'hidden';
-		}
-	break;
-	}
-}
-
-// 'keys' code adapted from MozPoint (http://mozpoint.mozdev.org/)
-function keys(key) {
-	if (!key) {
-		key = event;
-		key.which = key.keyCode;
-	}
-	if (key.which == 84) {
-		toggle();
-		return;
-	}
-	if (s5mode) {
-		switch (key.which) {
-			case 10: // return
-			case 13: // enter
-				if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return;
-				if (key.target && isParentOrSelf(key.target, 'controls')) return;
-				if(number != undef) {
-					goTo(number);
-					break;
-				}
-			case 32: // spacebar
-			case 34: // page down
-			case 39: // rightkey
-			case 40: // downkey
-				if(number != undef) {
-					go(number);
-				} else if (!incrementals[snum] || incpos >= incrementals[snum].length) {
-					go(1);
-				} else {
-					subgo(1);
-				}
-				break;
-			case 33: // page up
-			case 37: // leftkey
-			case 38: // upkey
-				if(number != undef) {
-					go(-1 * number);
-				} else if (!incrementals[snum] || incpos <= 0) {
-					go(-1);
-				} else {
-					subgo(-1);
-				}
-				break;
-			case 36: // home
-				goTo(0);
-				break;
-			case 35: // end
-				goTo(smax-1);
-				break;
-			case 67: // c
-				showHide('k');
-				break;
-		}
-		if (key.which < 48 || key.which > 57) {
-			number = undef;
-		} else {
-			if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return;
-			if (key.target && isParentOrSelf(key.target, 'controls')) return;
-			number = (((number != undef) ? number : 0) * 10) + (key.which - 48);
-		}
-	}
-	return false;
-}
-
-function clicker(e) {
-	number = undef;
-	var target;
-	if (window.event) {
-		target = window.event.srcElement;
-		e = window.event;
-	} else target = e.target;
-	if (target.getAttribute('href') != null || hasValue(target.rel, 'external') || isParentOrSelf(target, 'controls') || isParentOrSelf(target,'embed') || isParentOrSelf(target,'object')) return true;
-	if (!e.which || e.which == 1) {
-		if (!incrementals[snum] || incpos >= incrementals[snum].length) {
-			go(1);
-		} else {
-			subgo(1);
-		}
-	}
-}
-
-function findSlide(hash) {
-	var target = null;
-	var slides = GetElementsWithClassName('*','slide');
-	for (var i = 0; i < slides.length; i++) {
-		var targetSlide = slides[i];
-		if ( (targetSlide.name && targetSlide.name == hash)
-		 || (targetSlide.id && targetSlide.id == hash) ) {
-			target = targetSlide;
-			break;
-		}
-	}
-	while(target != null && target.nodeName != 'BODY') {
-		if (hasClass(target, 'slide')) {
-			return parseInt(target.id.slice(5));
-		}
-		target = target.parentNode;
-	}
-	return null;
-}
-
-function slideJump() {
-	if (window.location.hash == null) return;
-	var sregex = /^#slide(\d+)$/;
-	var matches = sregex.exec(window.location.hash);
-	var dest = null;
-	if (matches != null) {
-		dest = parseInt(matches[1]);
-	} else {
-		dest = findSlide(window.location.hash.slice(1));
-	}
-	if (dest != null)
-		go(dest - snum);
-}
-
-function fixLinks() {
-	var thisUri = window.location.href;
-	thisUri = thisUri.slice(0, thisUri.length - window.location.hash.length);
-	var aelements = document.getElementsByTagName('A');
-	for (var i = 0; i < aelements.length; i++) {
-		var a = aelements[i].href;
-		var slideID = a.match('\#slide[0-9]{1,2}');
-		if ((slideID) && (slideID[0].slice(0,1) == '#')) {
-			var dest = findSlide(slideID[0].slice(1));
-			if (dest != null) {
-				if (aelements[i].addEventListener) {
-					aelements[i].addEventListener("click", new Function("e",
-						"if (document.getElementById('slideProj').disabled) return;" +
-						"go("+dest+" - snum); " +
-						"if (e.preventDefault) e.preventDefault();"), true);
-				} else if (aelements[i].attachEvent) {
-					aelements[i].attachEvent("onclick", new Function("",
-						"if (document.getElementById('slideProj').disabled) return;" +
-						"go("+dest+" - snum); " +
-						"event.returnValue = false;"));
-				}
-			}
-		}
-	}
-}
-
-function externalLinks() {
-	if (!document.getElementsByTagName) return;
-	var anchors = document.getElementsByTagName('a');
-	for (var i=0; i<anchors.length; i++) {
-		var anchor = anchors[i];
-		if (anchor.getAttribute('href') && hasValue(anchor.rel, 'external')) {
-			anchor.target = '_blank';
-			addClass(anchor,'external');
-		}
-	}
-}
-
-function createControls() {
-	var controlsDiv = document.getElementById("controls");
-	if (!controlsDiv) return;
-	var hider = ' onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"';
-	var hideDiv, hideList = '';
-	if (controlVis == 'hidden') {
-		hideDiv = hider;
-	} else {
-		hideList = hider;
-	}
-	controlsDiv.innerHTML = '<form action="#" id="controlForm"' + hideDiv + '>' +
-	'<div id="navLinks">' +
-	'<a accesskey="t" id="toggle" href="javascript:toggle();">&#216;<\/a>' +
-	'<a accesskey="z" id="prev" href="javascript:go(-1);">&laquo;<\/a>' +
-	'<a accesskey="x" id="next" href="javascript:go(1);">&raquo;<\/a>' +
-	'<div id="navList"' + hideList + '><select id="jumplist" onchange="go(\'j\');"><\/select><\/div>' +
-	'<\/div><\/form>';
-	if (controlVis == 'hidden') {
-		var hidden = document.getElementById('navLinks');
-	} else {
-		var hidden = document.getElementById('jumplist');
-	}
-	addClass(hidden,'hideme');
-}
-
-function fontScale() {  // causes layout problems in FireFox that get fixed if browser's Reload is used; same may be true of other Gecko-based browsers
-	if (!s5mode) return false;
-	var vScale = 22;  // both yield 32 (after rounding) at 1024x768
-	var hScale = 32;  // perhaps should auto-calculate based on theme's declared value?
-	if (window.innerHeight) {
-		var vSize = window.innerHeight;
-		var hSize = window.innerWidth;
-	} else if (document.documentElement.clientHeight) {
-		var vSize = document.documentElement.clientHeight;
-		var hSize = document.documentElement.clientWidth;
-	} else if (document.body.clientHeight) {
-		var vSize = document.body.clientHeight;
-		var hSize = document.body.clientWidth;
-	} else {
-		var vSize = 700;  // assuming 1024x768, minus chrome and such
-		var hSize = 1024; // these do not account for kiosk mode or Opera Show
-	}
-	var newSize = Math.min(Math.round(vSize/vScale),Math.round(hSize/hScale));
-	fontSize(newSize + 'px');
-	if (isGe) {  // hack to counter incremental reflow bugs
-		var obj = document.getElementsByTagName('body')[0];
-		obj.style.display = 'none';
-		obj.style.display = 'block';
-	}
-}
-
-function fontSize(value) {
-	if (!(s5ss = document.getElementById('s5ss'))) {
-		if (!isIE) {
-			document.getElementsByTagName('head')[0].appendChild(s5ss = document.createElement('style'));
-			s5ss.setAttribute('media','screen, projection');
-			s5ss.setAttribute('id','s5ss');
-		} else {
-			document.createStyleSheet();
-			document.s5ss = document.styleSheets[document.styleSheets.length - 1];
-		}
-	}
-	if (!isIE) {
-		while (s5ss.lastChild) s5ss.removeChild(s5ss.lastChild);
-		s5ss.appendChild(document.createTextNode('body {font-size: ' + value + ' !important;}'));
-	} else {
-		document.s5ss.addRule('body','font-size: ' + value + ' !important;');
-	}
-}
-
-function notOperaFix() {
-	slideCSS = document.getElementById('slideProj').href;
-	var slides = document.getElementById('slideProj');
-	var outline = document.getElementById('outlineStyle');
-	slides.setAttribute('media','screen');
-	outline.disabled = true;
-	if (isGe) {
-		slides.setAttribute('href','null');   // Gecko fix
-		slides.setAttribute('href',slideCSS); // Gecko fix
-	}
-	if (isIE && document.styleSheets && document.styleSheets[0]) {
-		document.styleSheets[0].addRule('img', 'behavior: url(ui/default/iepngfix.htc)');
-		document.styleSheets[0].addRule('div', 'behavior: url(ui/default/iepngfix.htc)');
-		document.styleSheets[0].addRule('.slide', 'behavior: url(ui/default/iepngfix.htc)');
-	}
-}
-
-function getIncrementals(obj) {
-	var incrementals = new Array();
-	if (!obj) 
-		return incrementals;
-	var children = obj.childNodes;
-	for (var i = 0; i < children.length; i++) {
-		var child = children[i];
-		if (hasClass(child, 'incremental')) {
-			if (child.nodeName == 'OL' || child.nodeName == 'UL') {
-				removeClass(child, 'incremental');
-				for (var j = 0; j < child.childNodes.length; j++) {
-					if (child.childNodes[j].nodeType == 1) {
-						addClass(child.childNodes[j], 'incremental');
-					}
-				}
-			} else {
-				incrementals[incrementals.length] = child;
-				removeClass(child,'incremental');
-			}
-		}
-		if (hasClass(child, 'show-first')) {
-			if (child.nodeName == 'OL' || child.nodeName == 'UL') {
-				removeClass(child, 'show-first');
-				if (child.childNodes[isGe].nodeType == 1) {
-					removeClass(child.childNodes[isGe], 'incremental');
-				}
-			} else {
-				incrementals[incrementals.length] = child;
-			}
-		}
-		incrementals = incrementals.concat(getIncrementals(child));
-	}
-	return incrementals;
-}
-
-function createIncrementals() {
-	var incrementals = new Array();
-	for (var i = 0; i < smax; i++) {
-		incrementals[i] = getIncrementals(document.getElementById('slide'+i));
-	}
-	return incrementals;
-}
-
-function defaultCheck() {
-	var allMetas = document.getElementsByTagName('meta');
-	for (var i = 0; i< allMetas.length; i++) {
-		if (allMetas[i].name == 'defaultView') {
-			defaultView = allMetas[i].content;
-		}
-		if (allMetas[i].name == 'controlVis') {
-			controlVis = allMetas[i].content;
-		}
-	}
-}
-
-// Key trap fix, new function body for trap()
-function trap(e) {
-	if (!e) {
-		e = event;
-		e.which = e.keyCode;
-	}
-	try {
-		modifierKey = e.ctrlKey || e.altKey || e.metaKey;
-	}
-	catch(e) {
-		modifierKey = false;
-	}
-	return modifierKey || e.which == 0;
-}
-
-function startup() {
-	defaultCheck();
-	if (!isOp) 
-		createControls();
-	slideLabel();
-	fixLinks();
-	externalLinks();
-	fontScale();
-	if (!isOp) {
-		notOperaFix();
-		incrementals = createIncrementals();
-		slideJump();
-		if (defaultView == 'outline') {
-			toggle();
-		}
-		document.onkeyup = keys;
-		document.onkeypress = trap;
-		document.onclick = clicker;
-	}
-}
-
-window.onload = startup;
-window.onresize = function(){setTimeout('fontScale()', 50);}