diff -ur v42/ezmd.py v43/ezmd.py --- v42/ezmd.py Tue Oct 29 19:54:29 2019 +++ v43/ezmd.py Fri Jan 24 12:06:55 2020 @@ -1,6 +1,7 @@ #!/usr/bin/env python import sys +import os import subprocess import yaml import six @@ -213,6 +214,10 @@ def text_get(s): ps = ('http', 'https') cmd = 'wget -q -O-' if any( map( lambda p: s.startswith(p + '://'), ps ) ) else 'cat' + + if cmd == 'cat' and not os.path.exists(s): # todo + s = '../' + s + b = subprocess.check_output( cmd + ' ' + s, shell=True ) (s, nkf_opt) = nkf.to_str(b) return s diff -ur v42/to_html.py v43/to_html.py --- v42/to_html.py Fri Sep 27 22:15:57 2019 +++ v43/to_html.py Fri Jan 24 11:42:20 2020 @@ -14,7 +14,7 @@ cmd_title = "sed 's/^- title: .*/- title: {}/'".format(title) if title else 'cat' cmd_hd = 'cat {} | {} | ./ezhtml.py y'.format( sys.argv[1], cmd_title ) - cmd = "( echo '' ; {} ; echo '' ; ./ezmd.py < {} | ./ezhtml.py y ; echo '' ) | nkf -j"; + cmd = "( echo '' ; {} ; echo '' ; ./ezmd.py < {} | ./ezhtml.py y ; echo '' ) | nkf -j"; cmd = cmd.format( cmd_hd, sys.argv[2] ) #print(cmd) subprocess.call(cmd, shell=True)