review-peg 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a8314cbab450277e8afa8b82587710657765c4
-  data.tar.gz: 2a1eb42ee5b296e430b1c8a4f24ca5aee7daa592
+  metadata.gz: 1f54ae66ecbce5b66ce484d9fcdb1b56265e7df5
+  data.tar.gz: 1d7e98448ac6acfca5b600b2e5dd003bc6eae84e
 SHA512:
-  metadata.gz: 5c9daa8c4e7649c01b8fd4579f1b894ad140ee6c6adba721c063cd4633bf3190e2f85bc0eed84aad79a9d1a1b28fd28e27f86a057099f9cbe6d9506dc21ac6ea
-  data.tar.gz: a94b8dcae6985bdef5bfc5e91a617d962f60003db27f7725029720b694a8309b627425410b56b8fed42be8e91e7fcc9e8b4ab4176453eb48e9d742c92aaef334
+  metadata.gz: 2776df52db2e4bfd656f738dce54b8dfe4e65228995f8fb14fd1c125933276e6e3d6e3c30ab9194755b864120bc7e9825a4a6e6cb10a11475fc0d1f685d0f610
+  data.tar.gz: a7d35573095992184ac9e2e0c2af2418c62e0007c621b0bb5045f6f77ba1e616eb7de0a81ff9e5d75d14f894734f612dd117e9c0527ad043017e9693c0610d85

data/lib/review/builder.rb

@@ -228,8 +228,14 @@ module ReVIEW
       nofunc_text("[UnknownImage:#{id}]")
     end
 
-    def inline_imgref(id)
-      img = inline_img(id)
+    def node_inline_img(node)
+      id = node[0].to_raw
+      inline_img(id)
+    end
+
+    def node_inline_imgref(node)
+      id = node[0].to_raw
+      img = node_inline_img(node)
 
       if @chapter.image(id).caption
         "#{img}#{I18n.t('image_quote', @chapter.image(id).caption)}"

data/lib/review/compiler.rb

@@ -36,10 +36,18 @@ class ReVIEW::Compiler
     end
 
     def current_line(target=pos)
-      offset = @sizes_memo.bsearch{|line, cur_offset| cur_offset >= target}
-      if offset
-        return offset[0]
-       end
+      if @sizes_memo.respond_to?(:bsearch)
+        offset = @sizes_memo.bsearch{|line, cur_offset| cur_offset >= target}
+        if offset
+          return offset[0]
+        end
+      else
+        @sizes_memo.each do |line, cur_offset|
+          if cur_offset >= target
+            return cur_offset
+          end
+        end
+      end
 
       -1
     end

data/lib/review/idgxmlbuilder.rb

@@ -442,7 +442,8 @@ module ReVIEW
       end
     end
 
-    def inline_img(id)
+    def node_inline_img(node)
+      id = node[0].to_raw
       chapter, id = extract_chapter_id(id)
       if get_chap(chapter).nil?
         "<span type='image'>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}</span>"
@@ -451,10 +452,11 @@ module ReVIEW
       end
     end
 
-    def inline_imgref(id)
+    def node_inline_imgref(node)
+      id = node[0].to_raw
       chapter, id = extract_chapter_id(id)
       if chapter.image(id).caption.blank?
-        inline_img(id)
+        node_inline_img(node)
       else
         if get_chap(chapter).nil?
           "<span type='image'>#{I18n.t("image")}#{I18n.t("format_number_without_chapter", [chapter.image(id).number])}#{I18n.t('image_quote', chapter.image(id).caption)}</span>"

data/lib/review/latexbuilder.rb

@@ -230,9 +230,9 @@ module ReVIEW
     def emlist(lines, caption = nil, lang = nil)
       buf = "\n"
       if highlight_listings?
-        buf << common_code_block_lst(lines, 'reviewemlistlst', 'title', caption, lang)
+        buf << common_code_block_lst(nil, lines, 'reviewemlistlst', 'title', caption, lang)
       else
-        buf << common_code_block(lines, 'reviewemlist', caption, lang) do |line, idx|
+        buf << common_code_block(nil, lines, 'reviewemlist', caption, lang) do |line, idx|
           detab(line) + "\n"
         end
       end
@@ -242,9 +242,9 @@ module ReVIEW
     def emlistnum(lines, caption = nil, lang = nil)
       buf = "\n"
       if highlight_listings?
-        buf << common_code_block_lst(lines, 'reviewemlistnumlst', 'title', caption, lang)
+        buf << common_code_block_lst(nil, lines, 'reviewemlistnumlst', 'title', caption, lang)
       else
-        buf << common_code_block(lines, 'reviewemlist', caption, lang) do |line, idx|
+        buf << common_code_block(nil, lines, 'reviewemlist', caption, lang) do |line, idx|
           detab((idx+1).to_s.rjust(2)+": " + line) + "\n"
         end
       end
@@ -255,14 +255,9 @@ module ReVIEW
     def list(lines, id, caption = nil, lang = nil)
       buf = ""
       if highlight_listings?
-        buf << common_code_block_lst(lines, 'reviewlistlst', 'caption', caption, lang)
+        buf << common_code_block_lst(id, lines, 'reviewlistlst', 'caption', caption, lang)
       else
-        begin
-          buf << macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{caption}") + "\n"
-        rescue KeyError
-          error "no such list: #{id}"
-        end
-        buf << common_code_block(lines, 'reviewlist', nil, lang) do |line, idx|
+        buf << common_code_block(id, lines, 'reviewlist', caption, lang) do |line, idx|
           detab(line) + "\n"
         end
       end
@@ -274,14 +269,9 @@ module ReVIEW
     def listnum(lines, id, caption = nil, lang = nil)
       buf = ""
       if highlight_listings?
-        buf << common_code_block_lst(lines, 'reviewlistnumlst', 'caption', caption, lang)
+        buf << common_code_block_lst(id, lines, 'reviewlistnumlst', 'caption', caption, lang)
       else
-        begin
-          buf << macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{caption}") + "\n"
-        rescue KeyError
-          error "no such list: #{id}"
-        end
-        buf << common_code_block(lines, 'reviewlist', caption, lang) do |line, idx|
+        buf << common_code_block(id, lines, 'reviewlist', caption, lang) do |line, idx|
           detab((idx+1).to_s.rjust(2)+": " + line) + "\n"
         end
       end
@@ -291,20 +281,29 @@ module ReVIEW
     def cmd(lines, caption = nil, lang = nil)
       buf = ""
       if highlight_listings?
-        buf << common_code_block_lst(lines, 'reviewcmdlst', 'title', caption, lang)
+        buf << common_code_block_lst(nil, lines, 'reviewcmdlst', 'title', caption, lang)
       else
         buf << "\n"
-        buf << common_code_block(lines, 'reviewcmd', caption, lang) do |line, idx|
+        buf << common_code_block(nil, lines, 'reviewcmd', caption, lang) do |line, idx|
           detab(line) + "\n"
         end
       end
       buf
     end
 
-    def common_code_block(lines, command, caption, lang)
+    def common_code_block(id, lines, command, caption, lang)
       buf = ""
       if caption
-        buf << macro(command + 'caption', "#{caption}") + "\n"
+        if command =~ /emlist/ || command =~ /cmd/
+          buf << macro(command + 'caption', "#{caption}") + "\n"
+        else
+          begin
+            buf << "\n"
+            buf << macro('reviewlistcaption', "#{I18n.t("list")}#{I18n.t("format_number_header", [@chapter.number, @chapter.list(id).number])}#{I18n.t("caption_prefix")}#{caption}") + "\n"
+          rescue KeyError
+            error "no such list: #{id}"
+          end
+        end
       end
       body = ""
       lines.each_with_index do |line, idx|
@@ -316,7 +315,7 @@ module ReVIEW
       buf
     end
 
-    def common_code_block_lst(lines, command, title, caption, lang)
+    def common_code_block_lst(id, lines, command, title, caption, lang)
       buf = ""
       caption_str = (caption || "")
       if title == "title" && caption_str == ""
@@ -338,7 +337,7 @@ module ReVIEW
 
     def source(lines, caption = nil, lang = nil)
       if highlight_listings?
-        common_code_block_lst(lines, 'reviewlistlst', 'title', caption, lang)
+        common_code_block_lst(nil, lines, 'reviewlistlst', 'title', caption, lang)
       else
       buf = "\n"
       buf << '\begin{reviewlist}' << "\n"
@@ -681,7 +680,7 @@ module ReVIEW
 
     def node_inline_title(node)
       id = node[0].to_raw
-      title = super
+      title = @book.chapter_index.title(id)
       if @book.config["chapterlink"]
         "\\hyperref[chap:#{id}]{#{title}}"
       else

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/test_latexbuilder.rb

@@ -279,7 +279,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_listnum
     actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
-    assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\reviewlistcaption{ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
+    assert_equal %Q|\n\\reviewlistcaption{リスト1.1: ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
   end
 
   def test_listnum_lst

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review-peg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake