From eb4b1016fae73a6712477a656f3897c91b303100 Mon Sep 17 00:00:00 2001
From: ville rantanen <ville.rantanen@iki.fi>
Date: Thu, 17 Aug 2017 18:41:38 +0300
Subject: [PATCH] coloring demo for qolop

---
 reporting/ansi.py |  2 +-
 reporting/qolop   | 94 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 74 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 reporting/qolop

diff --git a/reporting/ansi.py b/reporting/ansi.py
index 2bba08d..7f2cf9c 100644
--- a/reporting/ansi.py
+++ b/reporting/ansi.py
@@ -137,7 +137,7 @@ ${S}=====================${Z}
    s .save()  Save location   u .restore()   Restore location
    A .up()    Up              E .up_line()   Up line            
    B .down()  Down            F .down_line() Down line 
-   C .left()  Left         x;yH .pos()       Absolute Position  
+   C .left()  Left         y;xH .pos()       Absolute Position  
    D .right() Right """
 
     print(c.color_string(unformatted))
diff --git a/reporting/qolop b/reporting/qolop
old mode 100644
new mode 100755
index 8ab47e9..ec29520
--- a/reporting/qolop
+++ b/reporting/qolop
@@ -1,21 +1,26 @@
-# Quick shell COLOrizer Package
-# Source in BASH
+#!/bin/bash
 
-# Version 2017.08.08.1
-# Examples:
-# As functions:
-# _title(){ _qCol z G; }
-# _z(){ _qCol z; }
-# _title; echo Title; _z
+_qColHelp() {
+  echo 'Quick shell COLOrizer Package
+Source me in BASH!
 
-# As variables
-# TITLE=$( _qCol z G; )
-# Z=$( _qCol z; )
-# echo ${TITLE}Title${Z}
+Version 2017.08.17.0
+Examples:
+- As functions:
+  _title(){ _qCol z G; }
+  _z(){ _qCol z; }
+  _title; echo Title; _z
 
-# Export to variables (prefixed with _c. Also the default)
-# _qCol export _c
-# echo -e ${_cG}Title${_cZ}
+- As variables
+  TITLE=$( _qCol z G; )
+  Z=$( _qCol z; )
+  echo ${TITLE}Title${Z}
+
+- Export to variables (prefixed with _c. Also the default)
+  _qCol export _c
+  echo -e ${_cG}Title${_cZ}
+'
+}
 
 _qCol() {
   # print "easier" mapping of ANSI colors and controls
@@ -56,12 +61,12 @@ _qCol() {
   local    io='\033[27m' #inverse off
   local    st='\033[9m' #strike on
   local    so='\033[29m' #strike off
-  local    CLRLIN='\033[2J' # Clear line
+  local    CLR='\033[2J' # Clear screen
   local    CLREND='\033[K'  # Clear to end of line
   local    CLRBEG='\033[1K' # Clear to beginning of line
-  local    CLRSCR="$CLRLIN"'\033[0;0H' # Clear screen
+  local    CLRSCR="$CLR"'\033[0;0H' # Clear screen, reset cursor
 
-  local color_keys=" K R G B Y M C W k r g b y m c w S s U u z Z ic io st so bk br bg by bb bm bc bw CLRLIN CLREND CLRBEG CLRSCR "
+  local color_keys=" K R G B Y M C W k r g b y m c w S s U u z Z ic io st so bk br bg by bb bm bc bw CLR CLREND CLRBEG CLRSCR "
 
   [[ "$1" = "export" ]] && {
     local key
@@ -82,7 +87,7 @@ _qCol() {
 }
 
 _qCode() {
-  # Enter numerical ANSI codes directly
+  # Enter numerical ANSI colors directly
   local arg val
   for ((arg=1;arg<=$#;arg++)) {
     val=${!arg}
@@ -102,9 +107,56 @@ _qPos() {
   [[ "$1" = "down" ]]      && { printf '\033['${n}'B'; return; }
   [[ "$1" = "right" ]]     && { printf '\033['${n}'C'; return; }
   [[ "$1" = "left" ]]      && { printf '\033['${n}'D'; return; }
-  [[ "$1" = "linedown" ]]  && { printf '\033['${n}'E'; return; }
-  [[ "$1" = "lineup" ]]    && { printf '\033['${n}'F'; return; }
+  [[ "$1" = "lineup" ]]    && { printf '\033['${n}'E'; return; }
+  [[ "$1" = "linedown" ]]  && { printf '\033['${n}'F'; return; }
   [[ "$1" = "col" ]]       && { printf '\033['${n}'G'; return; }
   [[ "$1" = "abs" ]]       && { printf '\033['${n}';'${x}'H'; return; }
 }
 
+_qClr() {
+  # Clear screen
+  _qCol "CLR"
+  _qPos abs 0 0
+}
+
+[[ "$0" = "${BASH_SOURCE[0]}" ]] && {
+  echo This script should be sourced 
+  _qColHelp
+  
+  _qCol export "_"
+  printf "${_S}ANSI CODES AND QOLOP VARIABLES
+==============================${_Z}
+${_S}Fo${_U}rm${_st}at${_u}ti${_ic}ng${_Z}
+${_S}==========${_Z}
+   0  Z Clear format
+   1  S ${_S}Strong   ${_Z}     2  s ${_s}Off${_Z}  
+   4  U ${_U}Underline${_Z}    24  u Off
+   7 ic ${_ic}Inverse${_Z}      27 io Off
+   9 st ${_st}Strike${_Z}       29 so Off
+${_R}Co${_G}lo${_B}rs${_Z}
+${_S}======${_Z}
+  30 k ${_k}Black   ${_Z}1 K ${_K}Strong   ${_Z}40 bk ${_bk}Background${_Z}
+  31 r ${_r}Red     ${_Z}1 R ${_R}Strong   ${_Z}41 br ${_br}Background${_Z}
+  32 g ${_g}Green   ${_Z}1 G ${_G}Strong   ${_Z}42 bg ${_bg}Background${_Z}
+  33 y ${_y}Yellow  ${_Z}1 Y ${_Y}Strong   ${_Z}43 by ${_by}Background${_Z}
+  34 b ${_b}Blue    ${_Z}1 B ${_B}Strong   ${_Z}44 bb ${_bb}Background${_Z}
+  35 m ${_m}Magenta ${_Z}1 M ${_M}Strong   ${_Z}45 bm ${_bm}Background${_Z}
+  36 c ${_c}Cyan    ${_Z}1 C ${_C}Strong   ${_Z}46 bc ${_bc}Background${_Z}
+  37 w ${_w}White   ${_Z}1 W ${_W}Strong   ${_Z}47 bw ${_bw}Background${_Z}
+  Enter raw color codes with _qCode function
+${_S}Clearing and movement
+${_S}=====================${_Z}
+   2J     CLR     Clear screen 
+   2J ;H  CLRSCR _qClr()  Clear screen and cursor to upper left
+   K      CLREND  Clear to end of line
+   1K     CLRBEG  Clear to beginning of line
+    
+   s _qPos save  Save location   u _qPos restore   Restore location
+   A _qPos up    Up              E _qPos lineup    Up line            
+   B _qPos down  Down            F _qPos linedown  Down line 
+   C _qPos left  Left         y;xH _qPos abs y x   Absolute Position  
+   D _qPos right Right 
+"
+
+}
+