Merge branch 'master' of ssh://vvvvvvaria.org:12345/mb/asciiWriter

asciiWriter/examples/single_column_page.py

@@ -2,7 +2,6 @@
 
 from asciiWriter.text import make_column, make_multi_column
 from asciiWriter.utils import merge, print_lines, make_lines, translate
-# from hyphen import Hyphenator
 import math
 
 from os.path import join, dirname
@@ -15,7 +14,6 @@ height = 500
 text = open(join(dirname(__file__), 'data', 'language.txt')).read()
 
 # Import a hyphenator
-#h_en = Hyphenator('en_US')
 
 # Make an empty layers list
 layers = []
@@ -34,8 +32,12 @@ def cos_width (line_nr, _):
   return math.floor(half_amplitude + math.cos(line_nr / period) * half_amplitude)
 
 # Transform the text into a column
-# lines, remaining = make_column(text, height=height, use_hyphenator=h_en, line_width=sin_width, line_offset=cos_width)
+try:
-lines, remaining = make_column(text, height=height, line_width=sin_width, line_offset=cos_width)
+  from hyphen import Hyphenator
+  h_en = Hyphenator('en_US')
+  lines, remaining = make_column(text, height=height, use_hyphenator=h_en, line_width=sin_width, line_offset=cos_width)
+except ImportError:
+  lines, remaining = make_column(text, height=height, line_width=sin_width, line_offset=cos_width)
 
 # Transform the text into multiple columns
 # lines, remaining = make_multi_column(text, height=height-3, use_hyphenator=h_en)