From 5dbc9f7f7c1e198a8fa0b3d6e1f10554ea3fa620 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 4 Sep 2011 16:13:26 +0000
Subject: [PATCH] htmlv 0.68: <font color="something unreal"> bug fixed

git-svn-id: svn://kolibrios.org@2152 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/network/htmlv/browser/HTMLv.c--      |  4 +--
 programs/network/htmlv/browser/History.txt    |  3 ++
 programs/network/htmlv/browser/TWB.h--        | 34 ++++++++++++-------
 .../network/htmlv/browser/include/colors.h--  |  3 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/programs/network/htmlv/browser/HTMLv.c-- b/programs/network/htmlv/browser/HTMLv.c--
index 0fd456b716..c0c9fab814 100644
--- a/programs/network/htmlv/browser/HTMLv.c--
+++ b/programs/network/htmlv/browser/HTMLv.c--
@@ -131,8 +131,8 @@ void Draw_Window()
 	DrawBar(0,43,onLeft(5,4),1,0xD2CED0); //выпуклость
 	FOR (j=0; j<5; j++) DefineButton(j*37+11, 7, 29, 29, 300+j+BT_HIDE, 0x00E4DFE1);
 	PutImage(#URLgoto,40,19,onLeft(57,0),14);
-	DefineButton(onLeft(38,0),14, 20, 18, GOTOURL+BT_HIDE, 0xE4DFE1);
-	DefineButton(onLeft(57,0),14, 19, 18, SEARCHWEB+BT_HIDE, 0xE4DFE1);
+	DefineButton(onLeft(37,0),15, 18, 16, GOTOURL+BT_HIDE, 0xE4DFE1);
+	DefineButton(onLeft(56,0),15, 17, 16, SEARCHWEB+BT_HIDE, 0xE4DFE1);
 	DrawRegion_3D(205,14,onLeft(58,205),18,0x94AECE,0x94AECE); //ободок полосы адреса
 	DrawRegion_3D(206,15,onLeft(59,205),16,0xE4ECF3,0xE4ECF3);
 	edit1.width=Form.width-266;
diff --git a/programs/network/htmlv/browser/History.txt b/programs/network/htmlv/browser/History.txt
index f0647e1bb7..341b97bd56 100644
--- a/programs/network/htmlv/browser/History.txt
+++ b/programs/network/htmlv/browser/History.txt
@@ -1,3 +1,6 @@
+04.09.11 -- v0.68 -- 11.1 Кб
+- устранён вылет программы при неправильном параметре color тега <font> - алсо иногда действительно полезно читать маны.
+
 20.08.11 -- v0.67 -- 11.1 Кб
 - более адекватная прокрутка изображений;
 - корректная обработка табов в тексте и с тегом <pre> (спасибо Nazarus и Jaeger);
diff --git a/programs/network/htmlv/browser/TWB.h-- b/programs/network/htmlv/browser/TWB.h--
index 6db88a8878..1a5358c225 100644
--- a/programs/network/htmlv/browser/TWB.h--
+++ b/programs/network/htmlv/browser/TWB.h--
@@ -17,7 +17,7 @@ dword j,
  char download_path[]="/rd/1/.download";
 //char search_path[]="http://nova.rambler.ru/search?words=";
  char search_path[]="http://nigma.ru/index.php?s=";
- char version[]=" Text-based Browser 23.67";
+ char version[]=" Text-based Browser 23.68";
 
 
 struct TWebBrowser {
@@ -513,19 +513,29 @@ void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
 		return;
 	}
 	/////////////////////////
-	if (!chTag("font")) {
-		IF(stroka <= 0) && (stroka - 1 > max_kolvo_strok) return;
-		COL_MARK: IF(strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+	if (!chTag("font"))
+	{
+		IF(stroka < 0) || (stroka - 1 > max_kolvo_strok) return;
+		COL_MARK:
+		if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
 		{
-      text_color_index++;
-      IF (options[0] == '#'){
-        text_colors[text_color_index] = StrToCol(#options);
+			text_color_index++;
+			IF (options[0] == '#')
+			{
+				text_colors[text_color_index] = StrToCol(#options);
+			}
+			ELSE
+			{
+				FOR (i=0; color_names[i]!=0; i++)
+				{
+					IF(!strcmp(#options, color_names[i]))
+					{
+						text_colors[text_color_index] = colors[i];
+						BREAK;
+					}
+					text_colors[text_color_index] = text_colors[0];
+				}
 			}
-			ELSE {
-             FOR (i=0;color_names[i]!=0;i++){
-              IF(!strcmp(#options, color_names[i])) {text_colors[text_color_index] = colors[i]; BREAK;}
-            }
-          }
 			
 		}
 		IF(tagparam[0] <>'') {
diff --git a/programs/network/htmlv/browser/include/colors.h-- b/programs/network/htmlv/browser/include/colors.h--
index 5f2290bc74..f4c43466ff 100644
--- a/programs/network/htmlv/browser/include/colors.h--
+++ b/programs/network/htmlv/browser/include/colors.h--
@@ -142,7 +142,8 @@ char *color_names[]={
 "white",
 "whitesmoke",
 "yellow",
-"yellowgreen"}; 
+"yellowgreen",
+0}; 
 
 //соответствующие им значения
 dword *colors[]={