# HG changeset patch # User gongo@gendarme.cr.ie.u-ryukyu.ac.jp # Date 1234578526 -32400 # Node ID 800cdbaa2f64d63a73032e9cc9a48fcc42520ae2 # Parent d620ac683abe0d1dde1c88e44504d96aa7c01a67 add presentation file diff -r d620ac683abe -r 800cdbaa2f64 presen/presen.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/presen.html Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,768 @@ + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+
+
+

<?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> +<meta name="version" content="S5 1.1" /> +<title>Cell 用の Fine-Grain Task Manager の実装</title> +<style type="text/css">

+

/* +:Author: David Goodger +:Contact: goodger@users.sourceforge.net +:Date: $Date: 2005-12-18 01:56:14 +0100 (Sun, 18 Dec 2005) $ +:Revision: $Revision: 4224 $ +:Copyright: This stylesheet has been placed in the public domain.

+

Default cascading style sheet for the HTML output of Docutils.

+

See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to +customize this style sheet. +*/

+
+

System Message: WARNING/2 (<stdin>, line 20); backlink

+Inline emphasis start-string without end-string.
+

/* used to remove borders from tables and images */ +.borderless, table.borderless td, table.borderless th {

+
+

System Message: WARNING/2 (<stdin>, line 24); backlink

+Inline emphasis start-string without end-string.
+
+

System Message: ERROR/3 (<stdin>, line 26)

+Unexpected indentation.
+
+border: 0 }
+
+
table.borderless td, table.borderless th {
+
+
/* Override padding for "table.docutils td" with "! important".
+

The right padding separates the table cells. */

+
+

System Message: WARNING/2 (<stdin>, line 30); backlink

+Inline emphasis start-string without end-string.
+
+
+
+

System Message: WARNING/2 (<stdin>, line 31)

+Definition list ends without a blank line; unexpected unindent.
+

padding: 0 0.5em 0 0 ! important }

+
+
.first {
+

/* Override more specific margin styles with "! important". */ +margin-top: 0 ! important }

+
+

System Message: WARNING/2 (<stdin>, line 34); backlink

+Inline emphasis start-string without end-string.
+
+
.last, .with-subtitle {
+
margin-bottom: 0 ! important }
+
.hidden {
+
display: none }
+
a.toc-backref {
+
text-decoration: none ; +color: black }
+
blockquote.epigraph {
+
margin: 2em 5em ; }
+
dl.docutils dd {
+
margin-bottom: 0.5em }
+
+

/* Uncomment (and remove this text!) to get bold-faced definition list terms +dl.docutils dt {

+
+

System Message: ERROR/3 (<stdin>, line 55)

+Unexpected indentation.
+
+font-weight: bold }
+
+

System Message: WARNING/2 (<stdin>, line 56)

+Block quote ends without a blank line; unexpected unindent.
+

*/

+
+

System Message: WARNING/2 (<stdin>, line 56); backlink

+Inline emphasis start-string without end-string.
+
+
div.abstract {
+
margin: 2em 5em }
+
div.abstract p.topic-title {
+
font-weight: bold ; +text-align: center }
+
+

div.admonition, div.attention, div.caution, div.danger, div.error, +div.hint, div.important, div.note, div.tip, div.warning {

+
+

System Message: ERROR/3 (<stdin>, line 67)

+Unexpected indentation.
+
+margin: 2em ; +border: medium outset ; +padding: 1em }
+

div.admonition p.admonition-title, div.hint p.admonition-title, +div.important p.admonition-title, div.note p.admonition-title, +div.tip p.admonition-title {

+
+

System Message: ERROR/3 (<stdin>, line 74)

+Unexpected indentation.
+
+font-weight: bold ; +font-family: sans-serif }
+

div.attention p.admonition-title, div.caution p.admonition-title, +div.danger p.admonition-title, div.error p.admonition-title, +div.warning p.admonition-title {

+
+

System Message: ERROR/3 (<stdin>, line 80)

+Unexpected indentation.
+
+color: red ; +font-weight: bold ; +font-family: sans-serif }
+
+
/* Uncomment (and remove this text!) to get reduced vertical space in
+
compound paragraphs.
+
div.compound .compound-first, div.compound .compound-middle {
+
margin-bottom: 0.5em }
+
div.compound .compound-last, div.compound .compound-middle {
+
margin-top: 0.5em }
+
+
+

System Message: WARNING/2 (<stdin>, line 91)

+Definition list ends without a blank line; unexpected unindent.
+

*/

+
+

System Message: WARNING/2 (<stdin>, line 91); backlink

+Inline emphasis start-string without end-string.
+
+
div.dedication {
+
margin: 2em 5em ; +text-align: center ; +font-style: italic }
+
div.dedication p.topic-title {
+
font-weight: bold ; +font-style: normal }
+
div.figure {
+
margin-left: 2em ; +margin-right: 2em }
+
div.footer, div.header {
+
clear: both; +font-size: smaller }
+
div.line-block {
+
display: block ; +margin-top: 1em ; +margin-bottom: 1em }
+
div.line-block div.line-block {
+
margin-top: 0 ; +margin-bottom: 0 ; +margin-left: 1.5em }
+
div.sidebar {
+
margin-left: 1em ; +border: medium outset ; +padding: 1em ; +background-color: #ffffee ; +width: 40% ; +float: right ; +clear: right }
+
div.sidebar p.rubric {
+
font-family: sans-serif ; +font-size: medium }
+
div.system-messages {
+
margin: 5em }
+
div.system-messages h1 {
+
color: red }
+
div.system-message {
+
border: medium outset ; +padding: 1em }
+
div.system-message p.system-message-title {
+
color: red ; +font-weight: bold }
+
div.topic {
+
margin: 2em }
+
+

h1.section-subtitle, h2.section-subtitle, h3.section-subtitle, +h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {

+
+

System Message: ERROR/3 (<stdin>, line 152)

+Unexpected indentation.
+
+margin-top: 0.4em }
+
+
h1.title {
+
text-align: center }
+
h2.subtitle {
+
text-align: center }
+
hr.docutils {
+
width: 75% }
+
img.align-left {
+
clear: left }
+
img.align-right {
+
clear: right }
+
ol.simple, ul.simple {
+
margin-bottom: 1em }
+
ol.arabic {
+
list-style: decimal }
+
ol.loweralpha {
+
list-style: lower-alpha }
+
ol.upperalpha {
+
list-style: upper-alpha }
+
ol.lowerroman {
+
list-style: lower-roman }
+
ol.upperroman {
+
list-style: upper-roman }
+
p.attribution {
+
text-align: right ; +margin-left: 50% }
+
p.caption {
+
font-style: italic }
+
p.credits {
+
font-style: italic ; +font-size: smaller }
+
p.label {
+
white-space: nowrap }
+
p.rubric {
+
font-weight: bold ; +font-size: larger ; +color: maroon ; +text-align: center }
+
p.sidebar-title {
+
font-family: sans-serif ; +font-weight: bold ; +font-size: larger }
+
p.sidebar-subtitle {
+
font-family: sans-serif ; +font-weight: bold }
+
p.topic-title {
+
font-weight: bold }
+
pre.address {
+
margin-bottom: 0 ; +margin-top: 0 ; +font-family: serif ; +font-size: 100% }
+
pre.literal-block, pre.doctest-block {
+
margin-left: 2em ; +margin-right: 2em ; +background-color: #eeeeee }
+
span.classifier {
+
font-family: sans-serif ; +font-style: oblique }
+
span.classifier-delimiter {
+
font-family: sans-serif ; +font-weight: bold }
+
span.interpreted {
+
font-family: sans-serif }
+
span.option {
+
white-space: nowrap }
+
span.pre {
+
white-space: pre }
+
span.problematic {
+
color: red }
+
span.section-subtitle {
+

/* font-size relative to parent (h1..h6 element) */ +font-size: 80% }

+
+

System Message: WARNING/2 (<stdin>, line 251); backlink

+Inline emphasis start-string without end-string.
+
+
table.citation {
+
border-left: solid 1px gray; +margin-left: 1px }
+
table.docinfo {
+
margin: 2em 4em }
+
table.docutils {
+
margin-top: 0.5em ; +margin-bottom: 0.5em }
+
table.footnote {
+
border-left: solid 1px black; +margin-left: 1px }
+
+

table.docutils td, table.docutils th, +table.docinfo td, table.docinfo th {

+
+

System Message: ERROR/3 (<stdin>, line 271)

+Unexpected indentation.
+
+padding-left: 0.5em ; +padding-right: 0.5em ; +vertical-align: top }
+
+
table.docutils th.field-name, table.docinfo th.docinfo-name {
+
font-weight: bold ; +text-align: left ; +white-space: nowrap ; +padding-left: 0 }
+
+

h1 tt.docutils, h2 tt.docutils, h3 tt.docutils, +h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {

+
+

System Message: ERROR/3 (<stdin>, line 283)

+Unexpected indentation.
+
+font-size: 100% }
+
+
tt.docutils {
+
background-color: #eeeeee }
+
ul.auto-toc {
+
list-style-type: none }
+
+

</style> +<!-- configuration parameters --> +<meta name="defaultView" content="slideshow" /> +<meta name="controlVis" content="hidden" /> +<!-- style sheet links --> +<script src="ui/default/slides.js" type="text/javascript"></script> +<link rel="stylesheet" href="ui/default/slides.css"

+
+

System Message: ERROR/3 (<stdin>, line 298)

+Unexpected indentation.
+
+type="text/css" media="projection" id="slideProj" />
+
+

System Message: WARNING/2 (<stdin>, line 299)

+Block quote ends without a blank line; unexpected unindent.
+
+
<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" />
+
+

<style type="text/css"> +#currentSlide {display: none;} +</style> +</head> +<body> +<div class="layout"> +<div id="controls"></div> +<div id="currentSlide"></div> +<div id="header">

+

</div> +<div id="footer"> +<h1>Cell 用の Fine-Grain Task Manager の実装</h1>

+

</div> +</div> +<div class="presentation"> +<div class="slide" id="slide0"> +<h1 class="title">Cell 用の Fine-Grain Task Manager の実装</h1> +<!-- Definitions of interpreted text roles (classes) for S5/HTML data. --> +<!-- This data file has been placed in the public domain. --> +<!-- Colours +======= --> +<!-- Text Sizes +========== --> +<!-- Display in Slides (Presentation Mode) Only +========================================== --> +<!-- Display in Outline Mode Only +============================ --> +<!-- Display in Print Only +===================== --> +<!-- Incremental Display +=================== --> +<dl class="docutils"> +<dt><em>発表者</em></dt> +<dd><strong>宮國渡</strong></dd> +<dt><em>指導教官</em></dt> +<dd><strong>河野真治</strong></dd> +<dt><em>所属</em></dt> +<dd><strong>琉球大学 理工学研究科 情報工学専攻 並列信頼研究室</strong></dd> +</dl>

+

</div> +<div class="slide" id="id1"> +<h1>研究の背景と目的</h1> +<p>現在、学生実験で PS3Linux を用いてゲーム開発を行っている</p> +<p><strong>しかし、学生には困難！</strong></p> +<ul> +<li><p class="first">問題１：Cell アーキテクチャプログラミング</p> +<ul> +<li><p class="first">Many Core による並列プログラミング</p> +<p>(データ、コードの分割の必要性)</p> +</li> +<li><p class="first">Cell の仕様 (DMA、データのアライメント、etc..)</p> +</li> +</ul> +</li> +<li><p class="first">問題２：ゲーム開発用の Framework が無い</p> +</li> +</ul> +<p>実験期間の大半を Cell の勉強に費やし、 +開発されるゲームのレベルが例年一定以上にならない</p> +&darr;<p><strong>Many Core Architecture を用いた並列プログラムの開発を +サポートするフレームワーク「 :orange:Fine Grain Task Manager 」を提案する</strong></p> +</div> +<div class="slide" id="id2"> +<h1>研究目的</h1> +<ul class="simple"> +<li>学生実験で PS3Linux を用いてゲーム開発を行っている<ul> +<li>Cell プログラミングが難しい<ul> +<li>並列実行のためのデータ、コードの分割</li> +<li>Cell 仕様 (DMA、アライメント、etc...)</li> +</ul> +</li> +<li>毎回 Cell の勉強からしないと始めないといけないので +ゲームプログラムのレベルが一定以上にならない</li> +<li>ゲーム開発用のフレームワークが無い</li> +</ul> +</li> +<li>本研究では、Cell のような Many Core Architecture を用いた、 +並列プログラムの開発をサポートするフレームワークとして、 +Fine Grain Task Manager を設計する</li> +<li>Task Manager を用いた開発行程<ol class="arabic"> +<li>逐次型プログラム</li> +<li>データやコードを分割したプログラム(シーケンシャルに動く)</li> +<li>並列実行プログラム</li> +</ol> +</li> +<li>各ステップで信頼性を確かめながら開発を行っていく</li> +<li>Task Manager を用いて、PS3 ゲーム開発用フレームワークとして Cerium を開発する</li> +</ul> +</div> +<div class="slide" id="id3"> +<h1>作業報告</h1> +<ul class="simple"> +<li>修論事務提出</li> +<li>SceneGraph<ul> +<li>allExecute</li> +</ul> +</li> +<li>Camera</li> +</ul> +</div> +<div class="slide" id="scenegraph"> +<h1>SceneGraph</h1> +<p>allExecute で一つずつコピーしていく</p> +<ul class="simple"> +<li>remove flag がついた奴はコピーしない</li> +<li>今の実装だと親消すと子も全滅<ul> +<li>選べてもいいし、ユーザが自分で付け替えるのは。。。</li> +</ul> +</li> +</ul> +</div> +<div class="slide" id="camera"> +<h1>Camera</h1> +<p>それっぽい動き</p> +</div> +</div> +</body> +</html>

+
+
+ + diff -r d620ac683abe -r 800cdbaa2f64 presen/presen.rst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/presen.rst Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,100 @@ +.. include:: + +=========================================== +Cell 用の Fine-Grain Task Manager の実装 +=========================================== + +*発表者* + **宮國渡** + +*指導教官* + **河野真治** + +*所属* + **琉球大学 理工学研究科 情報工学専攻 並列信頼研究室** + + +研究の背景と目的 +=================== + +現在、学生実験で PS3Linux を用いてゲーム開発を行っている +.. include:: + +**しかし、学生には困難！** + ++ 問題１：Cell アーキテクチャプログラミング + + + Many Core による並列プログラミング + + (データ、コードの分割の必要性) + + + Cell の仕様 (DMA、データのアライメント、etc..) + ++ 問題２：ゲーム開発用の Framework が無い + +実験期間の大半を Cell の勉強に費やし、 +開発されるゲームのレベルが例年一定以上にならない + +.. raw:: html + + ↓ + +**Many Core Architecture を用いた並列プログラムの開発を +サポートするフレームワーク「 :orange:Fine Grain Task Manager 」を提案する** + +研究目的 +============== + ++ 学生実験で PS3Linux を用いてゲーム開発を行っている + + + Cell プログラミングが難しい + + + 並列実行のためのデータ、コードの分割 + + Cell 仕様 (DMA、アライメント、etc...) + + + 毎回 Cell の勉強からしないと始めないといけないので + ゲームプログラムのレベルが一定以上にならない + + + ゲーム開発用のフレームワークが無い + ++ 本研究では、Cell のような Many Core Architecture を用いた、 + 並列プログラムの開発をサポートするフレームワークとして、 + Fine Grain Task Manager を設計する ++ Task Manager を用いた開発行程 + + 1. 逐次型プログラム + 2. データやコードを分割したプログラム(シーケンシャルに動く) + 3. 並列実行プログラム + ++ 各ステップで信頼性を確かめながら開発を行っていく + ++ Task Manager を用いて、PS3 ゲーム開発用フレームワークとして Cerium を開発する + + +作業報告 +====================== + +- 修論事務提出 +- SceneGraph + + - allExecute + +- Camera + + +SceneGraph +================= + +allExecute で一つずつコピーしていく + +- remove flag がついた奴はコピーしない +- 今の実装だと親消すと子も全滅 + + - 選べてもいいし、ユーザが自分で付け替えるのは。。。 + +Camera +================= + +それっぽい動き + + diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/blank.gif Binary file presen/ui/default/blank.gif has changed diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/bodybg.gif Binary file presen/ui/default/bodybg.gif has changed diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/framing.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/framing.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,23 @@ +/* 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;} +*/ diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/iepngfix.htc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/iepngfix.htc Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/opera.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/opera.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,7 @@ +/* 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 -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/outline.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/outline.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,15 @@ +/* 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;} diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/pretty.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/pretty.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,86 @@ +/* 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;} + */ \ No newline at end of file diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/print.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/print.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,1 @@ +/* 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;} h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;} .extra {background: transparent !important;} div.extra, pre.extra, .example {font-size: 10pt; color: #333;} ul.extra a {font-weight: bold;} p.example {display: none;} #header {display: none;} #footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;} #footer h2, #controls {display: none;} /* The following rule keeps the layout stuff out of print. Remove at your own risk! */ .layout, .layout * {display: none !important;} \ No newline at end of file diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/s5-core.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/s5-core.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,9 @@ +/* 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 -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/slides.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/slides.css Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,3 @@ +@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 */ \ No newline at end of file diff -r d620ac683abe -r 800cdbaa2f64 presen/ui/default/slides.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/presen/ui/default/slides.js Sat Feb 14 11:28:46 2009 +0900 @@ -0,0 +1,552 @@ +// 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' ? 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 = '' + snum + '<\/span> ' + + '\/<\/span> ' + + '' + (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' + + '