diff --git a/PKG-INFO b/PKG-INFO index 11cc33c..7b5eff6 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: ansi -Version: 0.1.3 +Version: 0.1.5 Summary: ANSI cursor movement and graphics Home-page: https://github.com/tehmaze/ansi/ Author: Wijnand Modderman-Lenstra diff --git a/ansi/colour/bg.py b/ansi/colour/bg.py index d1af2b3..d886f3e 100644 --- a/ansi/colour/bg.py +++ b/ansi/colour/bg.py @@ -24,19 +24,22 @@ boldcyan = bold + cyan boldwhite = bold + white +# High intensity variants +brightblack = Graphic('100') +brightred = Graphic('101') +brightgreen = Graphic('102') +brightyellow = Graphic('103') +brightblue = Graphic('104') +brightmagenta = Graphic('105') +brightcyan = Graphic('106') +brightwhite = Graphic('107') + # Convenience wrappers brown = yellow # Not in ANSI/ECMA-048 standard grey = white # Not in ANSI/ECMA-048 standard gray = white # US English darkgrey = boldblack darkgray = boldblack # US English -brightred = boldred -brightgreen = boldgreen -brightyellow = boldyellow brightbrown = boldyellow # Not in ANSI/ECMA-048 standard -brightblue = boldblue -brightmagenta = boldmagenta -brightcyan = boldcyan -brightwhite = boldwhite brightgrey = boldwhite # Not in ANSI/ECMA-048 standard brightgray = boldwhite # Us English diff --git a/ansi/colour/fg.py b/ansi/colour/fg.py index b32c5d5..e45bd93 100644 --- a/ansi/colour/fg.py +++ b/ansi/colour/fg.py @@ -25,19 +25,22 @@ boldcyan = bold + cyan boldwhite = bold + white +# High intensity variants +brightblack = Graphic('90') +brightred = Graphic('91') +brightgreen = Graphic('92') +brightyellow = Graphic('93') +brightblue = Graphic('94') +brightmagenta = Graphic('95') +brightcyan = Graphic('96') +brightwhite = Graphic('97') + # Convenience wrappers brown = yellow # Not in ANSI/ECMA-048 standard grey = white # Not in ANSI/ECMA-048 standard gray = white # US English darkgrey = boldblack darkgray = boldblack # US English -brightred = boldred -brightgreen = boldgreen -brightyellow = boldyellow brightbrown = boldyellow # Not in ANSI/ECMA-048 standard -brightblue = boldblue -brightmagenta = boldmagenta -brightcyan = boldcyan -brightwhite = boldwhite brightgrey = boldwhite # Not in ANSI/ECMA-048 standard brightgray = boldwhite # Us English diff --git a/ansi/cursor.py b/ansi/cursor.py index 4eaa11b..cd48238 100644 --- a/ansi/cursor.py +++ b/ansi/cursor.py @@ -10,8 +10,8 @@ back = sequence('D') next_line = sequence('E') prev_line = sequence('F') -goto_x = sequence('H') -goto = sequence('G', 2) +goto_x = sequence('G') +goto = sequence('H', 2) erase = sequence('J') erase_data = erase erase_line = sequence('K') diff --git a/setup.py b/setup.py index 6cea442..f2ff424 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='ansi', - version='0.1.3', + version='0.1.5', description='ANSI cursor movement and graphics', author='Wijnand Modderman-Lenstra', author_email='maze@pyth0n.org',