correcting unicode superscripts for 1 2 and 3

9 files changed, 67 insertions, 30 deletions

diff --git a/sys/src/cmd/cwfs/doc/changes b/sys/src/cmd/cwfs/doc/changes
index e1f8a02ac..cf9ea27ef 100644
--- a/sys/src/cmd/cwfs/doc/changes
+++ b/sys/src/cmd/cwfs/doc/changes
@@ -3,7 +3,7 @@
 		Geoff Collyer
 		July—October 2004
 
-note: 2⁶⁳=9,223,372,036,854,775,808 or 8EB (9.2×10ⁱ⁸)
+note: 2⁶³=9,223,372,036,854,775,808 or 8EB (9.2×10¹⁸)
 
 • identified longs that refer to offsets, sizes and block numbers, and
 changed them to type Off (vlong); fixed all print formats to match.
@@ -39,12 +39,12 @@ handle 64-bit offsets and sizes.
 • booted xtc (terminal) from fs64 (used fs64 as main file system)
 
 note: current file server with triple-indirect blocks at 4k block size
-	has a maximum file size of ~505GB (5.42×10ⁱⁱ).
+	has a maximum file size of ~505GB (5.42×10¹¹).
 	with quadruple-indirect blocks, max would be ~275TB @ 4k block size.
 
 • got igbe fs driver working (a couple small changes)
 • eliminated some gotos (started with 580, down to 454)
-• added quadruple indirect blocks: lets us reach 2⁶⁳ with a 32kB block size
+• added quadruple indirect blocks: lets us reach 2⁶³ with a 32kB block size
 • got igbe boot driver & pxe booting working
 • on-disk qid paths are now Offs, but 9p1 qids on the wire are still ulongs
 • generalised & parameterised indirect block implementation
diff --git a/sys/src/cmd/cwfs/main.c b/sys/src/cmd/cwfs/main.c
index 7f9b96a8d..a3c8d49f7 100644
--- a/sys/src/cmd/cwfs/main.c
+++ b/sys/src/cmd/cwfs/main.c
@@ -200,7 +200,7 @@ postservice(void)
 }
 
 /*
- * compute BUFSIZE*(NDBLOCK+INDPERBUF+INDPERBUF⁲+INDPERBUF⁳+INDPERBUF⁴)
+ * compute BUFSIZE*(NDBLOCK+INDPERBUF+INDPERBUF²+INDPERBUF³+INDPERBUF⁴)
  * while watching for overflow; in that case, return 0.
  */
 
@@ -242,8 +242,8 @@ maxsize(void)
 }
 
 enum {
-	INDPERBUF⁲ = ((uvlong)INDPERBUF *INDPERBUF),
-	INDPERBUF⁴ = ((uvlong)INDPERBUF⁲*INDPERBUF⁲),
+	INDPERBUF² = ((uvlong)INDPERBUF*INDPERBUF),
+	INDPERBUF⁴ = ((uvlong)INDPERBUF²*INDPERBUF²),
 };
 
 static void
@@ -261,9 +261,9 @@ printsizes(void)
 			max = offlim - 1;
 		print("max file size = %,llud\n", (Wideoff)max);
 	}
-	if (INDPERBUF⁲/INDPERBUF != INDPERBUF)
-		print("overflow computing INDPERBUF⁲\n");
-	if (INDPERBUF⁴/INDPERBUF⁲ != INDPERBUF⁲)
+	if (INDPERBUF²/INDPERBUF != INDPERBUF)
+		print("overflow computing INDPERBUF²\n");
+	if (INDPERBUF⁴/INDPERBUF² != INDPERBUF²)
 		print("overflow computing INDPERBUF⁴\n");
 	print("\tINDPERBUF = %d, INDPERBUF^4 = %,lld, ", INDPERBUF,
 		(Wideoff)INDPERBUF⁴);
diff --git a/sys/src/cmd/dict/oed.c b/sys/src/cmd/dict/oed.c
index d6ec0f021..2ae4f3597 100644
--- a/sys/src/cmd/dict/oed.c
+++ b/sys/src/cmd/dict/oed.c
@@ -204,6 +204,7 @@ static Assoc auxtab[] = {
 
 static Assoc spectab[] = {
 	{"3on4",	L'¾'},
+	{"3on8",	L'⅜'},
 	{"Aacu",	L'Á'},
 	{"Aang",	L'Å'},
 	{"Abarab",	L'Ā'},
@@ -237,7 +238,7 @@ static Assoc spectab[] = {
 	{"Lambda",	L'Λ'},
 	{"Lbar",	L'Ł'},
 	{"Mu",		L'Μ'},
-	{"Naira",	L'N'},		/* should have bar through */
+	{"Naira",	L'₦'},		/* should have bar through */
 	{"Nplus",	L'N'},		/* should have plus above */
 	{"Ntilde",	L'Ñ'},
 	{"Nu",		L'Ν'},
@@ -742,7 +743,7 @@ static Assoc spectab[] = {
 	{"ssTau",	L'Τ'},
 	{"star",	L'*'},
 	{"stlig",	MLST},
-	{"sup2",	L'⁲'},
+	{"sup2",	L'²'},
 	{"supgt",	L'˃'},
 	{"suplt",	L'˂'},
 	{"sur",		L'ʳ'},
@@ -807,7 +808,6 @@ static Assoc spectab[] = {
    equivalents in Unicode, so aren't in the above table.
 	22n		2^(2^n) Cf Fermat
 	2on4		2/4
-	3on8		3/8
 	Bantuo		Bantu O. Cf Otshi-herero
 	Car		C with circular arrow on top
 	albrtime 	cut-time: C with vertical line
@@ -974,7 +974,7 @@ static Rune suptab[128] = {
 	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,
 /*20*/	L' ',	L'!',	L'"',	L'#',	L'$',	L'%',	SPCS,	L'\'',
 	L'⁽',	L'⁾',	L'*',	L'⁺',	L',',	L'⁻',	L'.',	L'/',
-/*30*/  L'⁰',	L'ⁱ',	L'⁲',	L'⁳',	L'⁴',	L'⁵',	L'⁶',	L'⁷',
+/*30*/  L'⁰',	L'¹',	L'²',	L'³',	L'⁴',	L'⁵',	L'⁶',	L'⁷',
 	L'⁸',	L'⁹',	L':',	L';',	TAGS,	L'⁼',	TAGE,	L'?',
 /*40*/  L'@',	L'A',	L'B',	L'C',	L'D',	L'E',	L'F',	L'G',
 	L'H',	L'I',	L'J',	L'K',	L'L',	L'M',	L'N',	L'O',
diff --git a/sys/src/cmd/dict/pgw.c b/sys/src/cmd/dict/pgw.c
index c9d442e89..8ddebd5ea 100644
--- a/sys/src/cmd/dict/pgw.c
+++ b/sys/src/cmd/dict/pgw.c
@@ -599,7 +599,7 @@ static Assoc spectab[] = {
 	{"ssTau",	L'Τ'},
 	{"star",	L'*'},
 	{"stlig",	MLST},
-	{"sup2",	L'⁲'},
+	{"sup2",	L'²'},
 	{"supgt",	L'˃'},
 	{"suplt",	L'˂'},
 	{"sur",		L'ʳ'},
@@ -831,7 +831,7 @@ static Rune suptab[128] = {
 	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,	NONE,
 /*20*/	L' ',	L'!',	L'"',	L'#',	L'$',	L'%',	SPCS,	L'\'',
 	L'⁽',	L'⁾',	L'*',	L'⁺',	L',',	L'⁻',	L'.',	L'/',
-/*30*/  L'⁰',	L'ⁱ',	L'⁲',	L'⁳',	L'⁴',	L'⁵',	L'⁶',	L'⁷',
+/*30*/  L'⁰',	L'¹',	L'²',	L'³',	L'⁴',	L'⁵',	L'⁶',	L'⁷',
 	L'⁸',	L'⁹',	L':',	L';',	TAGS,	L'⁼',	TAGE,	L'?',
 /*40*/  L'@',	L'A',	L'B',	L'C',	L'D',	L'E',	L'F',	L'G',
 	L'H',	L'I',	L'J',	L'K',	L'L',	L'M',	L'N',	L'O',
diff --git a/sys/src/cmd/dict/robert.c b/sys/src/cmd/dict/robert.c
index 56dbd5ec5..91d2adafc 100644
--- a/sys/src/cmd/dict/robert.c
+++ b/sys/src/cmd/dict/robert.c
@@ -59,7 +59,7 @@ static Rune intab[256] = {
 };
 
 static Rune suptab[] = {
-	['0'] L'⁰',	['1'] L'ⁱ',	['2'] L'⁲',	['3'] L'⁳',
+	['0'] L'⁰',	['1'] L'¹',	['2'] L'²',	['3'] L'³',
 	['4'] L'⁴',	['5'] L'⁵',	['6'] L'⁶',	['7'] L'⁷',
 	['8'] L'⁸',	['9'] L'⁹',	['+'] L'⁺',	['-'] L'⁻',
 	['='] L'⁼',	['('] L'⁽',	[')'] L'⁾',	['a'] L'ª',
diff --git a/sys/src/cmd/nusb/disk/scsireq.h b/sys/src/cmd/nusb/disk/scsireq.h
index 0fbd2b938..97334b32f 100644
--- a/sys/src/cmd/nusb/disk/scsireq.h
+++ b/sys/src/cmd/nusb/disk/scsireq.h
@@ -154,7 +154,7 @@ enum {
 	Cmd1sili	= 2,		/* don't set Sd2ili */
 
 	/* limit of block #s in 24-bit ccbs */
-	Max24off	= (1<<21) - 1,	/* 2⁲ⁱ - 1 */
+	Max24off	= (1<<21) - 1,	/* 2²¹ - 1 */
 
 	/* mode pages */
 	Allmodepages = 0x3F,
diff --git a/sys/src/cmd/scuzz/scsireq.h b/sys/src/cmd/scuzz/scsireq.h
index f08e33f23..4c48ec423 100644
--- a/sys/src/cmd/scuzz/scsireq.h
+++ b/sys/src/cmd/scuzz/scsireq.h
@@ -144,7 +144,7 @@ enum {
 	Cmd1sili	= 2,		/* don't set Sd2ili */
 
 	/* limit of block #s in 24-bit ccbs */
-	Max24off	= (1<<21) - 1,	/* 2⁲ⁱ - 1 */
+	Max24off	= (1<<21) - 1,	/* 2²¹ - 1 */
 
 	/* mode pages */
 	Allmodepages = 0x3F,
diff --git a/sys/src/cmd/units.y b/sys/src/cmd/units.y
index b7c6a52d1..6d0f95d0a 100644
--- a/sys/src/cmd/units.y
+++ b/sys/src/cmd/units.y
@@ -239,17 +239,32 @@ loop:
 	case L'÷':
 		return '/';
 	case L'¹':
-	case L'ⁱ':
 		yylval.numb = 1;
 		return SUP;
 	case L'²':
-	case L'⁲':
 		yylval.numb = 2;
 		return SUP;
 	case L'³':
-	case L'⁳':
 		yylval.numb = 3;
 		return SUP;
+	case L'⁴':
+		yylval.numb = 4;
+		return SUP;
+	case L'⁵':
+		yylval.numb = 5;
+		return SUP;
+	case L'⁶':
+		yylval.numb = 6;
+		return SUP;
+	case L'⁷':
+		yylval.numb = 7;
+		return SUP;
+	case L'⁸':
+		yylval.numb = 8;
+		return SUP;
+	case L'⁹':
+		yylval.numb = 9;
+		return SUP;
 	}
 	return c;
 
@@ -376,11 +391,14 @@ ralpha(int c)
 	case '|':
 	case '#':
 	case L'¹':
-	case L'ⁱ':
 	case L'²':
-	case L'⁲':
 	case L'³':
-	case L'⁳':
+	case L'⁴':
+	case L'⁵':
+	case L'⁶':
+	case L'⁷':
+	case L'⁸':
+	case L'⁹':
 	case L'×':
 	case L'÷':
 		return 0;
@@ -551,6 +569,24 @@ printdim(char *str, int d, int n)
 		case 3:
 			strcat(str, "³");
 			break;
+		case 4:
+			strcat(str, "⁴");
+			break;
+		case 5:
+			strcat(str, "⁵");
+			break;
+		case 6:
+			strcat(str, "⁶");
+			break;
+		case 7:
+			strcat(str, "⁷");
+			break;
+		case 8:
+			strcat(str, "⁸");
+			break;
+		case 9:
+			strcat(str, "⁹");
+			break;
 		default:
 			sprint(strchr(str, 0), "^%d", n);
 		}
diff --git a/sys/src/cmd/vnc/latin1.h b/sys/src/cmd/vnc/latin1.h
index fe3c6d2fd..76a95bf7a 100644
--- a/sys/src/cmd/vnc/latin1.h
+++ b/sys/src/cmd/vnc/latin1.h
@@ -14,13 +14,13 @@
 	"-", "+-2:>DGHILOTZbdghiltuz~",	L"∓­ƻ÷→ÐǤĦƗŁ⊖ŦƵƀðǥℏɨłŧʉƶ≂",
 	".", ".CEGILOZceglz",	L"·ĊĖĠİĿ⊙Żċėġŀż",
 	"/", "Oo",	L"Øø",
-	"1", "234568",	L"½⅓¼⅕⅙⅛",
-	"2", "-35",	L"ƻ⅔⅖",
-	"3", "458",	L"¾⅗⅜",
+	"1", ".234568",	L"․½⅓¼⅕⅙⅛",
+	"2", "-.35",	L"ƻ‥⅔⅖",
+	"3", ".458",	L"…¾⅗⅜",
 	"4", "5",	L"⅘",
 	"5", "68",	L"⅚⅝",
 	"7", "8",	L"⅞",
-	":", ")-=",	L"☺÷≔",
+	":", "()-=",	L"☹☺÷≔",
 	"<!", "=~",	L"≨⋦",
 	"<", "-<=>~",	L"←«≤≶≲",
 	"=", ":<=>OV",	L"≕⋜≡⋝⊜⇒",
@@ -52,12 +52,13 @@
 	"H", "-H",	L"Ħℍ",
 	"I", "-J",	L"ƗIJ",
 	"L", "&-Jj|",	L"⋀ŁLJLj⋁",
+	"M", "#48bs",	L"♮♩♪♭♯",
 	"N", "JNj",	L"NJℕNj",
 	"O", "*+-./=EIcoprx",	L"⊛⊕⊖⊙⊘⊜ŒƢ©⊚℗®⊗",
 	"P", "P",	L"ℙ",
 	"Q", "Q",	L"ℚ",
 	"R", "R",	L"ℝ",
-	"S", "123S",	L"¹²³§",
+	"S", "S",	L"§",
 	"T", "-u",	L"Ŧ⊨",
 	"V", "=",	L"⇐",
 	"Y", "R",	L"Ʀ",
@@ -85,7 +86,7 @@
 	"o", "AOUaeiu",	L"Å⊚Ůåœƣů",
 	"p", "Odgrt",	L"℗∂¶∏∝",
 	"r", "\"\'O",	L"”’®",
-	"s", "()+-0123456789=abnoprstu",	L"⁽⁾⁺⁻⁰ⁱ⁲⁳⁴⁵⁶⁷⁸⁹⁼ª⊂ⁿº⊃√ß∍∑",
+	"s", "()+-0123456789=abnoprstu",	L"⁽⁾⁺⁻⁰¹²³⁴⁵⁶⁷⁸⁹⁼ª⊂ⁿº⊃√ß∍∑",
 	"t", "-efmsu",	L"ŧ∃∴™ς⊢",
 	"u", "-AEGIOUaegiou",	L"ʉĂĔĞĬŎŬ↑ĕğĭŏŭ",
 	"v\"", "Uu",	L"Ǚǚ",