ulmul 0.3.0 → 0.4.0

data/ChangeLog

@@ -1,3 +1,9 @@
+2010-05-26  Takeshi Nishimatsu  <t-nissie@imr.tohoku.ac.jp>
+
+	* ulmul.gemspec: slidy.js -> ulmul-slidy.js
+	                 Original slidy.js of 2009 is used.
+	                 Version 0.4.0.
+
 2008-12-27  Takeshi Nishimatsu
 
 	* lib/ulmul.rb: documents for release.

data/README-en

@@ -2,7 +2,7 @@
 "ULMUL" is an original Ultra Lightweight MarkUp Language.
 ULMUL texts can be converted into HTML5 with "ulmul2html5" command
 and into XHTML with "ulmul2xhtml" command.
-TeX stile equations are converted into MathML.
+TeX style equations are converted into MathML.
 ULMUL is written in Ruby.
 You can also use ulmul.rb as a library.
 
@@ -16,6 +16,7 @@ Download ULMUL from: http://rubyforge.org/projects/ulmul or http://rubygems.org/
    etc. to read MathML.
  * ulmul2xhtml output is good with the Slidy presentation environment
    http://www.w3.org/Talks/Tools/Slidy/ using Firefox+CSS+XHTML+JavaScript.
+   Please use ulmul-slidy.js and ulmul-slidy.css in the package.
  * Lines starting from "#" are comments.
  * You can add your conversion rules to @subs_rules.
  * List of contents will be automatically generated.
@@ -110,7 +111,7 @@ See http://kb.mozillazine.org/About:config for details.
 === Examples
  $ ulmul2xhtml without-equations.txt > without-equations.html   # XHTML1.0 Transitional
  $ ulmul2xhtml with-equations.txt    > with-equations.html      # XHTML1.1 + MathML2.0
- $ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j slidy.js presentation.txt > presentation.xhtml
+ $ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt > presentation.xhtml
  $ ulmul2html5 with-equations.txt    > with-equations.html      # HTML5
 
 === Command options
@@ -156,15 +157,16 @@ You can copy, modify and redistribute ulmul.rb,
 but only under the conditions described in
 the GNU General Public License (the "GPL").
 
-W3C has copyrights for slidy.js and ulmul-slidy.css (originally
-named slidy.css). Takeshi Nishimatsu modified them.
+W3C has copyrights for ulmul-slidy.js and ulmul-slidy.css.
+Their original names were slidy.js and slidy.css, respectively.
+Takeshi Nishimatsu slightly modified them.
 You can download the original package, slidy.zip, from
 http://www.w3.org/Talks/Tools/Slidy/ . You can find
 their licenses at http://www.w3.org/Consortium/Legal/copyright-documents
 and http://www.w3.org/Consortium/Legal/copyright-software .
 
 == Author of ULMUL
-Takeshi Nishimatsu (t_nissie{at}yahoo.co.jp)
+Takeshi Nishimatsu (t_nissie{at}yahoo.co.jp) http://t-nissie.users.sourceforge.net/
 
 # Local variables:
 #   mode: rd

data/README-ja

@@ -16,6 +16,7 @@ Rubyで書かれています。ulmul.rbをライブラリとして利用する
    math_ml.rb http://www.hinet.mydns.jp/?mathml.rb を使っています。
  * ウェブ・ブラウザ+CSS+XHTML+JavaScriptを使ったプレゼン環境
    Slidy http://www.w3.org/Talks/Tools/Slidy/ に対応したxhtmlが出力可能。
+   パッケージの中の ulmul-slidy.js と ulmul-slidy.css とを使ってください。
  * =begin, =end はあってもなくてもかまいません。
  * 行を#ではじめるとコメントになります。
  * ulmul.rbをライブラリとしても使えます。
@@ -102,6 +103,8 @@ Fig. 1 ruby.jpg
 
 == 使用方法
 ulmul2xhtmlとulmul2html5の２つのコマンドがあります。
+特に指定がなければ ulmul2xhtml.css と ulmul2html5.css とがそれぞれのCSSファイルのなります。
+これら２つのファイルはパッケージに同梱されています。
 
 2010年4月現在、ulmul2xhtmlの出力を.htmlの拡張子を持ったファイルにリダイレクトして
 httpサーバからtext/htmlのMIMEタイプで送信されるようにすれば
@@ -116,7 +119,7 @@ IE8はMathMLで書かれた数式を含んだHTML5をうまく表示できない
 === 例
  $ ulmul2xhtml without-equations.txt > without-equations.html   # XHTML1.0 Transitional
  $ ulmul2xhtml with-equations.txt    > with-equations.html      # XHTML1.1 + MathML2.0
- $ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j slidy.js presentation.txt > presentation.xhtml
+ $ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt > presentation.xhtml
  $ ulmul2html5 with-equations.txt    > with-equations.html      # HTML5
 
 === コマンド・ライン・オプション
@@ -157,15 +160,16 @@ You can copy, modify and redistribute ulmul.rb,
 but only under the conditions described in
 the GNU General Public License (the "GPL").
 
-W3C has copyrights for slidy.js and ulmul-slidy.css (originally
-named slidy.css). Takeshi Nishimatsu modified them.
+W3C has copyrights for ulmul-slidy.js and ulmul-slidy.css.
+Their original names were slidy.js and slidy.css, respectively.
+Takeshi Nishimatsu slightly modified them.
 You can download the original package, slidy.zip, from
 http://www.w3.org/Talks/Tools/Slidy/ . You can find
 their licenses at http://www.w3.org/Consortium/Legal/copyright-documents
 and http://www.w3.org/Consortium/Legal/copyright-software .
 
 == 作者
-西松タケシ (t_nissie{at}yahoo.co.jp)
+西松タケシ (t_nissie{at}yahoo.co.jp) http://t-nissie.users.sourceforge.net/
 
 # Local variables:
 #   mode: rd

data/Rakefile

@@ -1,6 +1,6 @@
 #! /usr/bin/env rake
 # -*-Ruby-*-
-# Time-stamp: <2010-04-01 08:37:35 takeshi>
+# Time-stamp: <2010-05-26 17:48:08 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 $LOAD_PATH.unshift('lib')
@@ -50,18 +50,27 @@ end
 desc "Publish to RubyForge"
 task :rubyforge => ["index.en.html",
                     "index.ja.html",
-                    "style.css", "favicon.ico", "ruby.jpg"] do |t|
+                    "index.var",
+                    "ulmul2xhtml.css", "favicon.ico", "ruby.jpg"] do |t|
   t.prerequisites.each do |f|
-    sh "scp #{f} t-nissie@rubyforge.org:/var/www/gforge-projects/ulmul/"
+    sh "scp #{f}          t-nissie@rubyforge.org:/var/www/gforge-projects/ulmul/"
   end
+  sh   "scp index.en.html t-nissie@rubyforge.org:/var/www/gforge-projects/ulmul/index.html"
+  sh   "scp dot.htaccess  t-nissie@rubyforge.org:/var/www/gforge-projects/ulmul/.htaccess"
+end
+
+desc "Create presentation.en.xhtml from README-en"
+file "presentation.en.xhtml" => ["bin/ulmul2xhtml", "ulmul-slidy.css", "README-en",
+                                                    "ulmul-slidy.js", "lib/ulmul.rb"] do |t|
+  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -s #{t.prerequisites[1]} -j #{t.prerequisites[3]} -l en #{t.prerequisites[2]} > #{t.name}"
 end
 
 desc "Create index.en.html"
 file "index.en.html" => ["bin/ulmul2xhtml", "ulmul2xhtml.css", "README-en", "lib/ulmul.rb"] do |t|
-  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -l en #{t.prerequisites[2]} > #{t.name}"
+  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -l en #{t.prerequisites[2]} | sed -e 's%</h1>%</h1><div class=\"navi\">[<a href=\"index.en.html\">English</a>/<a href=\"index.ja.html\">Japanese</a>]</div>%' > #{t.name}"
 end
 
 desc "Create index.ja.html"
 file "index.ja.html" => ["bin/ulmul2xhtml", "ulmul2xhtml.css", "README-ja", "lib/ulmul.rb"] do |t|
-  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -l ja #{t.prerequisites[2]} > #{t.name}"
+  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -l ja #{t.prerequisites[2]} | sed -e 's%</h1>%</h1><div class=\"navi\">[<a href=\"index.en.html\">English</a>/<a href=\"index.ja.html\">Japanese</a>]</div>%' > #{t.name}"
 end

data/XHTML-vs-HTML5.ja.txt

@@ -77,8 +77,9 @@ XHTMLとHTML5とを比較
 
 
 == 疑問点
- * <hr> or <hr/> ?
- * MathMLでよく使う<none/>は？
+ * HTML5 は <hr> or <hr/> ？
+ * MathMLでよく使う<none/>はHTML5で使ってよいの？
+ * HTML5で<p></p>の中に<math></math>を書いちゃいけないの？
 
 # Local variables:
 #   mode: rd

data/index.en.html

@@ -12,12 +12,12 @@
 </head>
 <body>
 <div class="slide cover">
-<h1 id="LABEL-1">ULMUL (Ultra Lightweight MarkUp Language)</h1>
+<h1 id="LABEL-1">ULMUL (Ultra Lightweight MarkUp Language)</h1><div class="navi">[<a href="index.en.html">English</a>/<a href="index.ja.html">Japanese</a>]</div>
 <p>
 "ULMUL" is an original Ultra Lightweight MarkUp Language.
 ULMUL texts can be converted into HTML5 with "ulmul2html5" command
 and into XHTML with "ulmul2xhtml" command.
-TeX stile equations are converted into MathML.
+TeX style equations are converted into MathML.
 ULMUL is written in Ruby.
 You can also use ulmul.rb as a library.
 </p>
@@ -65,7 +65,8 @@ Download ULMUL from: <a href="http://rubyforge.org/projects/ulmul">http://rubyfo
     will be converted into MathML. You can use Firefox version 3.x, IE+MathPlayer,
     etc. to read MathML.</li>
   <li>ulmul2xhtml output is good with the Slidy presentation environment
-    <a href="http://www.w3.org/Talks/Tools/Slidy/">http://www.w3.org/Talks/Tools/Slidy/</a> using Firefox+CSS+XHTML+JavaScript.</li>
+    <a href="http://www.w3.org/Talks/Tools/Slidy/">http://www.w3.org/Talks/Tools/Slidy/</a> using Firefox+CSS+XHTML+JavaScript.
+    Please use ulmul-slidy.js and ulmul-slidy.css in the package.</li>
   <li>Lines starting from "#" are comments.</li>
   <li>You can add your conversion rules to @subs_rules.</li>
   <li>List of contents will be automatically generated.</li>
@@ -229,7 +230,7 @@ See <a href="http://kb.mozillazine.org/About:config">http://kb.mozillazine.org/A
 <h3 id="LABEL-19">Examples</h3>
 <pre>$ ulmul2xhtml without-equations.txt &gt; without-equations.html   # XHTML1.0 Transitional
 $ ulmul2xhtml with-equations.txt    &gt; with-equations.html      # XHTML1.1 + MathML2.0
-$ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j slidy.js presentation.txt &gt; presentation.xhtml
+$ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt &gt; presentation.xhtml
 $ ulmul2html5 with-equations.txt    &gt; with-equations.html      # HTML5
 </pre>
 <h3 id="LABEL-20">Command options</h3>
@@ -310,8 +311,9 @@ but only under the conditions described in
 the GNU General Public License (the "GPL").
 </p>
 <p>
-W3C has copyrights for slidy.js and ulmul-slidy.css (originally
-named slidy.css). Takeshi Nishimatsu modified them.
+W3C has copyrights for ulmul-slidy.js and ulmul-slidy.css.
+Their original names were slidy.js and slidy.css, respectively.
+Takeshi Nishimatsu slightly modified them.
 You can download the original package, slidy.zip, from
 <a href="http://www.w3.org/Talks/Tools/Slidy/">http://www.w3.org/Talks/Tools/Slidy/</a> . You can find
 their licenses at <a href="http://www.w3.org/Consortium/Legal/copyright-documents">http://www.w3.org/Consortium/Legal/copyright-documents</a>
@@ -323,7 +325,7 @@ and <a href="http://www.w3.org/Consortium/Legal/copyright-software">http://www.w
 <div class="slide">
 <h2 id="LABEL-31">Author of ULMUL</h2>
 <p>
-Takeshi Nishimatsu (t_nissie{at}yahoo.co.jp)
+Takeshi Nishimatsu (t_nissie{at}yahoo.co.jp) <a href="http://t-nissie.users.sourceforge.net/">http://t-nissie.users.sourceforge.net/</a>
 </p>
 </div>
 </body>

data/index.ja.html

@@ -12,7 +12,7 @@
 </head>
 <body>
 <div class="slide cover">
-<h1 id="LABEL-1">ULMUL取扱説明書</h1>
+<h1 id="LABEL-1">ULMUL取扱説明書</h1><div class="navi">[<a href="index.en.html">English</a>/<a href="index.ja.html">Japanese</a>]</div>
 <p>
 ULMULは独自の軽量マークアップ言語 (Ultra Lightweight MarkUp Language) です。
 コマンドulmul2html5でHTML5に、ulmul2xhtmlでXHTMLに変換できます。
@@ -65,7 +65,8 @@ Rubyで書かれています。ulmul.rbをライブラリとして利用する
     Firefoxのバージョン3.0以上やIE+MathPlayerで読めるようです。
     math_ml.rb <a href="http://www.hinet.mydns.jp/?mathml.rb">http://www.hinet.mydns.jp/?mathml.rb</a> を使っています。</li>
   <li>ウェブ・ブラウザ+CSS+XHTML+JavaScriptを使ったプレゼン環境
-    Slidy <a href="http://www.w3.org/Talks/Tools/Slidy/">http://www.w3.org/Talks/Tools/Slidy/</a> に対応したxhtmlが出力可能。</li>
+    Slidy <a href="http://www.w3.org/Talks/Tools/Slidy/">http://www.w3.org/Talks/Tools/Slidy/</a> に対応したxhtmlが出力可能。
+    パッケージの中の ulmul-slidy.js と ulmul-slidy.css とを使ってください。</li>
   <li>=begin, =end はあってもなくてもかまいません。</li>
   <li>行を#ではじめるとコメントになります。</li>
   <li>ulmul.rbをライブラリとしても使えます。</li>
@@ -218,6 +219,8 @@ Mass <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>m</mi
 <h2 id="LABEL-18">使用方法</h2>
 <p>
 ulmul2xhtmlとulmul2html5の２つのコマンドがあります。
+特に指定がなければ ulmul2xhtml.css と ulmul2html5.css とがそれぞれのCSSファイルのなります。
+これら２つのファイルはパッケージに同梱されています。
 </p>
 <p>
 2010年4月現在、ulmul2xhtmlの出力を.htmlの拡張子を持ったファイルにリダイレクトして
@@ -235,7 +238,7 @@ IE8はMathMLで書かれた数式を含んだHTML5をうまく表示できない
 <h3 id="LABEL-19">例</h3>
 <pre>$ ulmul2xhtml without-equations.txt &gt; without-equations.html   # XHTML1.0 Transitional
 $ ulmul2xhtml with-equations.txt    &gt; with-equations.html      # XHTML1.1 + MathML2.0
-$ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j slidy.js presentation.txt &gt; presentation.xhtml
+$ ulmul2xhtml -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt &gt; presentation.xhtml
 $ ulmul2html5 with-equations.txt    &gt; with-equations.html      # HTML5
 </pre>
 <h3 id="LABEL-20">コマンド・ライン・オプション</h3>
@@ -312,8 +315,9 @@ but only under the conditions described in
 the GNU General Public License (the "GPL").
 </p>
 <p>
-W3C has copyrights for slidy.js and ulmul-slidy.css (originally
-named slidy.css). Takeshi Nishimatsu modified them.
+W3C has copyrights for ulmul-slidy.js and ulmul-slidy.css.
+Their original names were slidy.js and slidy.css, respectively.
+Takeshi Nishimatsu slightly modified them.
 You can download the original package, slidy.zip, from
 <a href="http://www.w3.org/Talks/Tools/Slidy/">http://www.w3.org/Talks/Tools/Slidy/</a> . You can find
 their licenses at <a href="http://www.w3.org/Consortium/Legal/copyright-documents">http://www.w3.org/Consortium/Legal/copyright-documents</a>
@@ -325,7 +329,7 @@ and <a href="http://www.w3.org/Consortium/Legal/copyright-software">http://www.w
 <div class="slide">
 <h2 id="LABEL-31">作者</h2>
 <p>
-西松タケシ (t_nissie{at}yahoo.co.jp)
+西松タケシ (t_nissie{at}yahoo.co.jp) <a href="http://t-nissie.users.sourceforge.net/">http://t-nissie.users.sourceforge.net/</a>
 </p>
 </div>
 </body>

data/lib/ulmul.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # ulmul.rb
-# Time-stamp: <2010-04-07 17:15:42 takeshi>
+# Time-stamp: <2010-05-26 17:04:08 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 require "rubygems"
@@ -72,7 +72,7 @@ class Contents
 end
 
 class Ulmul
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
   CONTENTS_HERE="<!-- Contents -->"
   CONTENTS_RANGE_DEFAULT=2..3
   TABLE={

data/{slidy.js → ulmul-slidy.js}

@@ -1,6 +1,6 @@
-/* slidy.js
+/* ulmul-slidy.js
 
-   Copyright (c) 2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+   Copyright (c) 2005-2009 W3C (MIT, ERCIM, Keio), All Rights Reserved.
    W3C liability, trademark, document use and software licensing
    rules apply, see:
 
@@ -8,7 +8,7 @@
    http://www.w3.org/Consortium/Legal/copyright-software
 
 
-   Slightly modified by Takeshi Nishimatsu in 2007-09-21:
+   From slidy.js to ulmul-slidy.js, slightly modified by Takeshi Nishimatsu in 2007-09-21:
    Original: if (node.nodeName == "H1" || node.nodeName == "h1")
    This one: if (node.nodeName == "H1" || node.nodeName == "h1" || node.nodeName == "H2" || node.nodeName == "h2")
 
@@ -17,24 +17,54 @@
 var ns_pos = (typeof window.pageYOffset!='undefined');
 var khtml = ((navigator.userAgent).indexOf("KHTML") >= 0 ? true : false);
 var opera = ((navigator.userAgent).indexOf("Opera") >= 0 ? true : false);
+var ie = (typeof document.all != "undefined" && !opera);
 var ie7 = (!ns_pos && navigator.userAgent.indexOf("MSIE 7") != -1);
+var ie8 = (!ns_pos && navigator.userAgent.indexOf("MSIE 8") != -1);
+var slidy_started = false;
 
-window.onload = startup; // equivalent to onload on body element
+if (ie && !ie8)
+  document.write("<iframe id='historyFrame' src='javascript:\"<html"+"></"+"html>\"' height='1' width='1' style='position:absolute;left:-800px'></iframe>");
 
 // IE only event handlers to ensure all slides are printed
 // I don't yet know how to emulate these for other browsers
-window.onbeforeprint = beforePrint;
-window.onafterprint = afterPrint;
+if (typeof beforePrint != 'undefined')
+{
+  window.onbeforeprint = beforePrint;
+  window.onafterprint = afterPrint;
+}
+
+// to avoid a clash with other scripts or onload attribute on <body>
+// we use something smarter than window.onload
+//window.onload = startup;
+
+
+if (ie)
+  setTimeout(ieSlidyInit, 100);
+else if (document.addEventListener)
+  document.addEventListener("DOMContentLoaded", startup, false);
+
+function ieSlidyInit()
+{
+  if (//document.readyState == "interactive" ||
+      document.readyState == "complete" ||
+      document.readyState == "loaded")
+  {
+    startup();
+  }
+  else
+  {
+    setTimeout(ieSlidyInit, 100);
+  }
+}
 
-// hack to hide slides while loading
-setTimeout(hideAll, 50);
+setTimeout(hideSlides, 50);
 
-function hideAll()
+function hideSlides()
 {
   if (document.body)
     document.body.style.visibility = "hidden";
   else
-    setTimeout(hideAll, 50);
+    setTimeout(hideSlides, 50);
 }
 
 var slidenum = 0;     // integer slide count: 0, 1, 2, ...
@@ -64,7 +94,6 @@ var sizeIndex = 0;
 var sizeAdjustment = 0;
 var sizes = new Array("10pt", "12pt", "14pt", "16pt", "18pt", "20pt",
                       "22pt", "24pt", "26pt", "28pt", "30pt", "32pt");
-
 var okayForIncremental = incrementalElementList();
 
 // needed for efficient resizing
@@ -81,104 +110,120 @@ var lang = "en";
 
 //var localize = {};
 
-// for each language there is an associative array
-var strings_es = {
-  "slide":"pág.",
-  "help?":"Ayuda",
-  "contents?":"Índice",
-  "table of contents":"tabla de contenidos",
-  "Table of Contents":"Tabla de Contenidos",
-  "restart presentation":"Reiniciar presentación",
-  "restart?":"Inicio"
-   };
-
-strings_es[helpText] =
-    "Utilice el ratón, barra espaciadora, teclas Izda/Dhca, " +
-    "o Re pág y Av pág. Use S y B para cambiar el tamaño de fuente.";
-
-var strings_nl = {
-  "slide":"pagina",
-  "help?":"Help?",
-  "contents?":"Inhoud?",
-  "table of contents":"inhoudsopgave",
-  "Table of Contents":"Inhoudsopgave",
-  "restart presentation":"herstart presentatie",
-  "restart?":"Herstart?"
-   };
-
-strings_nl[helpText] =
-    "Navigeer d.m.v. het muis, spatiebar, Links/Rechts toetsen, " +
-    "of PgUp en PgDn. Gebruik S en B om de karaktergrootte te veranderen.";
-
-var strings_de = {
-  "slide":"Seite",
-  "help?":"Hilfe",
-  "contents?":"Übersicht",
-  "table of contents":"Inhaltsverzeichnis",
-  "Table of Contents":"Inhaltsverzeichnis",
-  "restart presentation":"Präsentation neu starten",
-  "restart?":"Neustart"
-   };
-
-strings_de[helpText] =
-    "Benutzen Sie die Maus, Leerschlag, die Cursortasten links/rechts" +
-    "oder Page up/Page Down zum Wechseln der Seiten und S und B für die Schriftgrösse.";
-
-var strings_pl = {
-  "slide":"slajd",
-  "help?":"pomoc?",
-  "contents?":"spis treści?",
-  "table of contents":"spis treści",
-  "Table of Contents":"Spis Treści",
-  "restart presentation":"Restartuj prezentację",
-  "restart?":"restart?"
-   };
-
-strings_pl[helpText] =
-    "Zmieniaj slajdy klikając myszą, naciskając spację, strzałki lewo/prawo" +
-    "lub PgUp / PgDn. Użyj klawiszy S i B, aby zmienić rozmiar czczionki.";
-
-var strings_fr = {
-  "slide":"page",
-  "help?":"Aide",
-  "contents?":"Index",
-  "table of contents":"table des matières",
-  "Table of Contents":"Table des matières",
-  "restart presentation":"Recommencer l'exposé",
-  "restart?":"Début"
-  };
-
-strings_fr[helpText] =
-    "Naviguez avec la souris, la barre d'espace, les flèches" +
-    "gauche/droite ou les touches Pg Up, Pg Dn. Utilisez " +
-    "les touches S et B pour modifier la taille de la police.";
-
-var strings_hu = {
-  "slide":"oldal",
-  "help?":"segítség",
-  "contents?":"tartalom",
-  "table of contents":"tartalomjegyzék",
-  "Table of Contents":"Tartalomjegyzék",
-  "restart presentation":"bemutató újraindítása",
-  "restart?":"újraindítás"
-   };
-
-strings_hu[helpText] =
-    "Az oldalak közti lépkedéshez kattintson az egérrel, vagy használja a szóköz, a bal, vagy a jobb nyíl, " +
-    "illetve a Page Down, Page Up billentyűket. Az S és a B billentyűkkel változtathatja a szöveg méretét.";
-
-var strings_it = {
-  "slide":"pag.",
-  "help?":"Aiuto",
-  "contents?":"Indice",
-  "table of contents":"indice",
-  "Table of Contents":"Indice",
-  "restart presentation":"Ricominciare la presentazione",
-  "restart?":"Inizio"
-   };
-
-strings_it[helpText] =
-    "Navigare con mouse, barra spazio, frecce sinistra/destra o " +
+// for each language there is an associative array
+var strings_es = {
+  "slide":"pág.",
+  "help?":"Ayuda",
+  "contents?":"Índice",
+  "table of contents":"tabla de contenidos",
+  "Table of Contents":"Tabla de Contenidos",
+  "restart presentation":"Reiniciar presentación",
+  "restart?":"Inicio"
+   };
+
+strings_es[helpText] =
+    "Utilice el ratón, barra espaciadora, teclas Izda/Dcha, " +
+    "o Re pág y Av pág. Use S y B para cambiar el tamaño de fuente.";
+
+var strings_ca = {
+ "slide":"pàg..",
+ "help?":"Ajuda",
+ "contents?":"Índex",
+ "table of contents":"taula de continguts",
+ "Table of Contents":"Taula de Continguts",
+ "restart presentation":"Reiniciar presentació",
+ "restart?":"Inici"
+  };
+
+strings_ca[helpText] =
+   "Utilitzi el ratolí, barra espaiadora, tecles Esq./Dta. " +
+   "o Re pàg y Av pàg. Usi S i B per canviar grandària de font.";
+
+var strings_nl = {
+  "slide":"pagina",
+  "help?":"Help?",
+  "contents?":"Inhoud?",
+  "table of contents":"inhoudsopgave",
+  "Table of Contents":"Inhoudsopgave",
+  "restart presentation":"herstart presentatie",
+  "restart?":"Herstart?"
+   };
+
+strings_nl[helpText] =
+    "Navigeer d.m.v. het muis, spatiebar, Links/Rechts toetsen, " +
+    "of PgUp en PgDn. Gebruik S en B om de karaktergrootte te veranderen.";
+
+var strings_de = {
+  "slide":"Seite",
+  "help?":"Hilfe",
+  "contents?":"Übersicht",
+  "table of contents":"Inhaltsverzeichnis",
+  "Table of Contents":"Inhaltsverzeichnis",
+  "restart presentation":"Präsentation neu starten",
+  "restart?":"Neustart"
+   };
+
+strings_de[helpText] =
+    "Benutzen Sie die Maus, Leerschlag, die Cursortasten links/rechts oder " +
+    "Page up/Page Down zum Wechseln der Seiten und S und B für die Schriftgrösse.";
+
+var strings_pl = {
+  "slide":"slajd",
+  "help?":"pomoc?",
+  "contents?":"spis treści?",
+  "table of contents":"spis treści",
+  "Table of Contents":"Spis Treści",
+  "restart presentation":"Restartuj prezentację",
+  "restart?":"restart?"
+   };
+
+strings_pl[helpText] =
+    "Zmieniaj slajdy klikając myszą, naciskając spację, strzałki lewo/prawo" +
+    "lub PgUp / PgDn. Użyj klawiszy S i B, aby zmienić rozmiar czczionki.";
+
+var strings_fr = {
+  "slide":"page",
+  "help?":"Aide",
+  "contents?":"Index",
+  "table of contents":"table des matières",
+  "Table of Contents":"Table des matières",
+  "restart presentation":"Recommencer l'exposé",
+  "restart?":"Début"
+  };
+
+strings_fr[helpText] =
+    "Naviguez avec la souris, la barre d'espace, les flèches " +
+    "gauche/droite ou les touches Pg Up, Pg Dn. Utilisez " +
+    "les touches S et B pour modifier la taille de la police.";
+
+var strings_hu = {
+  "slide":"oldal",
+  "help?":"segítség",
+  "contents?":"tartalom",
+  "table of contents":"tartalomjegyzék",
+  "Table of Contents":"Tartalomjegyzék",
+  "restart presentation":"bemutató újraindítása",
+  "restart?":"újraindítás"
+   };
+
+strings_hu[helpText] =
+    "Az oldalak közti lépkedéshez kattintson az egérrel, vagy " +
+    "használja a szóköz, a bal, vagy a jobb nyíl, illetve a Page Down, " +
+    "Page Up billentyűket. Az S és a B billentyűkkel változtathatja " +
+    "a szöveg méretét.";
+
+var strings_it = {
+  "slide":"pag.",
+  "help?":"Aiuto",
+  "contents?":"Indice",
+  "table of contents":"indice",
+  "Table of Contents":"Indice",
+  "restart presentation":"Ricominciare la presentazione",
+  "restart?":"Inizio"
+   };
+
+strings_it[helpText] =
+    "Navigare con mouse, barra spazio, frecce sinistra/destra o " +
     "PgUp e PgDn. Usare S e B per cambiare la dimensione dei caratteri.";
 
 var strings_el = {
@@ -194,7 +239,7 @@ var strings_el = {
 strings_el[helpText] =
   "Πλοηγηθείτε με το κλίκ του ποντικιού, το space, τα βέλη αριστερά/δεξιά, " +
   "ή Page Up και Page Down. Χρησιμοποιήστε τα πλήκτρα S και B για να αλλάξετε " +
-  "το μέγεθος της γραμματοσειράς.";
+  "το μέγεθος της γραμματοσειράς.";
 
 var strings_ja = {
   "slide":"スライド",
@@ -210,24 +255,62 @@ strings_ja[helpText] =
     "マウス左クリック ・ スペース ・ 左右キー " +
     "または Page Up ・ Page Downで操作， S ・ Bでフォントサイズ変更";
 
-
-// each such language array is declared in the localize array
-// used indirectly as in help.innerHTML = "help".localize();
-var localize = {
-     "es":strings_es,
-     "nl":strings_nl,
-     "de":strings_de,
-     "pl":strings_pl,
-     "fr":strings_fr,
-     "hu":strings_hu,
+var strings_zh = {
+  "slide":"幻灯片",
+  "help?":"帮助?",
+  "contents?":"内容?",
+  "table of contents":"目录",
+  "Table of Contents":"目录",
+  "restart presentation":"重新启动展示",
+  "restart?":"重新启动?"
+};
+
+strings_zh[helpText] =
+  "用鼠标点击, 空格条, 左右箭头, Pg Up 和 Pg Dn 导航. " +
+  "用 S, B 改变字体大小.";
+
+var strings_ru = {
+  "slide":"слайд",
+  "help?":"помощь?",
+  "contents?":"содержание?",
+  "table of contents":"оглавление",
+  "Table of Contents":"Оглавление",
+  "restart presentation":"перезапустить презентацию",
+  "restart?":"перезапуск?"
+   };
+
+strings_ru[helpText] =
+    "Перемещайтесь кликая мышкой, используя клавишу пробел, стрелки" +
+    "влево/вправо или Pg Up и Pg Dn. Клавиши S и B меняют размер шрифта.";
+
+
+// each such language array is declared in the localize array
+// used indirectly as in help.innerHTML = "help".localize();
+var localize = {
+     "es":strings_es,
+     "ca":strings_ca,
+     "nl":strings_nl,
+     "de":strings_de,
+     "pl":strings_pl,
+     "fr":strings_fr,
+     "hu":strings_hu,
      "it":strings_it,
      "el":strings_el,
-     "jp":strings_ja
+     "jp":strings_ja,
+     "zh":strings_zh,
+     "ru":strings_ru
    };
 
 /* general initialization */
 function startup()
 {
+   if (slidy_started)
+   {
+      alert("already started");
+      return;
+   }
+   slidy_started = true;
+
    // find human language from html element
    // for use in localizing strings
    lang = document.body.parentNode.getAttribute("lang");
@@ -284,8 +367,10 @@ function startup()
    document.onkeydown = keyDown;
    window.onresize  = resized;
    window.onscroll = scrolled;
+   window.onunload = unloaded;
    singleSlideView();
 
+
    setLocation();
    resized();
 
@@ -293,6 +378,7 @@ function startup()
      setTimeout("ieHack()", 100);
 
    showToolbar();
+   setInterval("checkLocation()", 200); // for back button detection
 }
 
 // add localize method to all strings for use
@@ -353,6 +439,11 @@ function ieHack()
    window.resizeBy(0, 1);
 }
 
+function unloaded(e)
+{
+  //alert("unloaded");
+}
+
 // Firefox reload SVG bug work around
 function reload(e)
 {
@@ -520,23 +611,6 @@ function showToolbar()
    }
 }
 
-function test()
-{
-   var s = "docH: " + documentHeight() +
-       " winH: " + lastHeight +
-       " yoffset: " + scrollYOffset() +
-       " toolbot: " + (documentHeight() - lastHeight - scrollYOffset());
-
-   //alert(s);
-
-   var slide = slides[slidenum];
-   // IE getAttribute requires "class" to be "className"
-   var name = ns_pos ? "class" : "className";
-   var style = (slide.currentStyle ? slide.currentStyle["backgroundColor"] :
-       document.defaultView.getComputedStyle(slide, '').getPropertyValue("background-color"));
-   alert("class='" + slide.getAttribute(name) + "' backgroundColor: " + style);
-}
-
 function hideToolbar()
 {
    toolbar.style.display = "none";
@@ -771,11 +845,17 @@ function keyDown(event)
 
     if (key == 34) // Page Down
     {
+       if (viewAll)
+         return true;
+
        nextSlide(false);
        return cancel(event);
     }
     else if (key == 33) // Page Up
     {
+       if (viewAll)
+         return true;
+
        previousSlide(false);
        return cancel(event);
     }
@@ -935,8 +1015,7 @@ function mouseButtonClick(e)
    }
    else leftclick = true;
 
-   // dismiss table of contents
-   hideTableOfContents();
+   //alert("selected text length = "+selectedTextLen);
 
    if (selectedTextLen > 0)
    {
@@ -946,12 +1025,16 @@ function mouseButtonClick(e)
       return false;
    }
 
+   // dismiss table of contents
+   hideTableOfContents();
+
    // check if target is something that probably want's clicks
    // e.g. embed, object, input, textarea, select, option
 
    if (mouseClickEnabled && leftclick &&
         target.nodeName != "EMBED" &&
         target.nodeName != "OBJECT" &&
+        target.nodeName != "VIDEO" &&
         target.nodeName != "INPUT" &&
         target.nodeName != "TEXTAREA" &&
         target.nodeName != "SELECT" &&
@@ -1088,6 +1171,22 @@ function lastSlide()
    }
 }
 
+// first slide is 0
+function gotoSlide(num)
+{
+  //alert("going to slide " + (num+1));
+  var slide = slides[slidenum];
+  hideSlide(slide);
+  slidenum = num;
+  slide = slides[slidenum];
+  lastShown = null;
+  setVisibilityAllIncremental("hidden");
+  setEosStatus(!nextIncrementalItem(lastShown));
+  document.title = title + " (" + (slidenum+1) + ")";
+  showSlide(slide);
+  showSlideNumber();
+}
+
 function setEosStatus(state)
 {
    if (eos)
@@ -1248,35 +1347,49 @@ function hasToken(str, token)
 
 function getClassList(element)
 {
-  if (typeof window.pageYOffset =='undefined')
-    return element.getAttribute("className");
+  if (typeof element.className != 'undefined')
+    return element.className;
 
-  return element.getAttribute("class");
+  var clsname = (ns_pos||ie8) ? "class" : "className";
+  return element.getAttribute(clsname);
 }
 
 function hasClass(element, name)
 {
   var regexp = new RegExp("(^| )" + name + "\W*");
 
-  if (regexp.test(getClassList(element)))
-    return true;
-
-  return false;
+  if (typeof element.className != 'undefined')
+    return regexp.test(element.className);
 
+  var clsname = (ns_pos||ie8) ? "class" : "className";
+  return regexp.test(element.getAttribute(clsname));
 }
 
 function removeClass(element, name)
 {
-  // IE getAttribute requires "class" to be "className"
-  var clsname = ns_pos ? "class" : "className";
-  var clsval = element.getAttribute(clsname);
-
   var regexp = new RegExp("(^| )" + name + "\W*");
+  var clsval = "";
 
-  if (clsval)
+  if (typeof element.className != 'undefined')
   {
-    clsval = clsval.replace(regexp, "");
-    element.setAttribute(clsname, clsval);
+     clsval = element.className;
+
+     if (clsval)
+     {
+       clsval = clsval.replace(regexp, "");
+       element.className = clsval;
+     }
+  }
+  else
+  {
+    var clsname = (ns_pos||ie8) ? "class" : "className";
+    clsval = element.getAttribute(clsname);
+
+    if (clsval)
+    {
+      clsval = clsval.replace(regexp, "");
+      element.setAttribute(clsname, clsval);
+    }
   }
 }
 
@@ -1284,10 +1397,15 @@ function addClass(element, name)
 {
   if (!hasClass(element, name))
   {
-    // IE getAttribute requires "class" to be "className"
-    var clsname = ns_pos ? "class" : "className";
-    var clsval = element.getAttribute(clsname);
-    element.setAttribute(clsname, (clsval ? clsval + " " + name : name));
+    if (typeof element.className != 'undefined')
+      element.className += " " + name;
+    else
+    {
+      var clsname = (ns_pos||ie8) ? "class" : "className";
+      var clsval = element.getAttribute(clsname);
+      clsval = clsval ? clsval + " " + name : name;
+      element.setAttribute(clsname, clsval);
+    }
   }
 }
 
@@ -1314,7 +1432,7 @@ function wrapImplicitSlides()
       node = heading.nextSibling;
 
       div = document.createElement("div");
-      div.setAttribute((ns_pos ? "class" : "className"), "slide");
+      addClass(div, "slide");
       document.body.replaceChild(div, heading);
       div.appendChild(heading);
 
@@ -1731,6 +1849,9 @@ function pageAddress(uri)
 {
    var i = uri.indexOf("#");
 
+   if (i < 0)
+     i = uri.indexOf("%23");
+
    // check if anchor is entire page
 
    if (i < 0)
@@ -1745,22 +1866,73 @@ function showSlideNumber()
            (slidenum + 1) + "/" + slides.length;
 }
 
+// every 200mS check if the location has been changed as a
+// result of the user activating the Back button/menu item
+// doesn't work for Opera < 9.5
+function checkLocation()
+{
+  var hash = location.hash;
+
+  if (slidenum > 0 && (hash == "" || hash == "#"))
+    gotoSlide(0);
+  else if (hash.length > 2 && hash != "#("+(slidenum+1)+")")
+  {
+    var num = parseInt(location.hash.substr(2));
+
+    if (!isNaN(num))
+      gotoSlide(num-1);
+  }
+}
+
+// this doesn't push location onto history stack for IE
+// for which a hidden iframe hack is needed: load page into
+// the iframe with script that set's parent's location.hash
+// but that won't work for standalone use unless we can
+// create the page dynamically via a javascript: URL
 function setLocation()
 {
    var uri = pageAddress(location.href);
+   var hash = "#(" + (slidenum+1) + ")";
 
-   //if (slidenum > 0)
-      uri = uri + "#(" + (slidenum+1) + ")";
+   if (slidenum >= 0)
+      uri = uri + hash;
 
-   if (uri != location.href && !khtml)
+   if (ie && !ie8)
+      pushHash(hash);
+
+   if (uri != location.href /*&& !khtml */)
       location.href = uri;
 
-   document.title = title + " (" + (slidenum+1) + ")";
-   //document.title = (slidenum+1) + ") " + slideName(slidenum);
+   if (khtml)
+      hash = "(" + (slidenum+1) + ")";
 
+   if (!ie && location.hash != hash && location.hash != "")
+     location.hash = hash;
+
+   document.title = title + " (" + (slidenum+1) + ")";
    showSlideNumber();
 }
 
+// only used for IE6 and IE7
+function onFrameLoaded(hash)
+{
+  location.hash = hash;
+  var uri = pageAddress(location.href);
+  location.href = uri + hash;
+}
+
+// history hack with thanks to Bertrand Le Roy
+function pushHash(hash)
+{
+  if (hash == "") hash = "#(1)";
+  window.location.hash = hash;
+  var doc = document.getElementById("historyFrame").contentWindow.document;
+  doc.open("javascript:'<html></html>'");
+  doc.write("<html><head><script type=\"text/javascript\">parent.onFrameLoaded('"+
+    (hash) + "');</script></head><body>hello mum</body></html>");
+  doc.close();
+}
+
 // find current slide based upon location
 // first find target anchor and then look
 // for associated div element enclosing it
@@ -1876,8 +2048,7 @@ function slideName(index)
 
 // find first h1 element in DOM tree
 function findHeading(node)
-{
-  if (!node || node.nodeType != 1)
+{  if (!node || node.nodeType != 1)
     return null;
 
   if (node.nodeName == "H1" || node.nodeName == "h1" || node.nodeName == "H2" || node.nodeName == "h2")
@@ -1959,7 +2130,7 @@ function findSizeAdjust()
          return 1 * content;
    }
 
-   return 0;
+   return 1;
 }
 
 function addToolbar()
@@ -2006,17 +2177,8 @@ function addToolbar()
       var gap2 = document.createTextNode(" ");
       left.appendChild(gap2);
 
-      var i = location.href.indexOf("#");
-
-      // check if anchor is entire page
-
-      if (i > 0)
-         page = location.href.substr(0, i);
-      else
-         page = location.href;
-
       var start = document.createElement("a");
-      start.setAttribute("href", page);
+      start.setAttribute("href", "javascript:firstSlide()");
       start.setAttribute("title", "restart presentation".localize());
       start.innerHTML = "restart?".localize();
 //    start.setAttribute("href", "javascript:printSlides()");
@@ -2082,17 +2244,8 @@ function addToolbar()
       var gap2 = document.createTextNode(" ");
       toolbar.appendChild(gap2);
 
-      var i = location.href.indexOf("#");
-
-      // check if anchor is entire page
-
-      if (i > 0)
-         page = location.href.substr(0, i);
-      else
-         page = location.href;
-
       var start = document.createElement("a");
-      start.setAttribute("href", page);
+      start.setAttribute("href", "javascript:firstSlide()");
       start.setAttribute("title", "restart presentation".localize());
       start.innerHTML = "restart?".localize();
 //    start.setAttribute("href", "javascript:printSlides()");
@@ -2385,9 +2538,14 @@ function tableOfContents()
       this.first.focus();
   }
 
+  toc.onmouseup = mouseButtonUp;
+
   toc.onclick = function (e) {
     e||(e=window.event);
-    hideTableOfContents();
+
+    if (selectedTextLen <= 0)
+       hideTableOfContents();
+
     stopPropagation(e);
     
     if (e.cancel != undefined)

data/ulmul.gemspec

@@ -1,5 +1,5 @@
 # ulmul.gemspec -*-ruby-*-
-# Time-stamp: <2010-04-01 15:25:05 takeshi>
+# Time-stamp: <2010-05-25 21:34:42 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 Gem::Specification.new do |s|
@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
                         'README-en' << 'index.en.html' <<
                         'README-ja' << 'index.ja.html' <<
                         'Rakefile' << 'ulmul.gemspec' << 'setup.rb' <<
-                        'ruby.jpg' << 'slidy.js' << 'ulmul-slidy.css'
+                        'ruby.jpg' <<
+                        'ulmul-slidy.js' <<
+                        'ulmul-slidy.css'
   s.author            = 'Takeshi Nishimatsu'
   s.email             = 't-nissie@imr.tohoku.ac.jp'
   s.rubyforge_project = 'ulmul'

data/ulmul2html5.css

@@ -1,6 +1,6 @@
 /* -*-CSS-*-
  * style.css for index.??.html of ulmul
- * Time-stamp: <2010-03-30 12:31:20 takeshi>
+ * Time-stamp: <2010-04-10 17:45:09 takeshi>
  * Author: Takeshi NISHIMATSU
  */
 body
@@ -77,3 +77,6 @@ figure figcaption{
     margin-right: auto;
     display: block;
 }
+
+div.navi { text-align: right;
+	   margin-right: 1.0em; }

data/ulmul2xhtml.css

@@ -1,6 +1,6 @@
 /* -*-CSS-*-
  * style.css for index.??.html of ulmul
- * Time-stamp: <2010-03-30 16:08:16 takeshi>
+ * Time-stamp: <2010-04-10 17:45:16 takeshi>
  * Author: Takeshi NISHIMATSU
  */
 body
@@ -77,3 +77,6 @@ div.figure div.figcaption{
     margin-right: auto;
     display: block;
 }
+
+div.navi { text-align: right;
+	   margin-right: 1.0em; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ulmul
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Takeshi Nishimatsu
@@ -9,7 +9,7 @@ autorequire: lib/ulmul.rb
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 +09:00
+date: 2010-05-27 00:00:00 +09:00
 default_executable: ulmul2html5
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - ulmul.gemspec
 - setup.rb
 - ruby.jpg
-- slidy.js
+- ulmul-slidy.js
 - ulmul-slidy.css
 has_rdoc: true
 homepage: http://ulmul.rubyforge.org/