markita 3.0.210912 → 3.1.210913

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39bace23d9d3e2c779379b38fe440abe26213ad3c0b6933fd9d7f6d2679b4af
-  data.tar.gz: aeafe146d44a85bcc4aafb16130f964701134c7b7c7bb8dec2bd82fe00e30186
+  metadata.gz: d48cd0cacac70dc9974733968e16d5958676172aae7ac7138995855ef82839b7
+  data.tar.gz: 1355e68fa3255f16331a4afc36f2d47ecfbd1583fbf2f16a9742c53e50390414
 SHA512:
-  metadata.gz: 17775d54b7269655d00792aaed965f332b9c29ff063f9a333794ef32f1d07bc7f05d3c663ec616ddd462059ed6e03e9282669e9db7eabb37d0bfc8cb7f11d17f
-  data.tar.gz: 58285bfad94c859d7c5ab0780647b725eb78b317c34fbcda306c11d117aa31cc699a297f27c0e34a6b86dd0577b9cafd4f6c5049f5d4dabda80f418a91352e83
+  metadata.gz: 54630f6cef7d9632699c16b8e9e447799c85806adc75202cc774272066de82927260ba5fbb4da5f974860dc48d5a26ef9e96d463c4825676a801207c28f850bd
+  data.tar.gz: 34a7e703827b69fb3e0c4e406d477c3ab35d605fc9f1d87c9cae1a2724b8e01099de74b7c6b1ee5f6c220f35bc277e717637925464dfab5938303fcfb37f601b

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.0.210912](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 3.1.210913](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -27,6 +27,7 @@ Options:
   --no_about
   --no_favicon
   --no_highlight
+  --no_navigation
   --no_login
   --no_plugs
 Types:
@@ -62,11 +63,23 @@ Markdown:
     ![Left Floating ](/img/image.png)
     ![ Right Floating](/img/image.png)
     Image  centered above.
-    Image to the left.
+    Image to the left with width and height set.
     Image to the right.
     And set a HR bar below.
     ---
 
+### Image size
+
+Markdown:
+
+    ![In alt text say 100x100](/img/image.png)
+
+### Image link
+
+Markdown:
+
+    ![Alt text](/img/image.png /href_to/page)
+
 ### Forms
 
 Markdown:

data/bin/markita

@@ -13,6 +13,7 @@ Options:
   --no_about
   --no_favicon
   --no_highlight
+  --no_navigation
   --no_login
   --no_plugs
 Types:

data/lib/markita/config.rb

@@ -2,6 +2,7 @@ module Markita
   OPTIONS ||= nil
 
   HEADER_LINKS = ''
+  NAVIGATION = ''
 
   ROOT = File.expand_path OPTIONS&.root || '~/vimwiki'
   raise "Missing site root directory: "+ROOT  unless File.directory? ROOT

data/lib/markita/html.rb

@@ -11,6 +11,10 @@ module HTML
     HEADER
   end
 
+  def HTML.navigation
+    NAVIGATION
+  end
+
   def HTML.footer
     <<~FOOTER
       </body>

data/lib/markita/markdown.rb

@@ -9,11 +9,13 @@ class Markdown
   end
 
   def start
-    @line,@html,@opt = HTML.header(@title),'',{}
+    @html << HTML.header(@title)
+    @line = HTML.navigation
   end
 
   def finish
     @html << HTML.footer
+    @line = nil
   end
 
   def default
@@ -21,8 +23,12 @@ class Markdown
     @line = @file.gets
   end
 
+  def init(fh)
+    @file,@html,@opt = Preprocess.new(fh),'',{}
+  end
+
   def parse(fh)
-    @file = Preprocess.new(fh)
+    init(fh)
     start
     while @line
       PARSERS.detect{method(_1).call} or default
@@ -332,7 +338,7 @@ class Markdown
   PARSERS << :images
   def images
     md = IMAGES.match(@line) or return false
-    alt,src=md[1],md[2]
+    alt,src,href=md[1],*md[2].strip.split(/\s+/,2)
     style = ' '
     case alt
     when /^ .* $/
@@ -342,7 +348,12 @@ class Markdown
     when /^ /
       style = %Q( style="float:right;" )
     end
+    if /(\d+)x(\d+)/.match alt
+      style << %Q(width="#{$1}" height="#{$2}" )
+    end
+    @html << %Q(<a href="#{href}">\n) if href
     @html << %Q(<img src="#{src}"#{style}alt="#{alt.strip}"#{@opt[:attributes]}>\n)
+    @html << %Q(</a>\n) if href
     @opt.delete(:attributes)
     @line = @file.gets
     true

data/lib/markita/plug/favicon.rb

@@ -1,5 +1,5 @@
 module Markita
-class Base < Sinatra::Base
+class Base
   HEADER_LINKS << %Q(  <link rel="icon" type="image/x-icon" href="/favicon.ico">\n)
   module Favicon
     ICO = File.read PATH['favicon.ico']

data/lib/markita/plug/highlight.rb

@@ -1,5 +1,5 @@
 module Markita
-class Base < Sinatra::Base
+class Base
   HEADER_LINKS << %Q(  <link rel="stylesheet" href="/highlight.css" type="text/css">\n)
   module Highlight
     CSS = File.read PATH['highlight.css']

data/lib/markita/plug/navigation.rb

@@ -0,0 +1,3 @@
+module Markita
+  NAVIGATION << %Q(![ Navigation](/favicon.ico /index)\n)
+end

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '3.0.210912'
+  VERSION = '3.1.210913'
 
   def self.run!
     # Standard libraries
@@ -18,6 +18,7 @@ module Markita
     # Plugs
     require_relative 'markita/plug/favicon.rb'    unless OPTIONS&.no_favicon
     require_relative 'markita/plug/highlight.rb'  unless OPTIONS&.no_highlight
+    require_relative 'markita/plug/navigation.rb' unless OPTIONS&.no_navigation
     require_relative 'markita/plug/login.rb'      unless OPTIONS&.no_login
     require_relative 'markita/plug/about.rb'      unless OPTIONS&.no_about
     require_relative 'markita/plug/plugs.rb'      unless OPTIONS&.no_plugs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.0.210912
+  version: 3.1.210913
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -117,6 +117,7 @@ files:
 - lib/markita/plug/favicon.rb
 - lib/markita/plug/highlight.rb
 - lib/markita/plug/login.rb
+- lib/markita/plug/navigation.rb
 - lib/markita/plug/plugs.rb
 - lib/markita/preprocess.rb
 homepage: https://github.com/carlosjhr64/markita