ulmul 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7c57be35732f321d6726a210d52667214ce64590290e6ea68b9e2dce8c92a3
-  data.tar.gz: 8e6898709f4212ea232d7a2b28fb19f82eeb39899e6d6b74173997f1507b3d75
+  metadata.gz: 9469aef4ee259ab561a295f22afb77330c35b3ef04039e02b7fd1358173c624a
+  data.tar.gz: 5482744fa00f4c6dce080ef33e16cd3694249862d7f03d69d380c0ce8054f784
 SHA512:
-  metadata.gz: 39dbcd096b889d6c71135a55e7ae27422b9d02ba9e0a7a1546453f15128fd160dd5bd1cd8632898b4a08dd3de1896dc6dae7da0cd0de278418c370a518824577
-  data.tar.gz: f29394fd5f9105b183882969467825626a099dc3eb1975bbd847ee13e4a217652ded5324d91216beecacc81a34e7de59a60c981994e8ae4040da6ad8705fc33a
+  metadata.gz: 6d34b32788ab26251dfa22778fc661d8958c47bd7de43dc9761ae34324e39cbffb822d000b25273438aa68f339d7291bf57abcc393df188bbdb1e570e5f222ef
+  data.tar.gz: 7af15b88c56bfe38b1ac6d6ed413569698cea5223521591be6e4e3cbb82901649ca01ba9ecf528b9d995e6d92170a3aa9f8254a37492a9dfa2b222f12caf139e

data/README-en

@@ -182,9 +182,6 @@ If you do not need the Table of Contents, specify 1.
  * http://t-nissie.users.sourceforge.net/ULMUL/index.en.html
    * Its source is http://t-nissie.users.sourceforge.net/ULMUL/README-en (this document)
 
-=== ulmul2xhtml is obsolete
-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
@@ -208,10 +205,10 @@ For more, see TODO file.
 
 == Repository in GitHub
 You can clone the source tree of ULMUL from GitHub with git(1) command:
- $ git clone git@github.com:t-nissie/ULMUL.git ulmul
+ $ git clone https://github.com/t-nissie/ULMUL.git ulmul
 
 == Copying
-Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022 by Takeshi Nishimatsu
+Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022,2024 by Takeshi Nishimatsu
 
 ulmul.rb is distributed in the hope that
 it will be useful, but WITHOUT ANY WARRANTY.

data/README-ja

@@ -173,9 +173,6 @@ JavaScriptのファイル名を指定します。
  * http://t-nissie.users.sourceforge.net/ULMUL/index.ja.html
    * ソースは http://t-nissie.users.sourceforge.net/ULMUL/README-ja （この文章）
 
-=== ulmul2xhtmlは消します
-次のバージョン (0.6.x) からulmul2xhtmlは消します。
-
 == ulmul2mathjaxの使用方法
 数式を MathJax http://www.mathjax.org/ で出力します。
  $ ulmul2mathjax --help
@@ -193,11 +190,11 @@ ulmul2latexはまだ発展途上です。
 == 最新のソース・ツリーの入手方法
 ソース・ツリーはGitHubに置いてあります。
 git(1)コマンドを使って
- $ git clone git@github.com:t-nissie/ULMUL.git ulmul
+ $ git clone https://github.com/t-nissie/ULMUL.git ulmul
 と匿名でcloneできます。
 
 == 著作権表示
-Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022 by Takeshi Nishimatsu
+Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022,2024 by Takeshi Nishimatsu
 
 ulmul.rb is distributed in the hope that
 it will be useful, but WITHOUT ANY WARRANTY.

data/Rakefile

@@ -1,6 +1,5 @@
 #! /usr/bin/env rake
 # -*-Ruby-*-
-# Time-stamp: <2017-08-31 06:08:40 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 $LOAD_PATH.unshift('lib')
@@ -35,6 +34,7 @@ Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
+  t.warning = false
 end
 
 # Rake::RDocTask.new do |rdoc|

data/index.en.html

@@ -54,14 +54,13 @@ Table of Contents:
       <li><a href="#LABEL-19">Examples</a></li>
       <li><a href="#LABEL-20">Command options</a></li>
       <li><a href="#LABEL-27">ULMUL and Slidy examples</a></li>
-      <li><a href="#LABEL-28">ulmul2xhtml is obsolete</a></li>
     </ul></li>
-  <li><a href="#LABEL-29">Usage of ulmul2mathjax</a></li>
-  <li><a href="#LABEL-30">Usage of ulmul2latex</a></li>
-  <li><a href="#LABEL-31">TODO</a></li>
-  <li><a href="#LABEL-32">Repository in GitHub</a></li>
-  <li><a href="#LABEL-33">Copying</a></li>
-  <li><a href="#LABEL-34">Author of ULMUL</a></li>
+  <li><a href="#LABEL-28">Usage of ulmul2mathjax</a></li>
+  <li><a href="#LABEL-29">Usage of ulmul2latex</a></li>
+  <li><a href="#LABEL-30">TODO</a></li>
+  <li><a href="#LABEL-31">Repository in GitHub</a></li>
+  <li><a href="#LABEL-32">Copying</a></li>
+  <li><a href="#LABEL-33">Author of ULMUL</a></li>
 </ul>
 </div>
 
@@ -353,15 +352,11 @@ If you do not need the Table of Contents, specify 1.
       <li>Its source is <a href="http://t-nissie.users.sourceforge.net/ULMUL/README-en">http://t-nissie.users.sourceforge.net/ULMUL/README-en</a> (this document)</li>
     </ul></li>
 </ul>
-<h3 id="LABEL-28">ulmul2xhtml is obsolete</h3>
-<p>
-ulmul2xhtml will be removed from next version 0.6.x.
-</p>
 </div>
 
 
 <div class="slide">
-<h2 id="LABEL-29">Usage of ulmul2mathjax</h2>
+<h2 id="LABEL-28">Usage of ulmul2mathjax</h2>
 <p>
 It uses MathJax <a href="http://www.mathjax.org/">http://www.mathjax.org/</a> to show equations.
 </p>
@@ -374,7 +369,7 @@ $ ulmul2mathjax -s ulmul2html5.css -j https://cdn.rawgit.com/google/code-prettif
 
 
 <div class="slide">
-<h2 id="LABEL-30">Usage of ulmul2latex</h2>
+<h2 id="LABEL-29">Usage of ulmul2latex</h2>
 <pre>
 $ ulmul2latex --help
 $ ulmul2latex test.ulmul | tee test.tex
@@ -389,7 +384,7 @@ ulmul2latex is still under development. Sorry.
 
 
 <div class="slide">
-<h2 id="LABEL-31">TODO</h2>
+<h2 id="LABEL-30">TODO</h2>
 
 <ul>
   <li>More useful error messages for syntax errors.</li>
@@ -404,20 +399,20 @@ For more, see TODO file.
 
 
 <div class="slide">
-<h2 id="LABEL-32">Repository in GitHub</h2>
+<h2 id="LABEL-31">Repository in GitHub</h2>
 <p>
 You can clone the source tree of ULMUL from GitHub with git(1) command:
 </p>
 <pre>
-$ git clone git@github.com:t-nissie/ULMUL.git ulmul
+$ git clone https://github.com/t-nissie/ULMUL.git ulmul
 </pre>
 </div>
 
 
 <div class="slide">
-<h2 id="LABEL-33">Copying</h2>
+<h2 id="LABEL-32">Copying</h2>
 <p>
-Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022 by Takeshi Nishimatsu
+Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022,2024 by Takeshi Nishimatsu
 </p>
 <p>
 ulmul.rb is distributed in the hope that
@@ -439,7 +434,7 @@ and <a href="http://www.w3.org/Consortium/Legal/copyright-software">http://www.w
 
 
 <div class="slide">
-<h2 id="LABEL-34">Author of ULMUL</h2>
+<h2 id="LABEL-33">Author of ULMUL</h2>
 <p>
 Takeshi Nishimatsu (t_nissie{at}yahoo.co.jp) <a href="http://t-nissie.users.sourceforge.net/">http://t-nissie.users.sourceforge.net/</a>
 </p>

data/index.ja.html

@@ -54,13 +54,12 @@ Table of Contents:
       <li><a href="#LABEL-19">例</a></li>
       <li><a href="#LABEL-20">コマンド・ライン・オプション</a></li>
       <li><a href="#LABEL-27">実際の使用例</a></li>
-      <li><a href="#LABEL-28">ulmul2xhtmlは消します</a></li>
     </ul></li>
-  <li><a href="#LABEL-29">ulmul2mathjaxの使用方法</a></li>
-  <li><a href="#LABEL-30">ulmul2latexの使用方法</a></li>
-  <li><a href="#LABEL-31">最新のソース・ツリーの入手方法</a></li>
-  <li><a href="#LABEL-32">著作権表示</a></li>
-  <li><a href="#LABEL-33">作者</a></li>
+  <li><a href="#LABEL-28">ulmul2mathjaxの使用方法</a></li>
+  <li><a href="#LABEL-29">ulmul2latexの使用方法</a></li>
+  <li><a href="#LABEL-30">最新のソース・ツリーの入手方法</a></li>
+  <li><a href="#LABEL-31">著作権表示</a></li>
+  <li><a href="#LABEL-32">作者</a></li>
 </ul>
 </div>
 
@@ -336,15 +335,11 @@ JavaScriptのファイル名を指定します。
       <li>ソースは <a href="http://t-nissie.users.sourceforge.net/ULMUL/README-ja">http://t-nissie.users.sourceforge.net/ULMUL/README-ja</a> （この文章）</li>
     </ul></li>
 </ul>
-<h3 id="LABEL-28">ulmul2xhtmlは消します</h3>
-<p>
-次のバージョン (0.6.x) からulmul2xhtmlは消します。
-</p>
 </div>
 
 
 <div class="slide">
-<h2 id="LABEL-29">ulmul2mathjaxの使用方法</h2>
+<h2 id="LABEL-28">ulmul2mathjaxの使用方法</h2>
 <p>
 数式を MathJax <a href="http://www.mathjax.org/">http://www.mathjax.org/</a> で出力します。
 </p>
@@ -357,7 +352,7 @@ $ ulmul2mathjax -s ulmul2html5.css -j https://cdn.rawgit.com/google/code-prettif
 
 
 <div class="slide">
-<h2 id="LABEL-30">ulmul2latexの使用方法</h2>
+<h2 id="LABEL-29">ulmul2latexの使用方法</h2>
 <pre>
 $ ulmul2latex --help
 $ ulmul2latex test.ulmul | tee test.tex
@@ -372,13 +367,13 @@ ulmul2latexはまだ発展途上です。
 
 
 <div class="slide">
-<h2 id="LABEL-31">最新のソース・ツリーの入手方法</h2>
+<h2 id="LABEL-30">最新のソース・ツリーの入手方法</h2>
 <p>
 ソース・ツリーはGitHubに置いてあります。
 git(1)コマンドを使って
 </p>
 <pre>
-$ git clone git@github.com:t-nissie/ULMUL.git ulmul
+$ git clone https://github.com/t-nissie/ULMUL.git ulmul
 </pre>
 <p>
 と匿名でcloneできます。
@@ -387,9 +382,9 @@ $ git clone git@github.com:t-nissie/ULMUL.git ulmul
 
 
 <div class="slide">
-<h2 id="LABEL-32">著作権表示</h2>
+<h2 id="LABEL-31">著作権表示</h2>
 <p>
-Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022 by Takeshi Nishimatsu
+Copyright © 2008,2009,2010,2011,2012,2013,2014,2015,2017,2022,2024 by Takeshi Nishimatsu
 </p>
 <p>
 ulmul.rb is distributed in the hope that
@@ -411,7 +406,7 @@ and <a href="http://www.w3.org/Consortium/Legal/copyright-software">http://www.w
 
 
 <div class="slide">
-<h2 id="LABEL-33">作者</h2>
+<h2 id="LABEL-32">作者</h2>
 <p>
 西松タケシ (t_nissie{at}yahoo.co.jp) <a href="http://t-nissie.users.sourceforge.net/">http://t-nissie.users.sourceforge.net/</a>
 </p>

data/lib/ulmul.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 # ulmul.rb
-# Time-stamp: <2022-07-13 07:03:30 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 require "rubygems"
@@ -83,7 +82,7 @@ end
 class Ulmul
   include AASM
   include Itemize
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 
   aasm.initial_state :st_ground
 
@@ -351,9 +350,12 @@ module HTML
     @body << "<p id=\"#{@env_label}\" class=\"code caption\">\n"
     @body << "  Code #{@codes.length}: " << @subs_rules.call(@env_caption) << "(download: <a href=\"#{@env_file}\">#{File.basename(@env_file)}</a>)" << "</p>\n"
     @body << "<pre class=\"prettyprint\">\n"
-    f = open(@env_file)
-    @body << f.read.gsub(/&/,'&amp;').gsub(/</,'&lt;').gsub(/>/,'&gt;')
-    f.close
+    begin
+      open(@env_file){|f| @body << f.read.gsub(/&/,'&amp;').gsub(/</,'&lt;').gsub(/>/,'&gt;')}
+    rescue Errno::ENOENT => ex
+      STDERR << ex << "\n"
+      exit 1
+    end
     @body << "</pre>\n"
   end
 
@@ -477,8 +479,13 @@ module LaTeX
   def cb_env_end2()
     case @env_label
     when /^Fig:/
-      width  = EXIFR::JPEG.new(@env_file).width
-      height = EXIFR::JPEG.new(@env_file).height
+      begin
+        width  = EXIFR::JPEG.new(@env_file).width
+        height = EXIFR::JPEG.new(@env_file).height
+      rescue Errno::ENOENT => ex
+        STDERR << ex << "\n"
+        exit 1
+      end
       @body << "\\begin{figure}\n" << "  \\center\n  \\includegraphics[width=5cm,bb=0 0 #{width} #{height}]{#{@env_file}}\n"
       @body << '  \caption{' << @subs_rules.call(@env_caption).strip << "}\n"
       @body << "  \\label{#{@env_label}}\n" << "\\end{figure}\n"
@@ -491,9 +498,12 @@ module LaTeX
       @body << "\\end{table}\n"
     when /^Code:/
       @body << "\\begin{lstlisting}[caption={#{@subs_rules.call(@env_caption).strip}},label=#{@env_label}]\n"
-      f = open(@env_file)
-      @body << f.read
-      f.close
+      begin
+        open(@env_file){|f| @body << f.read}
+      rescue Errno::ENOENT => ex
+        STDERR << ex << "\n"
+        exit 1
+      end
       @body << "\\end{lstlisting}\n"
     end
   end

data/ulmul.gemspec

@@ -1,13 +1,11 @@
 # ulmul.gemspec -*-ruby-*-
-# Time-stamp: <2022-07-13 06:53:14 takeshi>
 # Author: Takeshi Nishimatsu
 ##
 Gem::Specification.new do |s|
   s.name              = 'ulmul'
 
   s.bindir            = 'bin'
-  s.executables       = ['ulmul2html5', 'ulmul2xhtml', 'ulmul2latex', 'ulmul2mathjax']
-  s.default_executable=  'ulmul2html5'
+  s.executables       = ['ulmul2html5', 'ulmul2latex', 'ulmul2mathjax']
 
   s.summary           = 'ULMUL is an Ultra Lightweight Mark-Up Language'
   s.files             = ['lib/ulmul.rb', 'test/unit/ulmul_test.rb',
@@ -30,12 +28,11 @@ Gem::Specification.new do |s|
   s.homepage          = 'http://t-nissie.users.sourceforge.net/ULMUL/'
   s.test_files        = ['test/unit/ulmul_test.rb']
 
-  s.has_rdoc          = true
 # s.extra_rdoc_files  = %w(README)
 
-  s.add_dependency('math_ml', '~> 0.14')
-  s.add_dependency('aasm',    '~> 5.2', '>= 5.2.0')
-  s.add_dependency('exifr',   '~> 1.3', '>= 1.3.9')
+  s.add_dependency('math_ml', "~> 1.0", '>= 1.0.0')
+  s.add_dependency('aasm',    "~> 5.5", '>= 5.5.0')
+  s.add_dependency('exifr',   "~> 1.4", '>= 1.4.0')
 
   s.description       = <<-EOF
      ULMUL is an original Ultra Lightweight MarkUp Language.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ulmul
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Takeshi Nishimatsu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: math_ml
@@ -16,54 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.0
 description: |2
        ULMUL is an original Ultra Lightweight MarkUp Language.
        You can write TeX-style equations in ULMUL texts.
@@ -76,7 +82,6 @@ description: |2
 email: t_nissie@yahoo.co.jp
 executables:
 - ulmul2html5
-- ulmul2xhtml
 - ulmul2latex
 - ulmul2mathjax
 extensions: []
@@ -91,7 +96,6 @@ files:
 - bin/ulmul2html5
 - bin/ulmul2latex
 - bin/ulmul2mathjax
-- bin/ulmul2xhtml
 - favicon.ico
 - hello.c
 - index.en.html
@@ -126,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: ULMUL is an Ultra Lightweight Mark-Up Language

data/bin/ulmul2xhtml

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-# ulmul2xhtml
-# Time-stamp: <2011-03-31 19:29:32 takeshi>
-# Author: Takeshi Nishimatsu
-##
-=begin
-= ulmul2xhtml
-== Usage
-=== Examples
- % ulmul2xhtml foo.txt
- % ulmul2xhtml --style=style.css --name="John Smith" foo.ulmul > foo.html
- % ulmul2xhtml --style=ulmul-slidy.css --javascript=ulmul-slidy.js \
-   --name="Takeshi Nishimatsu" presentation.txt > presentation.xhtml
-=end
-require "ulmul"
-# Local variables:
-#   compile-command: "ruby -I ../lib ulmul2xhtml -s ../ulmul2xhtml.css -s ../google-code-prettify/src/prettify.css -j ../google-code-prettify/src/prettify.js ../lib/test.ulmul | tee test.html"
-# End: