ulmul 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5afa2a8e4a0a259e3b1cc96b5da718b8af01da80
+  data.tar.gz: 17740ba30c27663c64aae6b3f44d402fa6e1f182
+SHA512:
+  metadata.gz: 8066ef2229131684b5fc154ac6cd759c598925a1a135c7601cda8bb62016bdfb0c2327034ede1786e5016f0bb0de9deea77cb694f79152322ba03e5a2da1adc2
+  data.tar.gz: 45c18ba87c3beaba64ce8b85487946161dfc58c522ba8d1adcd49170cde1d558b3e8204170d93deae95e5cc0b2e456b10530dd9fc3de905414b51c6555ec74c0

data/ChangeLog

@@ -1,3 +1,12 @@
+2013-12-31 16:17  Takeshi Nishimatsu  <t_nissie@yahoo.co.jp>
+
+	* lib/ulmul.rb: aasm_initial_state -> aasm.initial_state,
+	aasm_state -> aasm.state, aasm_event -> aasm.event
+
+2011-04-10 14:56  Takeshi Nishimatsu  <t_nissie@yahoo.co.jp>
+
+	* lib/ulmul.rb (HTML#body, LaTeX#body): refs
+
 2011-04-09 14:50  Takeshi Nishimatsu  <t_nissie@yahoo.co.jp>
 
 	* README-en, README-ja: Usage of ulmul2mathjax

data/Changes

@@ -1,4 +1,9 @@
 = Changes in each version
+== 0.5.2
+ * Now, in Japanese, spaces are NOT required before and after "Env:foo".
+ * Preparation for aasm-4.0.0
+ * Use -j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js
+
 == 0.5.1
  * ulmul2mathjax, a new command, converts ulmul texts into MathJax documents.
  * Way to give @subs_rules is changed.

data/README-en

@@ -137,10 +137,8 @@ Start a Code environment with "\Code:baz FILENAME"
 and terminate it with "/Code:baz", where "baz" is a tag for the code.
 You can write a figure caption between them.
 You can refer the figure with "Code:baz" as Code:hello.
-Code will be highlighted with
-google-code-prettify http://code.google.com/p/google-code-prettify/ ,
-when options of -s google-code-prettify/src/prettify.css and
--j google-code-prettify/src/prettify.js are given.
+Code will be highlighted with google-code-prettify when
+-j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js is given.
 
 Input:
  \Code:hello hello.c
@@ -189,7 +187,7 @@ ulmul2xhtml will be removed from next version 0.6.x.
 == Usage of ulmul2mathjax
 It uses MathJax http://www.mathjax.org/ to show equations.
  $ ulmul2mathjax --help
- $ ulmul2mathjax -s ulmul2html5.css -s google-code-prettify/src/prettify.css -j google-code-prettify/src/prettify.js \
+ $ ulmul2mathjax -s ulmul2html5.css -j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js \
    -j 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=default' README-en > README-en-mathjax.html
 
 == Usage of ulmul2latex
@@ -229,11 +227,6 @@ 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 .
 
-Google Inc. has copyrights for files under google-code-prettify
-directory. Package prettify-21-Jul-2010.zip is distributed
-from http://code.google.com/p/google-code-prettify/ under the
-Apache License, Version 2.0.
-
 == Author of ULMUL
 Takeshi Nishimatsu (t_nissie{at}yahoo.co.jp) http://t-nissie.users.sourceforge.net/
 

data/README-ja

@@ -79,7 +79,7 @@ EOF と "=end" が出てくると処理が終了します。
 
 === 数式の書き方
 文章中の２つのドル記号($)で挟まれた部分がTeX形式からMathML形式に変換されます。
-また、\Eq:fooと/Eq:fooとで挟まれた行も次の例のように処理されます。
+また、"\Eq:foo"と"/Eq:foo"とで挟まれた行も次の例のように処理されます。
 
 入力:
  Mass $m$ can be converted into energy $E$ as
@@ -94,7 +94,7 @@ Mass $m$ can be converted into energy $E$ as
            E=mc^2.
 /Eq:Emc2
 
-数式は"Eq:Einstein"のように参照します。こんなかんじ Eq:Emc2 。
+数式は"Eq:Einstein"のように参照します。こんなかんじEq:Emc2。
 
 数式を正しくご覧いただくには
  * Firefox 4  http://mozilla.jp/firefox/
@@ -105,7 +105,7 @@ Mass $m$ can be converted into energy $E$ as
 「図環境」は "\Fig:foo FILENAME.jpg" で始めて "/Fig:foo" で閉じてください。
 間に図のキャプションを書くことができます。
 ここで "foo" は図のタグです。
-"Fig:foo"で図を参照することができます。こんな具合です Fig:ruby 。
+"Fig:foo"で図を参照することができます。こんな具合ですFig:ruby。
 
 入力:
  \Fig:ruby ruby.jpg
@@ -128,7 +128,7 @@ Table環境はまだインプリメントされていません。
 「コード環境」は "\Code:baz FILENAME" で始めて "/Code:baz" で閉じてください。
 間にキャプションを書くことができます。
 ここで "baz" は図のタグです。
-"Code:baz"で当該コードを参照することができます。こんな具合です Code:hello 。
+"Code:baz"で当該コードを参照することができます。こんな具合ですCode:hello。
 
 入力:
  \Code:hello hello.c
@@ -176,7 +176,7 @@ JavaScriptのファイル名を指定します。
 == ulmul2mathjaxの使用方法
 数式を MathJax http://www.mathjax.org/ で出力します。
  $ ulmul2mathjax --help
- $ ulmul2mathjax -s ulmul2html5.css -s google-code-prettify/src/prettify.css -j google-code-prettify/src/prettify.js \
+ $ ulmul2mathjax -s ulmul2html5.css -j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js \
    -j 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=default' README-en > README-en-mathjax.html
 
 == ulmul2latexの使用方法
@@ -210,11 +210,6 @@ 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 .
 
-Google Inc. has copyrights for files under google-code-prettify
-directory. Package prettify-21-Jul-2010.zip is distributed
-from http://code.google.com/p/google-code-prettify/ under the
-Apache License, Version 2.0.
-
 == 作者
 西松タケシ (t_nissie{at}yahoo.co.jp) http://t-nissie.users.sourceforge.net/
 

data/Rakefile

@@ -1,16 +1,15 @@
 #! /usr/bin/env rake
 # -*-Ruby-*-
-# Time-stamp: <2011-04-09 13:38:30 takeshi>
+# Time-stamp: <2014-01-01 16:37:55 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 $LOAD_PATH.unshift('lib')
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rake/clean'
 require 'ulmul.rb'
-require 'archive/tar/minitar'
 require 'zlib'
 
 spec = eval(File.read("ulmul.gemspec"))
@@ -22,7 +21,7 @@ ULMUL_PACKAGE_DIR = '..'
 
 desc "Build a gem for ulmul"
 task :gem => [ :test ]
-Rake::GemPackageTask.new(spec) do |g|
+Gem::PackageTask.new(spec) do |g|
   g.need_tar    = true
   g.need_zip    = true
   g.package_dir = ULMUL_PACKAGE_DIR
@@ -61,27 +60,18 @@ task :rubyforge => ["index.en.html",
 end
 
 desc "Create presentation.en.html from README-en"
-file "presentation.en.html" => ["bin/ulmul2html5", "README-en", "ulmul-slidy.css", "google-code-prettify/src/prettify.css",
-                                "google-code-prettify/src/prettify.js", "ulmul-slidy.js", "lib/ulmul.rb"] do |t|
+file "presentation.en.html" => ["bin/ulmul2html5", "README-en", "ulmul-slidy.css", "ulmul-slidy.js", "lib/ulmul.rb"] do |t|
   sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -s #{t.prerequisites[2]} -s #{t.prerequisites[3]} \
       -j #{t.prerequisites[4]} -j #{t.prerequisites[5]} -m 2 -l en #{t.prerequisites[1]} > #{t.name}"
 end
 
-desc "Create index.en.html"
-file "index.en.html" => ["bin/ulmul2html5", "README-en", "ulmul2html5.css", "google-code-prettify/src/prettify.css",
-                         "google-code-prettify/src/prettify.js", "lib/ulmul.rb"] do |t|
-  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -s #{t.prerequisites[2]} -s #{t.prerequisites[3]} \
-      -j #{t.prerequisites[4]} -l en #{t.prerequisites[1]} | \
+["en", "ja"].each{|lang|
+  desc "Create index.#{lang}.html"
+  file "index.#{lang}.html" => ["bin/ulmul2html5", "README-#{lang}", "ulmul2html5.css", "lib/ulmul.rb"] do |t|
+    sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -s #{t.prerequisites[2]} -j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js -l #{lang} #{t.prerequisites[1]} | \
       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/ulmul2html5", "README-ja", "ulmul2html5.css", "google-code-prettify/src/prettify.css",
-                         "google-code-prettify/src/prettify.js", "lib/ulmul.rb"] do |t|
-  sh "ruby -I lib #{t.prerequisites[0]} -n 'Takeshi Nishimatsu' -s #{t.prerequisites[2]} -s #{t.prerequisites[3]} \
-      -j #{t.prerequisites[4]} -l ja #{t.prerequisites[1]} | \
-      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
+  end
+}
 
 desc "Create README-en.tex"
 file "README-en.tex" => ["bin/ulmul2latex", "README-en", "lib/ulmul.rb", "Rakefile"] do |t|

data/index.en.html

@@ -4,7 +4,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>ULMUL (Ultra Lightweight MarkUp Language)</title>
   <meta name="author" content="Takeshi Nishimatsu" />
-  <meta name="copyright" content="Copyright &#169; 2011 Takeshi Nishimatsu" />
   <script type="text/x-mathjax-config">
     MathJax.Hub.Config({
       tex2jax: {
@@ -13,8 +12,7 @@
     });
   </script>
   <link rel="stylesheet" href="ulmul2html5.css" type="text/css" />
-  <link rel="stylesheet" href="google-code-prettify/src/prettify.css" type="text/css" />
-  <script src="google-code-prettify/src/prettify.js" type="text/javascript"></script>
+  <script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js" type="text/javascript"></script>
   <link rel="shortcut icon" href="favicon.ico" />
 </head>
 <body onload="prettyPrint()">
@@ -198,7 +196,7 @@ Output:
 </p>
 <p>
 Mass <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>m</mi></math> can be converted into energy <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>E</mi></math> as
-<math id="Eq:Emc2" xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>E</mi><mo>=</mo><mi>m</mi><msup><mi>c</mi><mn>2</mn></msup><mo>.</mo></math>
+<math id="Eq:Emc2" xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>E</mi><mo stretchy='false'>=</mo><mi>m</mi><msup><mi>c</mi><mn>2</mn></msup><mo stretchy='false'>.</mo></math>
 </p>
 <p>
 You can refer the equation in a way like "Eq:Einstein", as <a href="#Eq:Emc2">Eq. (1)</a>.
@@ -237,7 +235,7 @@ Output:
   <figcaption>
   Figure 1:   The is a dummy figure for an example.
   Cute red logo of Ruby, isn't it?
-  You can write equations even in a caption as <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>a</mi><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><mi>b</mi><mi>x</mi><mo>+</mo><mi>c</mi><mo>=</mo><mn>0</mn></math>.
+  You can write equations even in a caption as <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>a</mi><msup><mi>x</mi><mn>2</mn></msup><mo stretchy='false'>+</mo><mi>b</mi><mi>x</mi><mo stretchy='false'>+</mo><mi>c</mi><mo stretchy='false'>=</mo><mn>0</mn></math>.
   </figcaption>
 </figure>
 <h3 id="LABEL-16">Tables</h3>
@@ -272,10 +270,8 @@ Start a Code environment with "\Code:baz FILENAME"
 and terminate it with "/Code:baz", where "baz" is a tag for the code.
 You can write a figure caption between them.
 You can refer the figure with "Code:baz" as <a href="#Code:hello">Code 1</a>.
-Code will be highlighted with
-google-code-prettify <a href="http://code.google.com/p/google-code-prettify/">http://code.google.com/p/google-code-prettify/</a> ,
-when options of -s google-code-prettify/src/prettify.css and
--j google-code-prettify/src/prettify.js are given.
+Code will be highlighted with google-code-prettify when
+-j <a href="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js">https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js</a> is given.
 </p>
 <p>
 Input:
@@ -309,8 +305,8 @@ int main()
 <h2 id="LABEL-18">Usage of ulmul2html5</h2>
 <h3 id="LABEL-19">Examples</h3>
 <pre>
-$ ulmul2html5 foo.txt > foo.html
-$ ulmul2html5 -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt > presentation.html
+$ ulmul2html5 foo.txt &gt; foo.html
+$ ulmul2html5 -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt &gt; presentation.html
 </pre>
 <h3 id="LABEL-20">Command options</h3>
 <h4 id="LABEL-21">--help</h4>
@@ -369,8 +365,8 @@ It uses MathJax <a href="http://www.mathjax.org/">http://www.mathjax.org/</a> to
 </p>
 <pre>
 $ ulmul2mathjax --help
-$ ulmul2mathjax -s ulmul2html5.css -s google-code-prettify/src/prettify.css -j google-code-prettify/src/prettify.js \
-  -j 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=default' README-en > README-en-mathjax.html
+$ ulmul2mathjax -s ulmul2html5.css -j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js \
+  -j 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=default' README-en &gt; README-en-mathjax.html
 </pre>
 </div>
 
@@ -438,12 +434,6 @@ You can download the original package, slidy.zip, from
 their licenses at <a href="http://www.w3.org/Consortium/Legal/copyright-documents">http://www.w3.org/Consortium/Legal/copyright-documents</a>
 and <a href="http://www.w3.org/Consortium/Legal/copyright-software">http://www.w3.org/Consortium/Legal/copyright-software</a> .
 </p>
-<p>
-Google Inc. has copyrights for files under google-code-prettify
-directory. Package prettify-21-Jul-2010.zip is distributed
-from <a href="http://code.google.com/p/google-code-prettify/">http://code.google.com/p/google-code-prettify/</a> under the
-Apache License, Version 2.0.
-</p>
 </div>
 
 
@@ -453,5 +443,7 @@ Apache License, Version 2.0.
 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>
+<hr />
+<address>Copyright &#169; 2014 Takeshi Nishimatsu</address>
 </body>
 </html>

data/index.ja.html

@@ -4,7 +4,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>ULMUL取扱説明書</title>
   <meta name="author" content="Takeshi Nishimatsu" />
-  <meta name="copyright" content="Copyright &#169; 2011 Takeshi Nishimatsu" />
   <script type="text/x-mathjax-config">
     MathJax.Hub.Config({
       tex2jax: {
@@ -13,8 +12,7 @@
     });
   </script>
   <link rel="stylesheet" href="ulmul2html5.css" type="text/css" />
-  <link rel="stylesheet" href="google-code-prettify/src/prettify.css" type="text/css" />
-  <script src="google-code-prettify/src/prettify.js" type="text/javascript"></script>
+  <script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js" type="text/javascript"></script>
   <link rel="shortcut icon" href="favicon.ico" />
 </head>
 <body onload="prettyPrint()">
@@ -186,7 +184,7 @@ EOF と "=end" が出てくると処理が終了します。
 <h3 id="LABEL-14">数式の書き方</h3>
 <p>
 文章中の２つのドル記号($)で挟まれた部分がTeX形式からMathML形式に変換されます。
-また、\Eq:fooと/Eq:fooとで挟まれた行も次の例のように処理されます。
+また、"\Eq:foo"と"/Eq:foo"とで挟まれた行も次の例のように処理されます。
 </p>
 <p>
 入力:
@@ -202,10 +200,10 @@ Mass $m$ can be converted into energy $E$ as
 </p>
 <p>
 Mass <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>m</mi></math> can be converted into energy <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>E</mi></math> as
-<math id="Eq:Emc2" xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>E</mi><mo>=</mo><mi>m</mi><msup><mi>c</mi><mn>2</mn></msup><mo>.</mo></math>
+<math id="Eq:Emc2" xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>E</mi><mo stretchy='false'>=</mo><mi>m</mi><msup><mi>c</mi><mn>2</mn></msup><mo stretchy='false'>.</mo></math>
 </p>
 <p>
-数式は"Eq:Einstein"のように参照します。こんなかんじ <a href="#Eq:Emc2">Eq. (1)</a> 。
+数式は"Eq:Einstein"のように参照します。こんなかんじ<a href="#Eq:Emc2">Eq. (1)</a>。
 </p>
 <p>
 数式を正しくご覧いただくには
@@ -223,7 +221,7 @@ Mass <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>m</mi
 「図環境」は "\Fig:foo FILENAME.jpg" で始めて "/Fig:foo" で閉じてください。
 間に図のキャプションを書くことができます。
 ここで "foo" は図のタグです。
-"Fig:foo"で図を参照することができます。こんな具合です <a href="#Fig:ruby">Fig. 1</a> 。
+"Fig:foo"で図を参照することができます。こんな具合です<a href="#Fig:ruby">Fig. 1</a>。
 </p>
 <p>
 入力:
@@ -243,7 +241,7 @@ Mass <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>m</mi
   <figcaption>
   Figure 1:   これは図のキャプションの例です。
   Rubyのロゴを描いてみました。
-  キャプションに数式を<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>a</mi><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><mi>b</mi><mi>x</mi><mo>+</mo><mi>c</mi><mo>=</mo><mn>0</mn></math>と書くこともできます。
+  キャプションに数式を<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>a</mi><msup><mi>x</mi><mn>2</mn></msup><mo stretchy='false'>+</mo><mi>b</mi><mi>x</mi><mo stretchy='false'>+</mo><mi>c</mi><mo stretchy='false'>=</mo><mn>0</mn></math>と書くこともできます。
   </figcaption>
 </figure>
 <h3 id="LABEL-16">表の挿入方法</h3>
@@ -255,7 +253,7 @@ Table環境はまだインプリメントされていません。
 「コード環境」は "\Code:baz FILENAME" で始めて "/Code:baz" で閉じてください。
 間にキャプションを書くことができます。
 ここで "baz" は図のタグです。
-"Code:baz"で当該コードを参照することができます。こんな具合です <a href="#Code:hello">Code 1</a> 。
+"Code:baz"で当該コードを参照することができます。こんな具合です<a href="#Code:hello">Code 1</a>。
 </p>
 <p>
 入力:
@@ -289,8 +287,8 @@ int main()
 <h2 id="LABEL-18">ulmul2html5の使用方法</h2>
 <h3 id="LABEL-19">例</h3>
 <pre>
-$ ulmul2html5 foo.txt > foo.html
-$ ulmul2html5 -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt > presentation.html
+$ ulmul2html5 foo.txt &gt; foo.html
+$ ulmul2html5 -n 'Takeshi Nishimatsu' -s ulmul-slidy.css -j ulmul-slidy.js presentation.txt &gt; presentation.html
 </pre>
 <h3 id="LABEL-20">コマンド・ライン・オプション</h3>
 <h4 id="LABEL-21">--help</h4>
@@ -348,8 +346,8 @@ JavaScriptのファイル名を指定します。
 </p>
 <pre>
 $ ulmul2mathjax --help
-$ ulmul2mathjax -s ulmul2html5.css -s google-code-prettify/src/prettify.css -j google-code-prettify/src/prettify.js \
-  -j 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=default' README-en > README-en-mathjax.html
+$ ulmul2mathjax -s ulmul2html5.css -j https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js \
+  -j 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=default' README-en &gt; README-en-mathjax.html
 </pre>
 </div>
 
@@ -405,12 +403,6 @@ You can download the original package, slidy.zip, from
 their licenses at <a href="http://www.w3.org/Consortium/Legal/copyright-documents">http://www.w3.org/Consortium/Legal/copyright-documents</a>
 and <a href="http://www.w3.org/Consortium/Legal/copyright-software">http://www.w3.org/Consortium/Legal/copyright-software</a> .
 </p>
-<p>
-Google Inc. has copyrights for files under google-code-prettify
-directory. Package prettify-21-Jul-2010.zip is distributed
-from <a href="http://code.google.com/p/google-code-prettify/">http://code.google.com/p/google-code-prettify/</a> under the
-Apache License, Version 2.0.
-</p>
 </div>
 
 
@@ -420,5 +412,7 @@ Apache License, Version 2.0.
 西松タケシ (t_nissie{at}yahoo.co.jp) <a href="http://t-nissie.users.sourceforge.net/">http://t-nissie.users.sourceforge.net/</a>
 </p>
 </div>
+<hr />
+<address>Copyright &#169; 2014 Takeshi Nishimatsu</address>
 </body>
 </html>

data/lib/ulmul.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 # ulmul.rb
-# Time-stamp: <2011-04-09 12:53:43 takeshi>
+# Time-stamp: <2013-12-31 17:16:29 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 require "rubygems"
@@ -32,7 +32,7 @@ module Itemize
     if new_level>@level_of_state+1
       STDERR << filename << ":#{lnumber}: Illegal jump of itemize level from #{@level_of_state} to #{new_level}: #{line}"
       exit 1
-      raise 
+      raise
     elsif new_level==@level_of_state+1
       @body << "\n" << "    "*@level_of_state << ITEMIZE_INITIATOR << "\n"
       @body <<              "    "*(new_level-1) << "  " << ITEM_INITIATOR << str
@@ -83,27 +83,27 @@ end
 class Ulmul
   include AASM
   include Itemize
-  VERSION = '0.5.1'
- 
-  aasm_initial_state :st_ground
- 
-  aasm_state :st_ground
-  aasm_state :st_itemize
-  aasm_state :st_verbatim
-  aasm_state :st_paragraph
-  aasm_state :st_env
-  aasm_state :st_equation
- 
-  aasm_event :ev_ignore do
-    transitions :from => :st_ground,    :to => :st_ground    
-    transitions :from => :st_itemize,   :to => :st_itemize   
+  VERSION = '0.5.2'
+
+  aasm.initial_state :st_ground
+
+  aasm.state :st_ground
+  aasm.state :st_itemize
+  aasm.state :st_verbatim
+  aasm.state :st_paragraph
+  aasm.state :st_env
+  aasm.state :st_equation
+
+  aasm.event :ev_ignore do
+    transitions :from => :st_ground,    :to => :st_ground
+    transitions :from => :st_itemize,   :to => :st_itemize
     transitions :from => :st_verbatim,  :to => :st_verbatim
-    transitions :from => :st_paragraph, :to => :st_paragraph 
-    transitions :from => :st_env,       :to => :st_env    
+    transitions :from => :st_paragraph, :to => :st_paragraph
+    transitions :from => :st_env,       :to => :st_env
     transitions :from => :st_equation,  :to => :st_equation
   end
 
-  aasm_event :ev_asterisk do
+  aasm.event :ev_asterisk do
     transitions :from => :st_ground,    :to => :st_itemize,   :on_transition =>                    [:cb_itemize_begin, :cb_itemize_add_item]
     transitions :from => :st_itemize,   :to => :st_itemize,   :on_transition =>                                       [:cb_itemize_add_item]
     transitions :from => :st_verbatim,  :to => :st_verbatim,  :on_transition => [:cb_verbatim_add]
@@ -111,8 +111,8 @@ class Ulmul
     transitions :from => :st_env,       :to => :st_env,       :on_transition => [:cb_env_continues]
     transitions :from => :st_equation,  :to => :st_equation,  :on_transition => [:cb_equation_continues]
   end
- 
-  aasm_event :ev_offset do
+
+  aasm.event :ev_offset do
     transitions :from => :st_ground,    :to => :st_verbatim,  :on_transition =>                    [:cb_verbatim_begin, :cb_verbatim_add]
     transitions :from => :st_itemize,   :to => :st_itemize,   :on_transition => [:cb_itemize_continue_item]
     transitions :from => :st_verbatim,  :to => :st_verbatim,  :on_transition =>                                        [:cb_verbatim_add]
@@ -120,8 +120,8 @@ class Ulmul
     transitions :from => :st_env,       :to => :st_env,       :on_transition => [:cb_env_continues]
     transitions :from => :st_equation,  :to => :st_equation,  :on_transition => [:cb_equation_continues]
   end
- 
-  aasm_event :ev_heading do
+
+  aasm.event :ev_heading do
     transitions :from => :st_ground,    :to => :st_ground,    :on_transition =>                    [:cb_heading]
     transitions :from => :st_itemize,   :to => :st_ground,    :on_transition =>   [:cb_itemize_end, :cb_heading]
     transitions :from => :st_verbatim,  :to => :st_ground,    :on_transition =>  [:cb_verbatim_end, :cb_heading]
@@ -129,8 +129,8 @@ class Ulmul
     transitions :from => :st_env,       :to => :st_ground,    :on_transition => [:cb_env_in_env_error]
     transitions :from => :st_equation,  :to => :st_equation,  :on_transition => [:cb_equation_in_equation_error]
   end
- 
-  aasm_event :ev_empty do
+
+  aasm.event :ev_empty do
     transitions :from => :st_ground,    :to => :st_ground
     transitions :from => :st_itemize,   :to => :st_ground,    :on_transition =>   [:cb_itemize_end]
     transitions :from => :st_verbatim,  :to => :st_ground,    :on_transition =>  [:cb_verbatim_end]
@@ -139,7 +139,7 @@ class Ulmul
     transitions :from => :st_equation,  :to => :st_equation
   end
 
-  aasm_event :ev_env_begin do
+  aasm.event :ev_env_begin do
     transitions :from => :st_ground,    :to => :st_env,       :on_transition =>                    [:cb_env_begin]
     transitions :from => :st_itemize,   :to => :st_env,       :on_transition =>   [:cb_itemize_end, :cb_env_begin]
     transitions :from => :st_verbatim,  :to => :st_env,       :on_transition =>  [:cb_verbatim_end, :cb_env_begin]
@@ -147,28 +147,28 @@ class Ulmul
     transitions :from => :st_env,       :to => :st_env,       :on_transition => [:cb_env_in_env_error]
     transitions :from => :st_equation,  :to => :st_equation,  :on_transition => [:cb_equation_in_equation_error]
   end
- 
-  aasm_event :ev_env_end do
+
+  aasm.event :ev_env_end do
     transitions :from => [:st_ground, :st_itemize, :st_verbatim, :st_paragraph, :st_equation],
                                         :to => :st_ground,    :on_transition => [:cb_env_not_in_env_error]
     transitions :from => :st_env,       :to => :st_ground,    :on_transition => [:cb_env_end]
   end
- 
-  aasm_event :ev_equation_begin do
+
+  aasm.event :ev_equation_begin do
     transitions :from => :st_ground,    :to => :st_equation,  :on_transition =>                    [:cb_paragraph_begin, :cb_equation_begin]
     transitions :from => :st_itemize,   :to => :st_equation,  :on_transition =>   [:cb_itemize_end, :cb_paragraph_begin, :cb_equation_begin]
     transitions :from => :st_verbatim,  :to => :st_equation,  :on_transition =>  [:cb_verbatim_end, :cb_paragraph_begin, :cb_equation_begin]
     transitions :from => :st_paragraph, :to => :st_equation,  :on_transition =>                                         [:cb_equation_begin]
     transitions :from => :st_equation,  :to => :st_equation,  :on_transition => [:cb_equation_in_equation_error]
   end
- 
-  aasm_event :ev_equation_end do
+
+  aasm.event :ev_equation_end do
     transitions :from => [:st_ground, :st_itemize, :st_verbatim, :st_paragraph, :st_env],
                                         :to => :st_ground,    :on_transition => [:cb_equation_not_in_equation_error]
     transitions :from => :st_equation,  :to => :st_paragraph, :on_transition => [:cb_equation_end]
   end
- 
-  aasm_event :ev_normal do
+
+  aasm.event :ev_normal do
     transitions :from => :st_ground,    :to => :st_paragraph, :on_transition =>                   [:cb_paragraph_begin, :cb_paragraph_add]
     transitions :from => :st_itemize,   :to => :st_paragraph, :on_transition =>  [:cb_itemize_end, :cb_paragraph_begin, :cb_paragraph_add]
     transitions :from => :st_verbatim,  :to => :st_paragraph, :on_transition => [:cb_verbatim_end, :cb_paragraph_begin, :cb_paragraph_add]
@@ -194,7 +194,7 @@ class Ulmul
   end
 
   def cb_verbatim_add(filename=nil, lnumber=nil, line=nil)
-      @body << line[1..-1] #.gsub(/</,'&lt;').gsub(/>/,'&gt;')
+      @body << line[1..-1].gsub(/</,'&lt;').gsub(/>/,'&gt;')
   end
 
   def cb_verbatim_end(filename=nil, lnumber=nil, line=nil)
@@ -321,10 +321,14 @@ module HTML
 
   def body
     b = @body.dup
-    @equations.each_with_index{|r,i| b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),  "\\1<a href=\"##{r}\">Eq. (#{i+1})</a>\\2")}
-    @figures.each_with_index{|r,i|   b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),   "\\1<a href=\"##{r}\">Fig. #{i+1}</a>\\2")}
-    @tables.each_with_index{|r,i|    b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),  "\\1<a href=\"##{r}\">Table #{i+1}</a>\\2")}
-    @codes.each_with_index{|r,i|     b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),   "\\1<a href=\"##{r}\">Code #{i+1}</a>\\2")}
+    [@equations, @figures, @tables, @codes].each do |ary|
+      ary.each_with_index do |r,i|
+        s = r.sub(/:.*/,'')
+        if /Eq|Fig/ =~ s then s << '.' end
+        if /Eq/     =~ s then no = "(#{i+1})" else no = "#{i+1}" end
+        b.gsub!(Regexp.new('(?![A-Za-z0-9_"\'#%\\\\])(.)'+r+'(?![A-Za-z0-9_"\'#%])(.)'),"\\1<a href=\"##{r}\">#{s} #{no}</a>\\2")
+      end
+    end
     if $MAX_TABLE_OF_CONTENTS>=2
       b.sub(CONTENTS_HERE, "<br />\n<div class=\"table of contents\">\nTable of Contents:" +
                 @toc.body + "</div>\n")
@@ -388,7 +392,6 @@ module HTML5
   <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
   <title>#{@title}</title>
   <meta name=\"author\" content=\"#{name}\" />
-  <meta name=\"copyright\" content=\"Copyright &#169; #{Date.today.year} #{name}\" />
   <script type=\"text/x-mathjax-config\">
     MathJax.Hub.Config({
       tex2jax: {
@@ -400,6 +403,8 @@ module HTML5
 </head>
 <body onload=\"prettyPrint()\">
 #{body()}
+<hr />
+<address>Copyright &#169; #{Date.today.year} #{name}</address>
 </body>
 </html>
 "
@@ -421,7 +426,7 @@ module XHTML
       cb_env_end2code()
     end
   end
-  
+
   def file(stylesheets=["ulmul2xhtml.css"],javascripts=[],name="",language="en")
     style_lines=""
     stylesheets.each{|s| style_lines << "  <link rel=\"stylesheet\" href=\"#{s}\" type=\"text/css\" />\n"}
@@ -531,10 +536,14 @@ module LaTeX
 
   def body
     b = @body.dup
-    @equations.each{|r| b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),  "\\1Eq.~(\\ref{#{r}})\\2")}
-    @figures.each{|r|   b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),   "\\1Fig.~\\ref{#{r}}\\2")}
-    @tables.each{|r|    b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),  "\\1Table~\\ref{#{r}}\\2")}
-    @codes.each{|r|     b.gsub!(Regexp.new('(^|\s+)'+r+'(\s+|\.|\,|\!|\?|$)'),   "\\1Code~\\ref{#{r}}\\2")}
+    [@equations, @figures, @tables, @codes].each do |ary|
+      ary.each_with_index do |r,i|
+        s = r.sub(/:.*/,'')
+        if /Eq|Fig/ =~ s then s << '.' end
+        if /Eq/     =~ s then no = "(\\ref{#{r}})" else no = "\\ref{#{r}}" end
+        b.gsub!(Regexp.new('(?![A-Za-z0-9_"\'#%\\\\{\=])(.)'+r+'(?![A-Za-z0-9_"\'#%}])(.)'), "\\1#{s}~#{no}\\2")
+      end
+    end
     return b
   end
 end