diff -urN v45/get_title.py v46/get_title.py --- v45/get_title.py 1970-01-01 09:00:00.000000000 +0900 +++ v46/get_title.py 2020-04-05 03:38:45.000000000 +0900 @@ -0,0 +1,26 @@ +#!/usr/bin/env python + +import nkf + +def get(s, dv='titile'): + lst = s.split( '\n' ) + while lst.pop( 0 ) != 'h1': + pass + while lst: + s = lst.pop( 0 ).strip() + if s: + return s + return dv + +if __name__ == "__main__": + b = nkf.get_stdin() + opt = nkf.guess(b) + u8 = nkf.cvt(b, '-u') + s = nkf.dec(u8) + + s = get( s ) + + u8 = nkf.enc(s) + b = nkf.cvt(u8, opt) + nkf.put_stdout(b) +# EOF diff -urN v45/to_html.py v46/to_html.py --- v45/to_html.py 2020-01-30 22:19:06.000000000 +0900 +++ v46/to_html.py 2020-04-05 03:58:15.000000000 +0900 @@ -6,21 +6,28 @@ cmd_py = cmd_ut.cmd_py +add_opt = lambda opt, v: ( opt + ' ' if v else '' ) + v + if __name__ == "__main__": a = arg.new() title = a.pop_str('-t') - if title: - title = '-t ' + title + title = add_opt( '-t', title ) head = a.pop_str('-h') - if head: - head = '-h ' + head + head = add_opt( '-h', head ) out = a.pop_str('-o', 'index.html') body = a.pop('index.txt') + if not title: + cmd = '{} < {}'.format( cmd_py( 'get_title' ), body ) + title = cmd_ut.call( cmd, b2s=True ) + if title: + title = "'{}'".format( title ) + title = add_opt( '-t', title ) + fmt = '{} < {} | {} {} {} | {} y > {}' cmd = fmt.format( cmd_py('ezmd'), body, cmd_py('join_yaml'), title, head, cmd_py('ezhtml'), out ) cmd_ut.call(cmd)