textbringer-presentation 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 46e7f2d5bc20a3ac9b87ef487883c1ca9a666e35
-  data.tar.gz: 55c6fd520e3cacf510ef29a700e984d13dda94b2
+SHA256:
+  metadata.gz: c79839a7bba5c9edf03480908e01d39cf58f25c16682ad405a8b5bc7e6668f5c
+  data.tar.gz: 5354a10987d944e84480c436d8aa9f736415f995fb5b0d44e02c3dd461e2ea04
 SHA512:
-  metadata.gz: '0810b703bf1865e6648294e596d307b02bc1aca4788d8da6f2b31dd1f1fb8bb15383f4b51be8485721b4c05658b3b53510d279a911011087065c428518d91149'
-  data.tar.gz: 61675634c9c3fbefea071b87a5352a0a45c5e734dbceb7377c8ad2a75f71b8946755537a85888c177e39c9d15335ff219c43ab6ccd897a8262a10498da56a3a7
+  metadata.gz: 9064b8dd688e91ba0d862fb7e42df1decf74d2c8fb8a8a5adcf2d3719eb3a1e97d500b46e3b7bef2aaac5f0d290569da8d39165928b966fbef9421d7022af148
+  data.tar.gz: c9a4a947b982ab3b5b0006bba3708745905e5cf8b4a4ddc78b2266e7e95cd898b1d0d98b69526037d6f06fd53b01031a4eab7a59479c7a67bbf95db26d1b550a

data/lib/textbringer/modes/presentation_mode.rb

@@ -21,6 +21,8 @@ module Textbringer
     PRESENTATION_MODE_MAP = Keymap.new
     PRESENTATION_MODE_MAP.define_key(:right, :forward_slide_command)
     PRESENTATION_MODE_MAP.define_key(:left, :backward_slide_command)
+    PRESENTATION_MODE_MAP.define_key("j", :forward_slide_command)
+    PRESENTATION_MODE_MAP.define_key("k", :backward_slide_command)
     PRESENTATION_MODE_MAP.define_key("q", :quit_presentation_command)
     PRESENTATION_MODE_MAP.define_key("\C-l", :show_current_slide_command)
 
@@ -84,7 +86,12 @@ module Textbringer
       if buffer
         buffer.kill
       end
+      src_buffer = @buffer[:source_buffer]
+      pos = @buffer[:slide_list].current.start_pos
       kill_buffer(@buffer)
+      switch_to_buffer(src_buffer)
+      src_buffer.goto_char(pos)
+      Window.current.recenter
       Window.redraw
     end
 
@@ -92,9 +99,13 @@ module Textbringer
 
     def show_image(img, body)
       Window.redisplay
-      wininfo = `xwininfo -id $WINDOWID`
-      width = wininfo.slice(/Width: (\d+)/, 1).to_i
-      height = wininfo.slice(/Height: (\d+)/, 1).to_i
+      width = CONFIG[:presentation_window_width]
+      height = CONFIG[:presentation_window_height]
+      if width.nil? || height.nil?
+        wininfo = `xwininfo -id $WINDOWID`
+        width = wininfo.slice(/Width: (\d+)/, 1).to_i
+        height = wininfo.slice(/Height: (\d+)/, 1).to_i
+      end
       lines = Window.lines
       columns = Window.columns
       y = @buffer[:presentation_top_margin] +
@@ -105,7 +116,8 @@ module Textbringer
       STDOUT.printf("\e[%d;%dH", y, left_margin + 1)
       img_size = "#{img_width}x#{img_height}"
       img_bg = @buffer[:presentation_image_background]
-      STDOUT.print(`convert -resize #{img_size} -gravity center -background '#{img_bg}' -extent #{img_size} '#{img}' - | img2sixel`)
+      options = CONFIG.fetch(:presentation_img2sixel_options, "")
+      STDOUT.print(`convert -resize #{img_size} -gravity center -background '#{img_bg}' -extent #{img_size} '#{img}' - | img2sixel #{options}`)
       STDOUT.flush
     end
 

data/lib/textbringer/presentation.rb

@@ -2,19 +2,5 @@
 
 require_relative "presentation/version"
 require_relative "presentation/slide_list"
+require_relative "presentation/commands"
 require_relative "modes/presentation_mode"
-
-module Textbringer
-  module Presentation
-  end
-
-  include Commands
-
-  define_command(:presentation) do
-    slide_list = Presentation::SlideList.new(Buffer.current.to_s)
-    buffer = Buffer.find_or_new("*Presentaion*", undo_limit: 0)
-    switch_to_buffer(buffer)
-    buffer[:slide_list] = slide_list
-    presentation_mode
-  end
-end

data/lib/textbringer/presentation/commands.rb

@@ -0,0 +1,9 @@
+define_command(:presentation) do
+  src_buffer = Buffer.current
+  slide_list = Presentation::SlideList.new(src_buffer)
+  buffer = Buffer.find_or_new("*Presentaion*", undo_limit: 0)
+  switch_to_buffer(buffer)
+  buffer[:source_buffer] = src_buffer
+  buffer[:slide_list] = slide_list
+  presentation_mode
+end

data/lib/textbringer/presentation/slide_list.rb

@@ -1,24 +1,50 @@
 # frozen_string_literal: true
 
+require "commonmarker"
+
 module Textbringer
   module Presentation
     class Slide
-      attr_reader :number, :title, :body
+      attr_reader :number, :title
+      attr_accessor :start_pos, :end_pos
 
-      def initialize(number, title, body)
+      def initialize(buffer, number, title)
+        @buffer = buffer
         @number = number
         @title = title
-        @body = body
+        @start_pos = nil
+        @end_pos = nil
+      end
+
+      def body
+        @buffer.substring(@start_pos, @end_pos).sub(/\A.*\n/, "").strip
       end
     end
 
     class SlideList
-      def initialize(s)
-        @list = s.scan(/^#+ *(.*?)\n(.*?)(?:(?=^#)|\z)/m).map.with_index {
-          |(title, body), i|
-          Slide.new(i + 1, title.strip, body.strip)
-        }
-        @index = 0
+      def initialize(buffer)
+        @buffer = buffer
+        doc = CommonMarker.render_doc(buffer.to_s)
+        @list = []
+        slide = nil
+        i = 1
+        @buffer.save_excursion do
+          doc.each do |node|
+            if node.type == :header
+              @buffer.goto_line(node.sourcepos[:start_line])
+              slide.end_pos = @buffer.point - 1 if slide
+              title = node.to_plaintext.strip
+              slide = Slide.new(buffer, i, title)
+              slide.start_pos = @buffer.point
+              @list.push(slide)
+              i += 1
+            end
+          end
+          slide.end_pos = @buffer.point_max if slide
+        end
+        @index = @list.index { |slide|
+          slide.start_pos <= @buffer.point && @buffer.point <= slide.end_pos
+        } || 0
       end
 
       def size
@@ -29,6 +55,17 @@ module Textbringer
         @list[@index]
       end
 
+      def current_page
+        @index + 1
+      end
+
+      def goto_page(no)
+        if no < 1 || no > @list.size
+          raise ArgumentError, "Invalid page number: #{no}"
+        end
+        @index = no - 1
+      end
+
       def forward_slide
         if @index < @list.size - 1
           @index += 1

data/lib/textbringer/presentation/version.rb

@@ -2,6 +2,6 @@
 
 module Textbringer
   module Presentation
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/textbringer-presentation.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "textbringer"
+  spec.add_runtime_dependency "commonmarker"
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer-presentation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commonmarker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +180,7 @@ files:
 - bin/setup
 - lib/textbringer/modes/presentation_mode.rb
 - lib/textbringer/presentation.rb
+- lib/textbringer/presentation/commands.rb
 - lib/textbringer/presentation/slide_list.rb
 - lib/textbringer/presentation/version.rb
 - lib/textbringer_plugin.rb
@@ -189,10 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: Presentation mode for Textbringer.
 test_files: []
-has_rdoc: