Increased WimpSlot of debug !Browse by 200K.

FRAMES_SUPPORT #define removed.

Optimised fm_token_font_info().

Added support for LI tokens with text (for ordered lists).

Now outdents bullets from indent value, rather than indenting bullets by
the indent value and further indenting text. May need to look at default
Choices files because of this.

Limited the margin to always be non-negative.

Resources/UK/Browse/!RunD,feb

@@ -92,7 +92,7 @@ Set Alias$@RunType_F91 /<Browse$Dir>.!Run -uri %%*0
 
 | And finally, run the application.
 
-WimpSlot -Min 2560K -Max 2560K
+WimpSlot -Min 2760K -Max 2760K
 
 %UnSet ChangeFSI$Dir
 |Run <Browse$Dir>.!RunImage -debug CMal,CFle %*0 2> Pipe:$.StdErr

c/Fetch

@@ -74,10 +74,6 @@
 
 #define AuthorisationStr "Authorization: Basic "
 
-/* Local compilation options */
-
-#define FRAMES_SUPPORT
-
 /* Static function prototypes */
 
 static HStream * fetch_find_anchor_token_r (browser_data * b, HStream * streambase, char * anchor);
@@ -542,9 +538,6 @@ void fetch_preprocess_token(browser_data * b, HStream * tptr)
     /* a body tag or header information - the code is run if it's a     */
     /* body tag.                                                        */
   }
-
-  #ifdef FRAMES_SUPPORT
-
   else if ISFRAMESET(tptr)
   {
     browser_data * parent;
@@ -648,9 +641,6 @@ void fetch_preprocess_token(browser_data * b, HStream * tptr)
       #endif
     }
   }
-
-  #endif
-
   else if ISHEAD(tptr)
   {
     /* Deal with header (HEAD) tags */

c/FetchHTML

@@ -1053,13 +1053,7 @@ _kernel_oserror * html_get_next_token(browser_data * b, unsigned int handle, int
         up->context = HtmlParse(ref_url,    /* Full page URL, so parser can handle relative links */
                                 0,          /* Length of document - zero at present (not known)   */
                                 up->type,   /* Return type from the HtmlIdentify call             */
-
-                                #ifdef FRAMES_SUPPORT
-                                  1,
-                                #else
-                                  0,
-                                #endif
-
+                                1,          /* We want frames                                     */
                                 b->encoding,
                                 b->encoding_priority);
 

c/FontManage

@@ -1684,13 +1684,15 @@ void fm_token_font_info(HStream * t, int * facenum, int * size, int * italic, in
   /* Set bold, italic and size details according  */
   /* to the header level (if the token represents */
   /* header information, that is).                */
-
-  if (redraw_header(flags) == 1) *bold   = 1, *size *= 2;
-  if (redraw_header(flags) == 2) *bold   = 1, *size = (*size * 3) / 2;
-  if (redraw_header(flags) == 3) *italic = 1, *size = (*size * 4) / 3;
-  if (redraw_header(flags) == 4) *bold   = 1, *size = (*size * 4) / 3;
-  if (redraw_header(flags) == 5) *bold   = 1;
-  if (redraw_header(flags) == 6) *italic = 1;
+  switch (redraw_header(flags))
+  {
+    case 1: *bold   = 1, *size *= 2;              break;
+    case 2: *bold   = 1, *size = (*size * 3) / 2; break;
+    case 3: *italic = 1, *size = (*size * 4) / 3; break;
+    case 4: *bold   = 1, *size = (*size * 4) / 3; break;
+    case 5: *bold   = 1;                          break;
+    case 6: *italic = 1;                          break;
+  }
 }
 
 /*************************************************/

c/Redraw

@@ -373,27 +373,50 @@ int redraw_margin(browser_data * b, reformat_cell * d, HStream * t)
 //  if (redraw_header(s) == 3)                          return (i + 16 + 4);
 //  if (redraw_header(s) == 4 || redraw_header(s) == 5) return (i + 32 + 4);
 
-  /* Add an appropriate amount for a bullet point; the */
-  /* ISBULLET macro is defined in Fetch.h              */
+  /* Play about outdenting bullets and numbered list items. */
+  if (t->tagno == TAG_LI)
+  {
+    if (t->text)
+    {
+      _kernel_oserror *e;
+      int h, width, bytes;
+
+      /* We need to right-align the text. Find out its width... */
+
+      h = fm_find_token_font(b, t);
+      e = fm_get_string_width(h,
+                              t->text,
+                              0x40000000,
+                              0x40000000,
+                              -1,
+                              &bytes,
+                              &width);
 
-  if (t->indent && !ISBULLET(t))
+      if (!e)
+          i -= width;
+    }
+    else
     {
-    int width;
+        int bullet_width;
 
-    convert_to_points(reformat_bullet_width(t->indent), &width);
+        /* Outdent the bullet */
+        convert_to_points(reformat_bullet_width(t->indent), &bullet_width);
 
-    i += width;
+        i -= bullet_width;
+    }
   }
 
   /* Add an amount for block quote or address text; the */
   /* constants are defined in HTMLLib:tags.h            */
 
-  if (s & (BLOCKQUOTE | ADDRESS)) return i + redraw_left_margin(b, d) + b->quote_margin;
+  if (s & (BLOCKQUOTE | ADDRESS)) i += b->quote_margin;
 
   /* Return a general indent based on the total summed so */
   /* far plus an extra amount for lists etc.              */
 
-  return i + redraw_left_margin(b, d);
+  i += redraw_left_margin(b, d);
+
+  return i > 0 ? i : 0;
 }
 
 /*************************************************/

h/Fetch

@@ -34,7 +34,7 @@
 /* General definitions */
 
 #define DISPLAY_NAMED ((HStream *) 0x40000000) /* Large enough not to be a token address */
-#define ISBULLET(p)   (((p)->style) & LI)
+#define ISBULLET(p)   ((((p)->style) & LI) && !((p)->text))
 #define ISLINK(p)     ((((p)->style) & A) && ((p)->anchor))
 
 #define Internal_URL "!INTRNL!" /* Special string (i.e. hack...) to mark a URL as internal only. */