From b53ecc5448d010fd57685218049d73b25ea2995b Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 17 Dec 2020 18:36:51 +0300
Subject: [PATCH] minor revision of text formatting tools...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 object.js    | 43 ++++++++++++++++++++++++++-----------------
 package.json |  2 +-
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/object.js b/object.js
index 5d864cd..eaff445 100755
--- a/object.js
+++ b/object.js
@@ -90,18 +90,26 @@ module.LEADING_TABS = 1
 // 		exception -- normalizeIndent(..)  will break code written 
 // 		in Whitespace.
 //
+// XXX BUG?
+// 			`a					`a						`a
+// 			|    b			->	|b			expected?	|    b
+// 			|        c`			|    c`					|        c`
+// 		while:
+// 			`a					`a
+// 			|    b			->	|    b		as expected.
+// 			|    c`				|    c`
+// 		this leads to functions like the following to get messed up:
+// 			|function(a){
+// 			|	return a
+// 			|		|| 'moo' }
+//
 // XXX is this the right place for this???
 // 		...when moving take care that ImageGrid's core.doc uses this...
 var normalizeIndent =
 module.normalizeIndent =
-function(text, tab_size, leading_tabs){
-	tab_size = tab_size == null ? 
-		module.TAB_SIZE 
-		: tab_size
-	leading_tabs = (leading_tabs == null ? 
-			module.LEADING_TABS 
-			: leading_tabs) 
-		* tab_size
+function(text, {tab_size=module.TAB_SIZE, leading_tabs=module.LEADING_TABS, pad_tabs=0}={}){
+	leading_tabs *= tab_size
+	var padding = ' '.repeat(pad_tabs*tab_size)
 	// prepare text...
 	var tab = ' '.repeat(tab_size || 0)
 	text = tab != '' ?
@@ -140,20 +148,21 @@ function(text, tab_size, leading_tabs){
 				// min...
 				: Math.min(l, indent) }, -1) || 0
 	// normalize...
-	return lines
-		.map(function(line, i){
-			return i == 0 ? 
-				line
-				: line.slice(l) })
-		.join('\n')
-		.trim() }
+	return padding 
+		+lines
+			.map(function(line, i){
+				return i == 0 ? 
+					line
+					: line.slice(l) })
+			.join('\n'+ padding)
+			.trim() }
 
 
 // shorthand more suted for text...
 var normalizeTextIndent =
 module.normalizeTextIndent =
-function(text, tab_size, leading_tabs){
-	return module.normalizeIndent(text, tab_size, leading_tabs || 0) }
+function(text, opts={leading_tabs: 0}){
+	return module.normalizeIndent(text, opts) }
 
 
 // template string tag versions of the above...
diff --git a/package.json b/package.json
index 888b0fe..a797deb 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ig-object",
-  "version": "5.4.12",
+  "version": "5.4.13",
   "description": "",
   "main": "object.js",
   "scripts": {