diff --git a/reporting/markslider.packager.sh b/reporting/markslider.packager.sh index 580bd76..e7413c6 100644 --- a/reporting/markslider.packager.sh +++ b/reporting/markslider.packager.sh @@ -4,20 +4,9 @@ set -e set -x rm -rf markslider -mkdir -p markslider/scripts markslider/markslider +mkdir -p markslider/markslider cp -v ansicodes.py md_color.py markslider.py markslider/markslider/ -echo '#!/usr/bin/env python -# -*- coding: utf-8 -*- -import re -import sys - -from markslider import main - -if __name__ == "__main__": - sys.exit(main()) -' > markslider/scripts/markslider - echo 'from markslider import *' > markslider/markslider/__init__.py echo 'Markdown slideshow. Display your markdown file directly in the terminal!' > markslider/README.md @@ -28,7 +17,7 @@ echo "from distutils.core import setup setup( name = 'markslider', packages = ['markslider'], - scripts = ['scripts/markslider'], + entry_points = {'console_scripts': 'markslider = markslider.markslider:main'}, version = '$( ./markslider.py -v 2>&1 )', description = 'Markdown viewer as slides', author = 'Ville Rantanen', diff --git a/reporting/markslider.py b/reporting/markslider.py index d5ee079..c1d4964 100755 --- a/reporting/markslider.py +++ b/reporting/markslider.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # coding=utf-8 # # Copyright 2016 Ville Rantanen @@ -20,7 +20,7 @@ '''Markslider: a slideshow engine based on markdown.''' __author__ = "Ville Rantanen " -__version__ = "1.2" +__version__ = "1.2.1" import sys,os,argparse,re,datetime from argparse import ArgumentParser @@ -81,6 +81,7 @@ class slide_reader: first_slide_found = False f=open(fname,'r') new_page=[] + in_code = False for row in f: if not row: continue @@ -89,11 +90,13 @@ class slide_reader: if row == EOS: break # find header to start a new page - if row.startswith("#") and not row.startswith("##"): + if row.startswith("#") and not row.startswith("##") and not in_code: first_slide_found=True if len(new_page)>0: self.data.append(new_page) new_page=[] + if row.startswith("```"): + in_code = not in_code # if first slide havent been found yet: if not first_slide_found: self.background.append(row) diff --git a/reporting/markslider.tar.gz b/reporting/markslider.tar.gz index cdc4e5d..667a554 100644 Binary files a/reporting/markslider.tar.gz and b/reporting/markslider.tar.gz differ