From b0097da16fbbba672ea6d6ff2445f17d7b897fa2 Mon Sep 17 00:00:00 2001
From: Manuel F Martinez <manpaz@gmail.com>
Date: Thu, 30 May 2013 08:47:30 -0700
Subject: [PATCH] Fixed font set

---
 escpos/escpos.py | 63 ++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/escpos/escpos.py b/escpos/escpos.py
index 4c6ac35..7881372 100644
--- a/escpos/escpos.py
+++ b/escpos/escpos.py
@@ -181,37 +181,6 @@ class Escpos:
 
     def set(self, align='left', font='a', type='normal', width=1, height=1):
         """ Set text properties """
-        # Align
-        if align.upper() == "CENTER":
-            self._raw(TXT_ALIGN_CT)
-        elif align.upper() == "RIGHT":
-            self._raw(TXT_ALIGN_RT)
-        elif align.upper() == "LEFT":
-            self._raw(TXT_ALIGN_LT)
-        # Font
-        if font.upper() == "B":
-            self._raw(TXT_FONT_B)
-        else:  # DEFAULT FONT: A
-            self._raw(TXT_FONT_A)
-        # Type
-        if type.upper() == "B":
-            self._raw(TXT_BOLD_ON)
-            self._raw(TXT_UNDERL_OFF)
-        elif type.upper() == "U":
-            self._raw(TXT_BOLD_OFF)
-            self._raw(TXT_UNDERL_ON)
-        elif type.upper() == "U2":
-            self._raw(TXT_BOLD_OFF)
-            self._raw(TXT_UNDERL2_ON)
-        elif type.upper() == "BU":
-            self._raw(TXT_BOLD_ON)
-            self._raw(TXT_UNDERL_ON)
-        elif type.upper() == "BU2":
-            self._raw(TXT_BOLD_ON)
-            self._raw(TXT_UNDERL2_ON)
-        elif type.upper == "NORMAL":
-            self._raw(TXT_BOLD_OFF)
-            self._raw(TXT_UNDERL_OFF)
         # Width
         if width == 2 and height != 2:
             self._raw(TXT_NORMAL)
@@ -224,6 +193,38 @@ class Escpos:
             self._raw(TXT_2HEIGHT)
         else: # DEFAULT SIZE: NORMAL
             self._raw(TXT_NORMAL)
+        # Type
+        if type.upper() == "B":
+            self._raw(TXT_BOLD_ON)
+            self._raw(TXT_UNDERL_OFF)
+        elif type.upper() == "U":
+            self._raw(TXT_BOLD_OFF)
+            self._raw(TXT_UNDERL_ON)
+        elif type.upper() == "U2":
+            self._raw(TXT_BOLD_OFF)
+            self._raw(TXT_UNDERL2_ON)
+            self._raw(TXT_ITALIC_OFF)
+        elif type.upper() == "BU":
+            self._raw(TXT_BOLD_ON)
+            self._raw(TXT_UNDERL_ON)
+        elif type.upper() == "BU2":
+            self._raw(TXT_BOLD_ON)
+            self._raw(TXT_UNDERL2_ON)
+        elif type.upper == "NORMAL":
+            self._raw(TXT_BOLD_OFF)
+            self._raw(TXT_UNDERL_OFF)
+        # Font
+        if font.upper() == "B":
+            self._raw(TXT_FONT_B)
+        else:  # DEFAULT FONT: A
+            self._raw(TXT_FONT_A)
+        # Align
+        if align.upper() == "CENTER":
+            self._raw(TXT_ALIGN_CT)
+        elif align.upper() == "RIGHT":
+            self._raw(TXT_ALIGN_RT)
+        elif align.upper() == "LEFT":
+            self._raw(TXT_ALIGN_LT)
 
 
     def cut(self, mode=''):