elisp2any 0.0.5 → 0.0.6

data/README.md

@@ -15,12 +15,22 @@ $ elisp2any --input /path/to/input/file --output /path/to/output/file
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies.
-Then, run `rake test` to run the tests.
-You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Two paragraph types:
 
-To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```emacs-lisp
+;; This is a major one.
+
+;; This is another major one (1), and a minor one.
+;;
+;; This is still (1) but another minor one.
+```
+
+Heading levels:
+
+```emacs-lisp
+;;; Level 2
+;;;; Level 3
+```
 
 ## Contributing
 

data/Rakefile

@@ -7,49 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-default_tasks = %i[test]
-
-rubocop = true
-
-begin
-  require 'rubocop/rake_task'
-rescue LoadError
-  rubocop = false
-end
-
-if rubocop
-  RuboCop::RakeTask.new
-  default_tasks << :rubocop
-end
-
-task default: default_tasks
-
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  readme = 'README.md'
-  rdoc.main = readme
-  rdoc.rdoc_files.include(readme, 'lib/**/*.rb')
-end
-
-desc 'start API document server'
-task :serve_api do
-  serve('html')
-end
-
-desc 'generate type signatures'
-task :sig do
-  sh 'typeprof', *Dir['lib/**/*.rb'], 'sig/elisp2any.rbs', '-o', 'sig/elisp2any.gen.rbs'
-end
-
-desc 'start HTML fixture server'
-task :serve_fixture do
-  serve('fixtures/init')
-end
-
-def serve(path)
-  sh 'ruby', '-run', '-e', 'httpd', path
-end
-
-file 'fixtures/init/adoc/index.html' => 'fixtures/init/index.adoc' do |t|
-  sh 'asciidoctor', t.source, '--out-file', t.name
-end
+task default: :test

data/exe/elisp2any

@@ -3,13 +3,11 @@
 require 'optparse'
 
 $LOAD_PATH << File.join(__dir__, "../lib")
-require 'elisp2any'
-require 'elisp2any/html_renderer'
+require 'elisp'
 
 input = $stdin
 output = $stdout
 css = nil
-mode = :old
 
 OptionParser.new do |parser|
   parser.on('--input=PATH') do |path|
@@ -23,18 +21,6 @@ OptionParser.new do |parser|
   parser.on('--css=PATH') do |path|
     css = path
   end
-
-  parser.on("--new") do
-    mode = :new
-  end
 end.parse!
 
-file = nil
-case mode
-in :new
-  file = Elisp2any::File.scan(input)
-in :old
-  file = Elisp2any::File.parse(input)
-end
-renderer = Elisp2any::HTMLRenderer.new(file, css:, mode:)
-output.write(renderer.render)
+Elisp.parse(input).write(output, css:)

data/lib/elisp/comment.rb

@@ -0,0 +1,93 @@
+class Elisp::Comment
+  def initialize(content)
+    @content = content
+  end
+
+  def <<(content)
+    @content << "\n#{content}"
+  end
+
+  def to_minor_para
+    Elisp::MinorPara.new(@content)
+  end
+
+  def html
+    self.class.parse(@content)
+  end
+end
+
+class Elisp::DocStringParser
+  URI_PATTERN = URI.regexp
+  URI_PATTERN_WITH_ANGLES = /[<](?<uri>#{ URI_PATTERN })[>]/
+  EMAIL = Regexp.new(URI::MailTo::EMAIL_REGEXP.to_s
+                       .sub(/\A[(][?]-mix:\\A/, "(?-mix:")
+                       .sub(/\\z[)]\z/, ")"))
+  EMAIL_WITH_ANGLES = /[<](?<address>#{ EMAIL })[>]/
+
+  def initialize(source)
+    @scanner = StringScanner.new(source)
+  end
+
+  def html
+    result = +""
+    normal = +""
+    until @scanner.eos?
+      if @scanner.skip(/[`](?<code>[A-Za-z!.-]+)[']/)
+        result << normal
+        normal.clear
+        code = CGI.escape_html(@scanner[:code])
+        result << "<code>#{code}</code>"
+        normal.clear
+      elsif @scanner.skip(/\\\\=(?<quote>['`])/)
+        normal << @scanner[:quote]
+      elsif (uri = scan_http_uri)
+        result << normal
+        normal.clear
+        result << html_url(uri)
+      elsif (address = scan_email)
+        result << normal
+        normal.clear
+        uri = CGI.escape(address)
+        address = CGI.escape_html(address)
+        result << %(<a href="mailto:#{uri}">#{address}</a>)
+      else
+        normal << @scanner.getch
+      end
+    end
+    result << normal
+    normal.clear
+    result
+  end
+
+  def scan_email
+    if (address = @scanner.scan(EMAIL))
+      address
+    elsif @scanner.skip(EMAIL_WITH_ANGLES)
+      @scanner[:address]
+    else
+      return
+    end
+  end
+
+  def scan_http_uri
+    if (uri = @scanner.scan(URI_PATTERN))
+    elsif @scanner.skip(URI_PATTERN_WITH_ANGLES)
+      uri = @scanner[:uri]
+    else
+      return
+    end
+    uri = URI(uri)
+    unless uri.is_a?(URI::HTTP)
+      @scanner.unscan
+      return
+    end
+    uri
+  end
+
+  def html_url(url)
+    url = url.to_s
+    ref = CGI.escape(url)
+    label = CGI.escape_html(url)
+    %(<a class="pure-url" href="#{ref}">#{label}</a>)
+  end
+end

data/lib/elisp/parser.rb

@@ -0,0 +1,188 @@
+class Elisp::Parser
+  HEADER_LINE = %r{
+    ;;;[ ]
+    (?<title>[a-z]+[.]el)[ ]---[ ](?<desc>.*?)
+    (?:[ ]+-[*]-[ ](?<vars>lexical-binding:[ ]?t);?[ ]-[*]-)?
+    \n+
+  }x
+  COMMENT = / *;; (?<comment>.*)\n/
+  CODE = %r{
+    (?<content>
+      (?:
+        [A-Za-z0-9&,.:=?_#'`<>()\[\]\t +*/-]
+        | [?]\\.
+        | "(?:[^\\"]|\\(?:.|\n))*"
+      )+?
+      (?:[ ]*;.*)?
+      | ;;;[#][#][#]autoload.*
+    )
+    \n
+  }x
+  BLANKLINES = /\n+/
+  CODE_OR_BLANKLINES = Regexp.union(CODE, BLANKLINES)
+  DEFAULT_CSS = <<~END_CSS
+    <style>
+      :root {
+        --sidebar-width: 200px;
+      }
+      body {
+        display: flex;
+      }
+      main {
+        max-width: 80rem;
+        margin: auto auto auto var(--sidebar-width);
+        padding-left: 0.5rem;
+        border-box: box-sizing;
+      }
+      .sidebar {
+        padding-right: 0.5rem;
+        width: var(--sidebar-width);
+        position: fixed;
+        boxed-sizing: border-box;
+        overflow-y: auto;
+        height: 100%;
+      }
+      .sidebar details ul {
+        position: relative;
+        left: -1.5rem;
+      }
+      .description {
+        font-style: italic;
+      }
+      pre {
+        font-family: serif;
+      }
+      pre[class="code"] {
+        border-left: solid;
+        padding-left: 0.5rem;
+        white-space: pre-wrap;
+      }
+    </style>
+  END_CSS
+  HEADING = %r{
+    ;;;(?<level>;*)[ ](?<title>.+)\n
+    (?:(?:;;)?\n)*
+  }x
+
+  def initialize(input)
+    @scanner = StringScanner.new(input.read)
+    @state = :start
+    @nodes = []
+  end
+
+  def parse
+    until @scanner.eos?
+
+      if @state == :start && @scanner.skip(HEADER_LINE)
+        @nodes << Elisp::Heading.new(@scanner[:title], level: 1)
+        @nodes << Elisp::Desc.new(@scanner[:desc])
+        @nodes << Elisp::Variables.new(@scanner[:vars])
+        @state = :after_header_line
+
+      elsif [:after_header_line,
+             :after_major_para,
+             :after_minor_para,
+             :after_code,
+             :after_page_delimiter,
+             :after_heading].include?(@state) &&
+            @scanner.skip(HEADING)
+        level = @scanner[:level].size
+        title = @scanner[:title]
+        if level.zero?
+          if ["Commentary:", "Code:"].include?(title)
+            title.chop!
+          elsif title.match?(/[a-z]+[.]el ends here/)
+            next  # validate file name?
+          end
+        end
+        @nodes << Elisp::Heading.new(title, level: level + 2)
+        @state = :after_heading
+
+      elsif [:after_heading,
+             :after_major_para,
+             :after_minor_para,
+             :after_code,
+             :after_header_line].include?(@state) &&
+            @scanner.skip(COMMENT)
+        @nodes << Elisp::Comment.new(@scanner[:comment])
+        @state = :after_comment
+
+      elsif @state == :after_comment && @scanner.skip(";;\n")
+        @nodes[-1] = @nodes.last.to_minor_para
+        @state = :after_minor_para
+
+      elsif @state == :after_comment && @scanner.skip(COMMENT)
+        @nodes.last << @scanner[:comment]
+
+      elsif @state == :after_comment && @scanner.skip(BLANKLINES)
+        make_major_para
+        @state = :after_major_para
+
+      elsif [:after_major_para, :after_page_delimiter, :after_heading].include?(@state) &&
+            @scanner.skip(CODE)
+        @nodes << Elisp::Code.new(@scanner[:content])
+        @state = :after_code
+
+      elsif @state == :after_comment && @scanner.skip(CODE)
+        make_major_para
+        @nodes << Elisp::Code.new(@scanner[:content])
+        @state = :after_code
+
+      elsif @state == :after_code && @scanner.skip(CODE_OR_BLANKLINES)
+        @nodes.last << @scanner[:content]
+
+      elsif @state == :after_code && @scanner.skip(/\f\n+/)
+        @nodes << PageDelimiter.new
+        @state = :after_page_delimiter
+
+      else
+        raise Elisp::Error, <<~MESSAGE
+          parse failed
+          --- rest line (#{@state}) ---
+          #{@scanner.rest.lines.first.inspect}
+          --- scanner ---
+          #{@scanner.inspect}
+        MESSAGE
+      end
+    end
+    self
+  end
+
+  def make_major_para
+    paras = [@nodes.pop.to_minor_para]
+    while (node = @nodes.pop)
+      if node.is_a?(Elisp::MinorPara)
+        paras.unshift(node)
+      else
+        @nodes.push(node)
+        break
+      end
+    end
+    @nodes << Elisp::MajorPara.new(paras)
+  end
+
+  def write(output, css: nil)
+    css = css ? %(<link rel="stylesheet" href="#{CGI.escape(css)}">) : DEFAULT_CSS
+    sidebar = Elisp::Sidebar.new(@nodes.select { |node| node.is_a?(Elisp::Heading) \
+                                                          && node.level >= 2 })
+                .html
+    body = @nodes.map(&:html).join("\n")
+    output.write(<<~END_HTML)
+      <!doctype html>
+      <html>
+        <head>
+          #{css}
+          <meta charset="utf8">
+        </head>
+        <body>
+          <nav class="sidebar">
+            #{sidebar}
+          </nav>
+          <main>
+            #{body}
+          </main>
+        </body>
+      </html>
+    END_HTML
+  end
+end

data/lib/elisp.rb

@@ -0,0 +1,142 @@
+require "strscan"
+require "cgi"
+require "uri"
+
+class Elisp
+  Error = Class.new(StandardError)
+
+  def self.parse(input)
+    Elisp::Parser.new(input).parse
+  end
+end
+
+class Elisp::Sidebar
+  def initialize(headings)
+    @headings = headings
+  end
+
+  def html
+    rest = @headings.dup
+    result = +""
+    while (head = rest.shift)
+      level = head.level
+      subheadings = []
+      while (heading = rest.shift)
+        if heading.level > level
+          subheadings << heading
+        else
+          rest.unshift(heading)
+          break
+        end
+      end
+      sub_sidebar =
+        subheadings.empty? ? nil
+          : (html = self.class.new(subheadings).html
+            "<details open>#{html}</details>")
+      content = CGI.escape_html(head.content)
+      result << <<~END_HTML
+        <li>
+          <a href="##{head.html_id}">#{content}</a>
+          #{sub_sidebar}
+        </li>
+      END_HTML
+    end
+    "<ul>#{result}</ul>"
+  end
+end
+
+class PageDelimiter
+  def html = "<hr>"
+end
+
+class Elisp::Heading
+  attr_reader :level, :content
+
+  def initialize(content, level: 2)
+    @content = content
+    @level = level
+  end
+
+  def html
+    name = "h#{@level}"
+    content = CGI.escape_html(@content)
+    <<~END_HTML
+      <#{name} id="#{html_id}">
+        #{content}
+        <a href="##{html_id}">#</a>
+      </#{name}>
+    END_HTML
+  end
+
+  def html_id
+    content = CGI.escape(@content)
+    "#{@level}-#{content}"
+  end
+end
+
+class Elisp::Desc
+  def initialize(content)
+    @content = content
+  end
+
+  def html
+    content = CGI.escape_html(@content)
+    %(<p class="description">#{content}</p>)
+  end
+end
+
+class Elisp::Variables
+  def initialize(content)
+    @content = content
+  end
+
+  def html
+    content = CGI.escape_html(@content)
+    <<~END_HTML
+      <article>
+        Header line variables:
+        <pre><code>#{content}</code></pre>
+      </article>
+    END_HTML
+  end
+end
+
+class Elisp::MajorPara
+  def initialize(paras)
+    @paras = paras
+  end
+
+  def html
+    paras = @paras.map(&:html).join("\n")
+    "<article>#{paras}</article>"
+  end
+end
+
+class Elisp::MinorPara
+  def initialize(content)
+    @content = content
+  end
+
+  def html
+    content = Elisp::DocStringParser.new(@content).html
+    "<pre>#{content}</pre>"
+  end
+end
+
+class Elisp::Code
+  def initialize(content)
+    @content = content
+  end
+
+  def <<(content)
+    @content << "\n#{content}"
+  end
+
+  def html
+    content = CGI.escape_html(@content)
+    %(<pre class="code"><code>#{content}</code></pre>)
+  end
+end
+
+require_relative "elisp/comment"
+require_relative "elisp/parser"

data/lib/elisp2any/version.rb

@@ -1,4 +1,4 @@
 module Elisp2any
   # Version of this library.
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/elisp2any.rb

@@ -1,5 +1,4 @@
 require_relative 'elisp2any/version'
-require_relative 'elisp2any/file'
 require_relative 'elisp2any/heading'
 
 module Elisp2any

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: elisp2any
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - gemmaro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-06-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby_tree_sitter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.20.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.20.8.1
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -80,22 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: elisp2any is a command line tool and library for converting Emacs Lisp
-  source to some document markup, such as HTML or AsciiDoc.
+  source to some document markup, such as HTML.
 email:
 - gemmaro.dev@gmail.com
 executables:
@@ -103,10 +47,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".envrc"
-- ".rdoc_options"
-- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -114,9 +54,10 @@ files:
 - Rakefile
 - exe/elisp2any
 - fixtures/init.el
+- lib/elisp.rb
+- lib/elisp/comment.rb
+- lib/elisp/parser.rb
 - lib/elisp2any.rb
-- lib/elisp2any/asciidoc_renderer.rb
-- lib/elisp2any/asciidoc_renderer/index.adoc.erb
 - lib/elisp2any/aside.rb
 - lib/elisp2any/blanklines.rb
 - lib/elisp2any/code.rb
@@ -124,7 +65,6 @@ files:
 - lib/elisp2any/comment.rb
 - lib/elisp2any/commentary.rb
 - lib/elisp2any/expression.rb
-- lib/elisp2any/file.rb
 - lib/elisp2any/footer_line.rb
 - lib/elisp2any/header_line.rb
 - lib/elisp2any/heading.rb
@@ -133,18 +73,13 @@ files:
 - lib/elisp2any/html_renderer/index.html.erb
 - lib/elisp2any/inline_code.rb
 - lib/elisp2any/line.rb
-- lib/elisp2any/node.rb
 - lib/elisp2any/paragraph.rb
 - lib/elisp2any/section.rb
 - lib/elisp2any/text.rb
-- lib/elisp2any/tree_sitter_parser.rb
 - lib/elisp2any/version.rb
-- manifest.scm
-- sig/elisp2any.gen.rbs
-- sig/elisp2any.rbs
 homepage: https://codeberg.org/gemmaro/elisp2any
 licenses:
-- Apache-2.0
+- GPL-3.0-or-later
 metadata:
   rubygems_mfa_required: 'true'
   bug_tracker_uri: https://codeberg.org/gemmaro/elisp2any/issues
@@ -168,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Converter from Emacs Lisp to some document markup

data/.document

@@ -1,4 +0,0 @@
-README.md
-lib/**/*.rb
-CHANGELOG.md
-LICENSE.txt

data/.envrc

@@ -1,3 +0,0 @@
-watch_file manifest.scm
-export ELISP2ANY_GUIX_USE_PROFILE_PATH=yes
-use guix