# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1357798428 -32400
# Node ID b46ef6dc302a58afc10d02080b3b4a4394fe63c3
# Parent  47e80dcfe3168b0f7efd2dd457a8208673524930
o2s5 fix

diff -r 47e80dcfe316 -r b46ef6dc302a Alice.mm
--- a/Alice.mm	Tue Jan 08 17:52:41 2013 +0900
+++ b/Alice.mm	Thu Jan 10 15:13:48 2013 +0900
@@ -40,6 +40,52 @@
 <node CREATED="1353320374711" ID="ID_11540074" MODIFIED="1353320386136" TEXT="evaluation"/>
 <node CREATED="1353320387295" ID="ID_1661028971" MODIFIED="1353320392574" TEXT="comparison"/>
 </node>
+<node CREATED="1357796101416" ID="ID_812889645" MODIFIED="1357796107694" POSITION="right" TEXT="Presentation">
+<node CREATED="1357796366825" ID="ID_19010142" MODIFIED="1357796370352" TEXT="Problem">
+<node CREATED="1357796515160" ID="ID_1925372538" MODIFIED="1357796532100" TEXT="Politically correct programming unit"/>
+<node CREATED="1357796535583" ID="ID_161354129" MODIFIED="1357796541887" TEXT="for distributed programming"/>
+<node CREATED="1357796542411" ID="ID_1438001071" MODIFIED="1357796546673" TEXT="for parallel programming"/>
+</node>
+<node CREATED="1357796108088" ID="ID_927762526" MODIFIED="1357796123527" TEXT="Linda and Cerium">
+<node CREATED="1357796387081" ID="ID_733470124" MODIFIED="1357796389334" TEXT="history"/>
+</node>
+<node CREATED="1357796125383" ID="ID_1145727682" MODIFIED="1357796136859" TEXT="Task dependency">
+<node CREATED="1357796136859" ID="ID_1611205184" MODIFIED="1357796143975" TEXT="Data dependency"/>
+</node>
+<node CREATED="1357796394587" ID="ID_1865933037" MODIFIED="1357796399563" TEXT="CS/DS archtecture"/>
+<node CREATED="1357796147127" ID="ID_1846762366" MODIFIED="1357796151535" TEXT="Code Segment">
+<node CREATED="1357796154730" ID="ID_1274641300" MODIFIED="1357796161827" TEXT="can be any language"/>
+</node>
+<node CREATED="1357796163573" ID="ID_1055324130" MODIFIED="1357796167475" TEXT="Data Segment">
+<node CREATED="1357796167476" ID="ID_1612242811" MODIFIED="1357796178121" TEXT="Marshaling"/>
+<node CREATED="1357796180228" ID="ID_1368986648" MODIFIED="1357796186892" TEXT="language binding"/>
+</node>
+<node CREATED="1357796202443" ID="ID_1963719282" MODIFIED="1357796207917" TEXT="Java implementation">
+<node CREATED="1357796208670" ID="ID_1987717288" MODIFIED="1357796219571" TEXT="key value stored Data Segment"/>
+<node CREATED="1357796225132" ID="ID_1960065132" MODIFIED="1357796230529" TEXT="Data segment with queue">
+<node CREATED="1357796230530" ID="ID_1942853115" MODIFIED="1357796234173" TEXT="Linda like"/>
+</node>
+<node CREATED="1357796237353" ID="ID_78323497" MODIFIED="1357796243385" TEXT="SEDA architecture"/>
+<node CREATED="1357796257816" ID="ID_613703404" MODIFIED="1357796263369" TEXT="CS/DS API"/>
+</node>
+<node CREATED="1357796267460" ID="ID_271153330" MODIFIED="1357796272499" TEXT="Experiment">
+<node CREATED="1357796272822" ID="ID_1813203270" MODIFIED="1357796279134" TEXT="Application description"/>
+<node CREATED="1357796282025" ID="ID_207537440" MODIFIED="1357796285545" TEXT="Performance">
+<node CREATED="1357796287283" ID="ID_560884426" MODIFIED="1357796298814" TEXT="Delay by SEDA "/>
+<node CREATED="1357796303706" ID="ID_1944757907" MODIFIED="1357796312283" TEXT="Marshaling overhead"/>
+</node>
+</node>
+<node CREATED="1357796425191" ID="ID_22801805" MODIFIED="1357796435640" TEXT="Pro and cons">
+<node CREATED="1357796436162" ID="ID_1235479460" MODIFIED="1357796441330" TEXT="Description">
+<node CREATED="1357796450240" ID="ID_1072625007" MODIFIED="1357796456235" TEXT="asymmetry of CS/DS"/>
+<node CREATED="1357796463685" ID="ID_584911208" MODIFIED="1357796474415" TEXT="DS key strcture"/>
+</node>
+<node CREATED="1357796442837" ID="ID_721566356" MODIFIED="1357796448341" TEXT="Implementation">
+<node CREATED="1357796477642" ID="ID_195979340" MODIFIED="1357796484043" TEXT="SEDA overhead"/>
+<node CREATED="1357796485349" ID="ID_1187935454" MODIFIED="1357796492125" TEXT="Marshaling overhead"/>
+</node>
+</node>
+</node>
 <node CREATED="1353297477833" ID="ID_1542408727" MODIFIED="1353297498630" POSITION="left" TEXT="CS/DS">
 <node CREATED="1353297499168" ID="ID_699855212" MODIFIED="1353297515380" TEXT="sepration of code and data"/>
 <node CREATED="1353297516896" ID="ID_1860696079" MODIFIED="1353297531141" TEXT="duck typed data"/>
diff -r 47e80dcfe316 -r b46ef6dc302a presen/o2s5
--- a/presen/o2s5	Tue Jan 08 17:52:41 2013 +0900
+++ b/presen/o2s5	Thu Jan 10 15:13:48 2013 +0900
@@ -5,8 +5,8 @@
 my $o = '-';
 
 use Getopt::Std;
-our($opt_s);
-getopts('s:');
+our($opt_s, $opt_p, $opt_f, $opt_n, $opt_i, $opt_b, $opt_g, $opt_2);
+getopts('s:pfnibg2');
 
 if ($opt_s) { $o = $opt_s; }
 
@@ -29,6 +29,8 @@
 my $tfont = 1;
 my $slidy_init;
 my $init;
+my $ending = "\n</body></html>\n";
+my $so = "<h1>"; my $se ="</h1>";
 
 my $ul = 0;
 my $theme = "default";
@@ -53,26 +55,25 @@
 
 my @depend;
 
-my @opt  = grep(! /\.ind/,@ARGV);
 @ARGV = grep(  /\.ind/,@ARGV);
 
 sub title_init {
 
-    if (grep(/-p/,@opt)) {
+    if ($opt_p) {
 	$theme = "pixel";
-    } elsif (grep(/-f/,@opt)) {
+    } elsif ($opt_f) {
 	$theme = "flower";
-    } elsif (grep(/-n/,@opt)) {
+    } elsif ($opt_n) {
 	$theme = "nautilus";
-    } elsif (grep(/-i/,@opt)) {
+    } elsif ($opt_i) {
 	$theme = "i18n";
-    } elsif (grep(/-b/,@opt)) {
+    } elsif ($opt_b) {
 	$theme = "blue";
-    } elsif (grep(/-g/,@opt)) {
+    } elsif ($opt_g) {
 	$theme = "google";
         $closing = "</article>";
         $opening = '<article>';
-    } elsif (grep(/-2/,@opt)) {
+    } elsif ($opt_2) {
 	$closing = "</div>";
 	$opening = '<div class="slide">';
     } else {
@@ -205,7 +206,7 @@
        &init_google();
        return;
     }
-    if (grep(/-2/,@opt)) {
+    if ($opt_2) {
 	$closing = "</div>";
 	$opening = '<div class="slide">';
 	$init = $slidy_init;
@@ -215,7 +216,10 @@
 
 sub init_google
 {
-      $init = <<"RogueRogue";
+	$closing = "</article>";
+	$opening = '<article>';
+     $so = "<h3>"; $se ="</h3>";
+     $init = <<"RogueRogue";
 <!DOCTYPE html>
 
 <!--
@@ -261,10 +265,9 @@
         <p>$author
         </p>
 	琉球大学 並列信頼研究室
-      </article>
 RogueRogue
 
-    $closing = <<"RogueRogue";
+    $ending = <<"RogueRogue";
 </Section>
 </body>
 </html>
@@ -412,7 +415,7 @@
 	}
 	print $fh <<RogueRogue;
 $opening
-<h1>$section_title</h1>
+$so$section_title$se
 RogueRogue
 	$section++;
 	$content{$tag} = " " x $depth . $section_title;
@@ -471,8 +474,10 @@
   open($ofd,"|nkf -w >$out"); 
   $fh = $ofd;
   &o2s5($arg, $fdbase);
+  print $ofd $ending;
 }
 
+
 # close($fh);