markita 3.3.210918 → 3.4.210922

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f2378d6afe1f1ed2251e78d0e413305cc3a2616da3dfeccfe3446faac0712c
-  data.tar.gz: 8d099fe74a6bd50829c1a09f9bbc492893113c868dc4731cd41bd4380d19cbe5
+  metadata.gz: df6d287bdc5a83164680b7218d6a1b097dddc703ba731f5ae3568e51756385c7
+  data.tar.gz: eca3f9de5cd993be7c206c8bdd8cbcf89d99bb0799960aed60a3140d3f3ba9e6
 SHA512:
-  metadata.gz: 0d13c5e56db469e15a3d5b11048cb1f70b3ffae0f02dec77b02edef36b47d8393218f66755fa5619c2755861e163b1c4d3d05edba9f55f06d44f1c61366ee239
-  data.tar.gz: 958c7442e49d7efd39bc9c99d843c788c0f5e1e29ca87e5965816f04fff8a61494ccc1acaa2b855e9ce543edc6b9a4b1e505043159d494a8f9820bd0d4461b02
+  metadata.gz: 87f88ceb92a5bd24eddcaf3cbefa4dce1a4098befe0534eef5f68a90931441dd7324bfd5d1cb135351c28451d2a3891c259cbf8e7e2433cdbff54e76a4fbcf15
+  data.tar.gz: c691c08fde7db7ff8ee8f3b72a17b7f8cd32df9bf6b4b970699102b6c9dc3aedae4ce19c183ae912527b9c55432a75f47b337c85c8802130116fca708aa27e32

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.3.210918](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 3.4.210922](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -269,8 +269,9 @@ Markdown:
 
     !> /path-to/ascii_art.txt
 
-Must be a `*.txt` file.
 Useful for ASCII art.
+Unless an `*.html` file, the text is embedded in `pre` tags.
+Further more unless a `*.txt` file, the text is embedded in `code` tags.
 
 ### Emojis
 
@@ -294,6 +295,16 @@ Markdown:
     [^2]: Cash is money in currency.
     [^3]: Read as "Nan took it."
 
+### Meta-data
+
+Markdown:
+
+    ---
+    Title: The Title You Want For Your Page
+    1: https://way.to/create/ref/links
+    ---
+    You can now [link](1) with a reference number.
+
 ## HOW-TOs
 
 ### Set site password:

data/lib/markita/markdown.rb

@@ -6,6 +6,7 @@ class Markdown
   def initialize(title)
     @title = title
     @line=@html=@file=@opt=nil
+    @metadata = {}
   end
 
   def start
@@ -14,6 +15,9 @@ class Markdown
   end
 
   def finish
+    if title = @metadata['Title']
+      @html << %Q(<script> document.title = "#{title}" </script>\n)
+    end
     @html << HTML.footer
     @line = nil
   end
@@ -62,7 +66,10 @@ class Markdown
   CODE  = lambda {|m| "<code>#{m[1]}</code>"}
 
   Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
-  A  = lambda {|m| %Q(<a href="#{m[2]}">#{m[1]}</a>)}
+  def anchor(m)
+    href = ((_=m[2]).match?(/^\d+$/) and @metadata[_] or _)
+    %Q(<a href="#{href}">#{m[1]}</a>)
+  end
 
   URLx = %r(\[(https?://[\w\.\-\/\&\+\?\%]+)\])
   URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
@@ -95,9 +102,9 @@ class Markdown
     return (block ? block.call(entry) : entry)
   end
 
-  INLINE = lambda do |entry|
+  def inline(entry)
     string = Markdown.tag(entry, CODEx, CODE) do |entry|
-      Markdown.tag(entry, Ax, A) do |entry|
+      Markdown.tag(entry, Ax, method(:anchor)) do |entry|
         Markdown.tag(entry, URLx, URL) do |entry|
           entry = Markdown.tag(entry, EMOJIx, EMOJI)
           entry = Markdown.tag(entry, Bx, B)
@@ -128,7 +135,7 @@ class Markdown
     @html << "<ol#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     while md and level==md[1].length
-      @html << "  <li>#{INLINE[md[2]]}</li>\n"
+      @html << "  <li>#{inline(md[2])}</li>\n"
       if md = (@line=@file.gets)&.match(ORDERED)
         if level < md[1].length
           ordered(md, md[1].length)
@@ -148,7 +155,7 @@ class Markdown
     @html << "<p#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     while md
-      @html << INLINE[@line]
+      @html << inline(@line)
       md = (@line=@file.gets)&.match PARAGRAPHS
     end
     @html << "</p>\n"
@@ -163,7 +170,7 @@ class Markdown
     @html << "<ul#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     while md and level==md[1].length
-      @html << "  <li>#{INLINE[md[2]]}</li>\n"
+      @html << "  <li>#{inline(md[2])}</li>\n"
       if md = (@line=@file.gets)&.match(UNORDERED)
         if level < md[1].length
           unordered(md, md[1].length)
@@ -187,7 +194,7 @@ class Markdown
       li = (x=='x')?
         %q{<li style="list-style-type: '&#9745; '">} :
         %q{<li style="list-style-type: '&#9744; '">}
-      @html << "  #{li}#{INLINE[t]}</li>\n"
+      @html << "  #{li}#{inline(t)}</li>\n"
       md = (@line=@file.gets)&.match BALLOTS
     end
     @html << "</ul>\n"
@@ -203,8 +210,8 @@ class Markdown
     @opt.delete(:attributes)
     while md
       item = md[1]
-      @html << ((item[-1]==':')? "<dt>#{INLINE[item[0..-2]]}</dt>\n" :
-              "<dd>#{INLINE[item]}</dd>\n")
+      @html << ((item[-1]==':')? "<dt>#{inline(item[0..-2])}</dt>\n" :
+              "<dd>#{inline(item)}</dd>\n")
       md = (@line=@file.gets)&.match DEFINITIONS
     end
     @html << "</dl>\n"
@@ -217,9 +224,9 @@ class Markdown
   def headers
     md = HEADERS.match(@line) or return false
     i,header = md[1].length,md[2]
-    id = header.strip.gsub(/\s+/,'+')
+    id = header.gsub(/\([^\(\)]*\)/,'').scan(/\w+/).join('+')
     @html << %Q(<a id="#{id}">\n)
-    @html << "  <h#{i}#{@opt[:attributes]}>#{INLINE[header]}</h#{i}>\n"
+    @html << "  <h#{i}#{@opt[:attributes]}>#{inline(header)}</h#{i}>\n"
     @html << "</a>\n"
     @opt.delete(:attributes)
     @line = @file.gets
@@ -234,7 +241,7 @@ class Markdown
     @html << "<blockquote#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     while md
-      @html << INLINE[md[1]]
+      @html << inline(md[1])
       @html << "\n"
       md = (@line=@file.gets)&.match BLOCKQS
     end
@@ -278,14 +285,31 @@ class Markdown
     true
   end
 
-  # Horizontal rule
+  # Meta-data
+  METADATAS = /^(\w+): (.*)$/
+  def metadata
+    md = METADATAS.match(@line) or return false
+    while md
+      @metadata[md[1]] = md[2]
+      md = (@line=@file.gets)&.match METADATAS
+    end
+    true
+  end
+
+  # Horizontal rule or Meta-data
   HRS = /^---+$/
   PARSERS << :hrs
   def hrs
     HRS.match? @line or return false
-    @html << "<hr#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
     @line = @file.gets
+    if metadata
+      # Optional closing HRS
+      @line = @file.gets if @line&.match? HRS
+    else
+      # Display HR
+      @html << "<hr#{@opt[:attributes]}>\n"
+      @opt.delete(:attributes)
+    end
     true
   end
 
@@ -297,7 +321,7 @@ class Markdown
     @html << "<table#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     @html << '<thead><tr><th>'
-    @html << @line[1...-1].split('|').map{INLINE[_1.strip]}.join('</th><th>')
+    @html << @line[1...-1].split('|').map{inline(_1.strip)}.join('</th><th>')
     @html << "</th></tr></thead>\n"
     align = []
     while (@line=@file.gets)&.match TABLES
@@ -314,7 +338,7 @@ class Markdown
           align[i] = ' align="left"'
           @html << '<td><hr></td>'
         else
-          @html << "<td#{align[i]}>#{INLINE[cell.strip]}</td>"
+          @html << "<td#{align[i]}>#{inline(cell.strip)}</td>"
         end
       end
       @html << "</tr>\n"
@@ -426,14 +450,27 @@ form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
   end
 
   # Embed text
-  EMBED_TEXTS = /^!> (#{PAGE_KEY}\.txt)$/
+  EMBED_TEXTS = /^!> (#{PAGE_KEY}\.\w+)$/
   PARSERS << :embed_texts
   def embed_texts
     md = EMBED_TEXTS.match(@line) or return false
     if File.exist?(filename=File.join(ROOT, md[1]))
-      @html << "<pre>\n"
-      @html << File.read(filename)
-      @html << "</pre>\n"
+      extension,lang = filename.split('.').last,nil
+      unless extension=='html'
+        lang = Rouge::Lexer.find extension
+        klass = lang ? ' class="highlight"' : nil
+        @html << "<pre#{klass}#{@opt[:attributes]}>"
+        @opt.delete(:attributes)
+        @html << '<code>' unless extension=='txt'
+        @html << "\n"
+      end
+      code = File.read(filename)
+      @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
+      unless extension=='html'
+        @html << '</code>' unless extension=='txt'
+        @html << '</pre>'
+        @html << "\n"
+      end
     else
       @html << @line
     end
@@ -448,7 +485,7 @@ form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
     md = FOOTNOTES.match(@line) or return false
     @html << "<small>\n"
     while md
-      @html << INLINE[@line.chomp]+"<br>\n"
+      @html << inline(@line.chomp)+"<br>\n"
       md = (@line=@file.gets)&.match FOOTNOTES
     end
     @html << "</small>\n"

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '3.3.210918'
+  VERSION = '3.4.210922'
 
   def self.run!
     # Standard libraries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.3.210918
+  version: 3.4.210922
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser