From 8b5bc9cf8a595b4232afb96dc845ea9dbc0d7951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Elsd=C3=B6rfer?= <michael@elsdoerfer.com>
Date: Thu, 25 Aug 2016 17:30:20 +0200
Subject: [PATCH] Make the Escpos class accept a profile.

This is now used for the block_text function.
---
 src/escpos/escpos.py       | 11 ++++++-----
 test/test_function_text.py |  9 +++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/escpos/escpos.py b/src/escpos/escpos.py
index c0df537..683688c 100644
--- a/src/escpos/escpos.py
+++ b/src/escpos/escpos.py
@@ -23,6 +23,7 @@ from .exceptions import *
 
 from abc import ABCMeta, abstractmethod  # abstract base class support
 from escpos.image import EscposImage
+from escpos.capabilities import get_profile
 
 
 @six.add_metaclass(ABCMeta)
@@ -35,11 +36,11 @@ class Escpos(object):
     device = None
     codepage = None
 
-    def __init__(self, columns=32):
+    def __init__(self, profile=None):
         """ Initialize ESCPOS Printer
 
-        :param columns: Text columns used by the printer. Defaults to 32."""
-        self.columns = columns
+        :param profile: Printer profile"""
+        self.profile = get_profile(profile)
 
     def __del__(self):
         """ call self.close upon deletion """
@@ -439,7 +440,7 @@ class Escpos(object):
             # TODO: why is it problematic to print an empty string?
             raise TextError()
 
-    def block_text(self, txt, columns=None):
+    def block_text(self, txt, font=None, columns=None):
         """ Text is printed wrapped to specified columns
 
         Text has to be encoded in unicode.
@@ -448,7 +449,7 @@ class Escpos(object):
         :param columns: amount of columns
         :return: None
         """
-        col_count = self.columns if columns is None else columns
+        col_count = self.profile.get_columns(font) if columns is None else columns
         self.text(textwrap.fill(txt, col_count))
 
     def set(self, align='left', font='a', text_type='normal', width=1, height=1, density=9, invert=False, smooth=False,
diff --git a/test/test_function_text.py b/test/test_function_text.py
index b0b1ca1..973ddfc 100644
--- a/test/test_function_text.py
+++ b/test/test_function_text.py
@@ -15,6 +15,7 @@ from __future__ import unicode_literals
 from nose.tools import with_setup
 
 import escpos.printer as printer
+from escpos.printer import Dummy
 import os
 
 import filecmp
@@ -43,3 +44,11 @@ def test_function_text_dies_ist_ein_test_lf():
     instance.text('Dies ist ein Test.\n')
     instance.flush()
     assert(filecmp.cmp('test/Dies ist ein Test.LF.txt', devfile))
+
+
+def test_block_text():
+    printer = Dummy()
+    printer.block_text(
+        "All the presidents men were eating falafel for breakfast.", font='a')
+    assert printer.output == \
+        'All the presidents men were eating falafel\nfor breakfast.'