From f9f49d3b3996f96e7d04abc78467aa82fe4ead26 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Fri, 1 Jun 2018 21:18:57 +0200 Subject: Final version of reStructuredText. --- Makefile | 18 -- docutils.conf | 7 + slides.html | 566 -------------------------------------------- slides.rst | 38 ++- ui/small-black/blank.gif | Bin 49 -> 0 bytes ui/small-black/framing.css | 24 -- ui/small-black/iepngfix.htc | 42 ---- ui/small-black/opera.css | 8 - ui/small-black/outline.css | 16 -- ui/small-black/pretty.css | 116 --------- ui/small-black/print.css | 24 -- ui/small-black/s5-core.css | 11 - ui/small-black/slides.css | 10 - ui/small-black/slides.js | 558 ------------------------------------------- 14 files changed, 32 insertions(+), 1406 deletions(-) delete mode 100644 Makefile delete mode 100644 slides.html delete mode 100644 ui/small-black/blank.gif delete mode 100644 ui/small-black/framing.css delete mode 100644 ui/small-black/iepngfix.htc delete mode 100644 ui/small-black/opera.css delete mode 100644 ui/small-black/outline.css delete mode 100644 ui/small-black/pretty.css delete mode 100644 ui/small-black/print.css delete mode 100644 ui/small-black/s5-core.css delete mode 100644 ui/small-black/slides.css delete mode 100644 ui/small-black/slides.js diff --git a/Makefile b/Makefile deleted file mode 100644 index dcaace8..0000000 --- a/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -NAME=slides -FILES=$(NAME).pdf $(NAME).odp $(NAME).html - -all: $(FILES) - -%.pdf: %.rst - rst2xetex $< $(basename $<).tex - xelatex $(basename $<).tex - xelatex $(basename $<).tex - -%.odp: %.rst - rst2odp $< $@ - -%.html: %.rst - rst2s5 $< $@ - -clean: - rm -f *.aux *.log *.tex diff --git a/docutils.conf b/docutils.conf index ba5e1e5..d99070b 100644 --- a/docutils.conf +++ b/docutils.conf @@ -13,3 +13,10 @@ current-slide: yes # stylesheet: cs_styles.odt create_sections: no language_code=cs_CZ + +[odf_odp writer] +# stylesheet: cs_styles.odt +language_code=cs_CZ +template-file=urania_black.otp +mono-font=Inconsolata +font=Urania Czech diff --git a/slides.html b/slides.html deleted file mode 100644 index 68054f1..0000000 --- a/slides.html +++ /dev/null @@ -1,566 +0,0 @@ - - - - - - - -Wounded hero revived - - - - - - - - - - - - -
-
-
- - -
-
-
-

Wounded hero revived

- -

Lessons learned from porting M2Crypto to Py3k

- --- - - - - - -
Author:Matěj Cepl <mcepl@cepl.eu>
URL:https://matej.ceplovi.cz/clanky/PyCon18-m2crypto/slides.html
- -
-
-

Origins

-
    -
  • Mitch Kapor sold Lotus to IBM and decided to perpetrate good. -One of his projects was Chandler.
  • -
  • Project is gone The only remainder of the project is -M2Crypto, full Python binding for OpenSSL.
  • -
-

Once upon a time, one Mitch Kapor, who sold Lotus to IBM, and -with money he got decided to perpetrate good. He did many -truly good things for the computer world, was co-founder of -EFF, helped with Mozilla Foundation, but he also founded -rather unsuccessful project, a Python-based universal PIM, -called Chandler.

-

Subversion of the project has been mirrored couple of times, -one by me.

-
-
-

M2Crypto

-
    -
  • M2Crypto was maintained by Heikki Toivonen few years after -Chandler folded, but his last release 0.21.1 was from 2011.
  • -
  • Maintained in Red Hat by Miloslav Trmač.
  • -
  • I took over the project in May 2015.
  • -
-

Maintenaned in Red Hat by Miloslav Trmač, who collected -all patches in RHEL package.

-

I took over the project in May 2015 with the intention just -to publish all patches and be a point of contact for any -issue reports. I haven’t expected much activity, because -package was very silent in RHEL.

-
-
-

Strengths and weaknesses

- -
    -
  • Backed up by stable C library
  • -
  • Rather large coverage of OpenSSL API
  • -
  • Surprisingly widespread use
  • -
  • Large test suite
  • -
- -
    -
  • Unknown issues
  • -
  • Python 3
  • -
  • M2Crypto API copies OpenSSL too closely
  • -
  • Support for Mac OS X and Windows (not mentioning *BSD) was -broken.
  • -
-

Backed by … comparing to PyCrypto and other horrors.

-
-
-

Opportunities & Threats

- -
    -
  • Satisfying current user base
  • -
  • Replacing horrors like PyCrypto
  • -
  • Goal of maintenance is to maintain API
  • -
  • Extend support on non-Linux platforms
  • -
- - -

Distribution bug tracker (especially an enterprise one) is -not a good measure of the real state of use and quality of -package.

-

There are apparently many programmers for custom software, -who use M2Crypto (still it is one of the most complete -bindings for OpenSSL).

-

Threats as a “competing” projects, which may replace -M2Crypto.

-
-
-

Unicode

-
    -
  • The biggest problem of all Python 2 programs: complete -confusion between py2k str means py3k str and when -bytes.
  • -
  • There are numerous uses of both in M2Crypto, because of course -both strings and binary data are present in all functions of -OpenSSL.
  • -
-
-
-

Strategy

-
    -
  • Type Hints
  • -
  • Documentation strings
  • -
  • CI
  • -
  • Extension of platform support
  • -
-
-
-

C API

-
    -
  • All Unicode/bytes translation happens on C level as well
  • -
  • Based on swig, which fortunately natively supports ---py3.
  • -
  • Also need to support two versions of OpenSSL API, 1.1 and -older.
  • -
  • Minimize use of #ifdef s and rather use included shims -for missing functions.
  • -
-
-
-

C shims of missing functions

-
    -
  • For OpenSSL < 1.1
  • -
  • For Python 2
      -
    • PyLong_FromLong() and PyUnicode_AsUTF8() just simple -#define s.
    • -
    • All Pythons >= 2.6 contain whole set of Py3k function stubs -in bytesobject.h.
    • -
    -
  • -
  • For Python 3
      -
    • PyFile_AsFile() I have no idea, why it was removed from -py3k API
    • -
    -
  • -
-
-
-

Type Hints

-
    -
  • PEP 484 providing optional type annotations. Quite -controversial, but clearly very useful for libraries

    -
  • -
  • Native for Python >= 3.5, but supports py2k compatible syntax:

    -
    -def sum(x, y):
    -    # type: (int, int) -> int
    -    return x + y
    -
    -
  • -
  • Especially useful for our situation: marking types helps us to -analyze what invidivual py2k str actually mean.

    -
  • -
-
-
-

Python porting (shims again)

-

The same principles apply as with C functions, “shims, not -#ifdef s”.

-
    -
  • Plenty of issues are resolved by using six (or -modernize, future), so use them. If I did it again, -I would probably use future (and wrote py3k code), but the -difference is slim.
  • -
  • Do not hesitate to create your own shims. So I have for -example, bix_to_hex and oct_to_num or padding functions -there.
  • -
  • http://python-future.org/compatible_idioms.html
  • -
-

Whoever does not understand LISP, is doomed to reinvent it. -Badly. LISP -> six

-
-
- - diff --git a/slides.rst b/slides.rst index 8a48b9d..f5b765b 100644 --- a/slides.rst +++ b/slides.rst @@ -50,6 +50,11 @@ M2Crypto * I took over the project in May 2015. +* Suddenly I found that actual there are users of the project + +* And I needed to do something thinking about the future of the + project. Something like SWOT analysis. + .. class:: handout Maintenaned in Red Hat by `Miloslav Trmač`_, who collected @@ -145,18 +150,6 @@ Unicode OpenSSL. -Strategy -======== - -* Type Hints - -* Documentation strings - -* CI - -* Extension of platform support - - C API ===== @@ -191,6 +184,18 @@ C shims of missing functions py3k API +Strategy +======== + +* Type Hints + +* Documentation strings + +* CI + +* Extension of platform support + + Type Hints ========== @@ -222,7 +227,7 @@ The same principles apply as with C functions, “shims, not difference is slim. * Do not hesitate to create your own shims. So I have for - example, ``bix_to_hex`` and ``oct_to_num`` or padding functions + example, ``bin_to_hex`` and ``oct_to_num`` or padding functions there. * http://python-future.org/compatible_idioms.html @@ -231,3 +236,10 @@ The same principles apply as with C functions, “shims, not Whoever does not understand LISP, is doomed to reinvent it. Badly. LISP -> six + +Questions +========= + +* https://gitlab.com/m2crypto/m2crypto/ + +* ``mcepl@cepl.eu`` or ``@mcepl`` diff --git a/ui/small-black/blank.gif b/ui/small-black/blank.gif deleted file mode 100644 index 75b945d..0000000 Binary files a/ui/small-black/blank.gif and /dev/null differ diff --git a/ui/small-black/framing.css b/ui/small-black/framing.css deleted file mode 100644 index 70287dd..0000000 --- a/ui/small-black/framing.css +++ /dev/null @@ -1,24 +0,0 @@ -/* This file has been placed in the public domain. */ -/* 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#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;} -.slide {top: 0; width: 92%; padding: 1em 4% 0 4%; z-index: 2;} -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;} -*/ diff --git a/ui/small-black/iepngfix.htc b/ui/small-black/iepngfix.htc deleted file mode 100644 index fa9f996..0000000 --- a/ui/small-black/iepngfix.htc +++ /dev/null @@ -1,42 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ui/small-black/opera.css b/ui/small-black/opera.css deleted file mode 100644 index c9d1148..0000000 --- a/ui/small-black/opera.css +++ /dev/null @@ -1,8 +0,0 @@ -/* This file has been placed in the public domain. */ -/* 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;} diff --git a/ui/small-black/outline.css b/ui/small-black/outline.css deleted file mode 100644 index fa767e2..0000000 --- a/ui/small-black/outline.css +++ /dev/null @@ -1,16 +0,0 @@ -/* This file has been placed in the public domain. */ -/* 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;} -#toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;} - -.outline {display: inline ! important;} diff --git a/ui/small-black/pretty.css b/ui/small-black/pretty.css deleted file mode 100644 index 5c19327..0000000 --- a/ui/small-black/pretty.css +++ /dev/null @@ -1,116 +0,0 @@ -/* This file has been placed in the public domain. */ -/* Following are the presentation styles -- edit away! */ - -html, body {margin: 0; padding: 0;} -body {background: black; color: white;} -:link, :visited {text-decoration: none; color: cyan;} -#controls :active {color: #888 !important;} -#controls :focus {outline: 1px dotted #CCC;} -h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;} - -blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em;} -blockquote p {margin: 0;} - -kbd {font-weight: bold; font-size: 1em;} -sup {font-size: smaller; line-height: 1px;} - -.slide pre {padding: 0; margin-left: 0; margin-right: 0; font-size: 90%;} -.slide ul ul li {list-style: square;} -.slide img.leader {display: block; margin: 0 auto;} -.slide tt {font-size: 90%;} - -div#footer {font-family: sans-serif; color: #AAA; - font-size: 0.5em; font-weight: bold; padding: 1em 0;} -#footer h1 {display: block; padding: 0 1em;} -#footer h2 {display: block; padding: 0.8em 1em 0;} - -.slide {font-size: 1.2em;} -.slide h1 {padding-top: 0; z-index: 1; margin: 0; font: bold 150% sans-serif;} -.slide h2 {font: bold 120% sans-serif; padding-top: 0.5em;} -.slide h3 {font: bold 100% sans-serif; padding-top: 0.5em;} -h1 abbr {font-variant: small-caps;} - -div#controls {position: absolute; left: 50%; bottom: 0; - width: 50%; text-align: right; font: bold 0.9em 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; - border: none; color: #888; cursor: pointer;} -#controls #navList {height: 1em;} -#controls #navList #jumplist {position: absolute; bottom: 0; right: 0; - background: black; color: #CCC;} - -#currentSlide {text-align: center; font-size: 0.5em; color: #AAA; - font-family: sans-serif; font-weight: bold;} - -#slide0 {padding-top: 0em} -#slide0 h1 {position: static; margin: 1em 0 0; padding: 0; - font: bold 2em sans-serif; white-space: normal; background: transparent;} -#slide0 h2 {font: bold italic 1em 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;} -.external {border-bottom: 1px dotted gray;} -html>body .external {border-bottom: none;} -.external:after {content: " \274F"; font-size: smaller; color: #FCC;} - -.incremental, .incremental *, .incremental *:after { - color: black; visibility: visible; border: 0;} -img.incremental {visibility: hidden;} -.slide .current {color: lime;} - -.slide-display {display: inline ! important;} - -.huge {font-family: sans-serif; font-weight: bold; font-size: 150%;} -.big {font-family: sans-serif; font-weight: bold; font-size: 120%;} -.small {font-size: 75%;} -.tiny {font-size: 50%;} -.huge tt, .big tt, .small tt, .tiny tt {font-size: 115%;} -.huge pre, .big pre, .small pre, .tiny pre {font-size: 115%;} - -.maroon {color: maroon;} -.red {color: red;} -.magenta {color: magenta;} -.fuchsia {color: fuchsia;} -.pink {color: #FAA;} -.orange {color: orange;} -.yellow {color: yellow;} -.lime {color: lime;} -.green {color: green;} -.olive {color: olive;} -.teal {color: teal;} -.cyan {color: cyan;} -.aqua {color: aqua;} -.blue {color: blue;} -.navy {color: navy;} -.purple {color: purple;} -.black {color: black;} -.gray {color: gray;} -.silver {color: silver;} -.white {color: white;} - -.left {text-align: left ! important;} -.center {text-align: center ! important;} -.right {text-align: right ! important;} - -.animation {position: relative; margin: 1em 0; padding: 0;} -.animation img {position: absolute;} - -/* Docutils-specific overrides */ - -.slide table.docinfo {margin: 1em 0 0.5em 2em;} - -div.sidebar {background-color: black;} - -pre.literal-block, pre.doctest-block {background-color: black;} - -tt.docutils {background-color: black;} - -/* diagnostics */ -/* -li:after {content: " [" attr(class) "]"; color: #F88;} -div:before {content: "[" attr(class) "]"; color: #F88;} -*/ diff --git a/ui/small-black/print.css b/ui/small-black/print.css deleted file mode 100644 index 9d057cc..0000000 --- a/ui/small-black/print.css +++ /dev/null @@ -1,24 +0,0 @@ -/* This file has been placed in the public domain. */ -/* The following rule is necessary to have all slides appear in print! - DO NOT REMOVE IT! */ -.slide, ul {page-break-inside: avoid; visibility: visible !important;} -h1 {page-break-after: avoid;} - -body {font-size: 12pt; background: white;} -* {color: black;} - -#slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;} -#slide0 h3 {margin: 0; padding: 0;} -#slide0 h4 {margin: 0 0 0.5em; padding: 0;} -#slide0 {margin-bottom: 3em;} - -#header {display: none;} -#footer h1 {margin: 0; border-bottom: 1px solid; color: gray; - font-style: italic;} -#footer h2, #controls {display: none;} - -.print {display: inline ! important;} - -/* The following rule keeps the layout stuff out of print. - Remove at your own risk! */ -.layout, .layout * {display: none !important;} diff --git a/ui/small-black/s5-core.css b/ui/small-black/s5-core.css deleted file mode 100644 index 6965f5e..0000000 --- a/ui/small-black/s5-core.css +++ /dev/null @@ -1,11 +0,0 @@ -/* This file has been placed in the public domain. */ -/* 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;} diff --git a/ui/small-black/slides.css b/ui/small-black/slides.css deleted file mode 100644 index 82bdc0e..0000000 --- a/ui/small-black/slides.css +++ /dev/null @@ -1,10 +0,0 @@ -/* This file has been placed in the public domain. */ - -/* required to make the slide show run at all */ -@import url(s5-core.css); - -/* sets basic placement and size of slide components */ -@import url(framing.css); - -/* styles that make the slides look good */ -@import url(pretty.css); diff --git a/ui/small-black/slides.js b/ui/small-black/slides.js deleted file mode 100644 index d628dfe..0000000 --- a/ui/small-black/slides.js +++ /dev/null @@ -1,558 +0,0 @@ -// S5 v1.1 slides.js -- released into the Public Domain -// Modified for Docutils (http://docutils.sf.net) by David Goodger -// -// 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 slideIDs = new Array(); -var incpos = 0; -var number = undef; -var s5mode = true; -var defaultView = 'slideshow'; -var controlVis = 'visible'; - -var isIE = navigator.appName == 'Microsoft Internet Explorer' ? 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(); - if (obj.getAttribute('id')) { - slideIDs[n] = obj.getAttribute('id'); - } - else { - obj.setAttribute('id',did); - slideIDs[n] = 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; - var footer_nodes; - var vis = 'visible'; - if (document.getElementById) { - cs = document.getElementById('currentSlide'); - footer_nodes = document.getElementById('footer').childNodes; - } else { - cs = document.currentSlide; - footer = document.footer.childNodes; - } - cs.innerHTML = '' + snum + '<\/span> ' + - '\/<\/span> ' + - '' + (smax-1) + '<\/span>'; - if (snum == 0) { - vis = 'hidden'; - } - cs.style.visibility = vis; - for (var i = 0; i < footer_nodes.length; i++) { - if (footer_nodes[i].nodeType == 1) { - footer_nodes[i].style.visibility = vis; - } - } -} - -function go(step) { - if (document.getElementById('slideProj').disabled || step == 0) return; - var jl = document.getElementById('jumplist'); - var cid = slideIDs[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 = slideIDs[snum]; - var ne = document.getElementById(nid); - if (!ne) { - ne = document.getElementById(slideIDs[0]); - 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.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 = document.getElementById(hash); - if (target) { - for (var i = 0; i < slideIDs.length; i++) { - if (target.id == slideIDs[i]) return i; - } - } - return null; -} - -function slideJump() { - if (window.location.hash == null || window.location.hash == '') { - currentSlide(); - return; - } - if (window.location.hash == null) return; - var dest = null; - dest = findSlide(window.location.hash.slice(1)); - if (dest == null) { - dest = 0; - } - 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('\#.+'); - 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' + - '