made html_section_pages work better (links to sections)

Rev: tutorial/html.pike:1.33
Rev: tutorial/html_section_pages.pike:1.3

tutorial/html.pike

@@ -559,6 +559,10 @@ SGML convert(SGML data)
     }
     else
     {
+      if(!objectp(data))
+      {
+	error("Tag is neither string nor object: %O\n",data);
+      }
       cpos=data->pos;
       switch(data->tag)
       {
@@ -903,15 +907,9 @@ SGML wmml_to_html(SGML data)
       });
 }
 
-
-SGML low_split(SGML data)
-{
-  SGML current=({});
-  foreach(data, TAG t)
-    {
-      if(objectp(t))
+SGML split_tag(TAG t, TAG t2)
 {
-	TAG t2=get_tag(t);
+  array current=({});
   switch(t2->tag)
   {
     case "preface":
@@ -924,7 +922,7 @@ SGML low_split(SGML data)
 	    Sgml.Tag("hr")
 	  })+
 	  sections->introduction;
-	  continue;
+	  return current;
 	  
     case "introduction":
       if(!sections->introduction)
@@ -939,18 +937,17 @@ SGML low_split(SGML data)
       sections->introduction+=({
 	t
       });
-	  continue;
+      return current;
       
     case "index":
       sections[t2->params->name || "index"]=({ t });
-	  continue;
+      return current;
       
     case "chapter":
     case "appendix":
+      t2->data=low_split(t2->data);
       sections[t2->params->number]=({ t });
-	  if (this_object()->split_and_remove_section)
-	     this_object()->split_and_remove_section(t);
-	  continue;
+      return current;
       
     case "firstpage":
       current+=
@@ -962,7 +959,7 @@ SGML low_split(SGML data)
       sections->firstpage=({
 	t,
       });
-	  continue;
+      return current;
 
     case "table-of-contents":
       sections->frame=({
@@ -989,9 +986,27 @@ SGML low_split(SGML data)
       if(t->data)
 	t->data=low_split(t->data);
   }
+  return ({t});
+}
+
+
+SGML low_split(SGML data)
+{
+  SGML current=({});
+  foreach(data, TAG t)
+    {
+      if(objectp(t))
+      {
+	SGML tmp=split_tag(t,get_tag(t));
+	if(search(tmp,0) != -1)
+	{
+	  error("Got zero! %O\n",tmp);
 	}
+	current+=tmp;
+      }else{
 	current+=({t});
       }
+    }
   
   return current;
 }

tutorial/html_section_pages.pike

@@ -2,28 +2,27 @@
 #if __VERSION__ >= 0.6
 import ".";
 #endif /* __VERSION__ >= 0.6 */
-inherit "html";
+inherit "html.pike";
 
-void split_and_remove_section(object t,object prev)
-{
-   if (t->data)
-      foreach (t->data,object t2)
-	 if (objectp(t2))
-	 {
-	    split_and_remove_section(t2,t->tag=="anchor"?t:0);
-	    if (t2->tag=="section")
+
+SGML split_tag(TAG t, TAG t2)
 {
-	       object tq;
-	       if (prev)
+  switch(t2->tag)
   {
+    case "section":
+      t2->data=low_split(t2->data);
       sections[t2->params->number]=({t});
-		  prev->data-=({t});
-	       }
-	       else
-	       {
-		  sections[t2->params->number]=({t2});
-		  t->data-=({t2});
-	       }
-	    }
+      return ({
+	Sgml.Tag("h3",0,0,({
+	  Sgml.Tag("link",(["to":t2->params->number]),0,
+		   ({
+		     sprintf("%s %s",
+			     t2->params->number,
+			     (string) t2->params->title),
+		       })),
+	    })
+		 });
   }
+  return ::split_tag(t,t2);
 }
+