From fa8d961e6d5ae14e424a4d15cc5a7a940673ed53 Mon Sep 17 00:00:00 2001 From: Davis Goglin Date: Fri, 14 Mar 2014 09:17:32 -0700 Subject: [PATCH] google code revision ef4c58851474 (Added quad-area characters) --- escpos/constants.py | 1 + escpos/escpos.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/escpos/constants.py b/escpos/constants.py index c39f6ce..b5fca55 100644 --- a/escpos/constants.py +++ b/escpos/constants.py @@ -20,6 +20,7 @@ PAPER_PART_CUT = '\x1d\x56\x01' # Partial cut paper TXT_NORMAL = '\x1b\x21\x00' # Normal text TXT_2HEIGHT = '\x1b\x21\x10' # Double height text TXT_2WIDTH = '\x1b\x21\x20' # Double width text +TXT_4SQUARE = '\x1b\x21\x30' # Quad area text TXT_UNDERL_OFF = '\x1b\x2d\x00' # Underline font OFF TXT_UNDERL_ON = '\x1b\x2d\x01' # Underline font 1-dot ON TXT_UNDERL2_ON = '\x1b\x2d\x02' # Underline font 2-dot ON diff --git a/escpos/escpos.py b/escpos/escpos.py index c5457b9..c79bea4 100644 --- a/escpos/escpos.py +++ b/escpos/escpos.py @@ -214,17 +214,17 @@ class Escpos: def set(self, align='left', font='a', type='normal', width=1, height=1): """ Set text properties """ # Width - if width == 2 and height != 2: - self._raw(TXT_NORMAL) - self._raw(TXT_2WIDTH) - elif height == 2 and width != 2: + if height != 2 and width != 2: # DEFAULT SIZE: NORMAL self._raw(TXT_NORMAL) + + if height == 2: self._raw(TXT_2HEIGHT) - elif height == 2 and width == 2: + if width == 2: self._raw(TXT_2WIDTH) - self._raw(TXT_2HEIGHT) - else: # DEFAULT SIZE: NORMAL - self._raw(TXT_NORMAL) + + if height == 2 and width == 2: + self._raw(TXT_4SQUARE) + # Type if type.upper() == "B": self._raw(TXT_BOLD_ON)