Branch: Tag:

2000-02-15

2000-02-15 06:10:11 by Martin Stjernholm <mast@lysator.liu.se>

Removed PHtmlCompat and PEntCompat; the compatibility code is now folded
into PXml and PEnt instead.

Rev: server/etc/modules/RXML.pmod/PEnt.pike:1.8
Rev: server/etc/modules/RXML.pmod/PEntCompat.pike:1.6(DEAD)
Rev: server/etc/modules/RXML.pmod/PHtmlCompat.pike:1.13(DEAD)
Rev: server/etc/modules/RXML.pmod/PXml.pike:1.30
Rev: server/etc/modules/RXML.pmod/utils.pmod:1.7

5:   //!   //! Created 2000-01-21 by Martin Stjernholm   //! - //! $Id: utils.pmod,v 1.6 2000/02/13 18:25:56 mast Exp $ + //! $Id: utils.pmod,v 1.7 2000/02/15 06:10:11 mast Exp $         array return_zero (mixed... ignored) {return 0;}
38:   }       - // PXml callbacks. + // PXml and PEnt callbacks.      int(1..1)|string|array p_xml_entity_cb (Parser.HTML p, string str)   {
61:    return p->type->free_text ? 0 : ({});   }    -  - // PHtmlCompat callbacks. -  - int(1..1)|string|array p_html_compat_tagmap_tag_cb ( -  Parser.HTML p, string str, mixed... extra) + int(1..1)|string|array p_xml_compat_entity_cb (Parser.HTML p, string str)   { -  string name = p->flag_parse_html_compat ? lower_case (p->tag_name()) : p->tag_name(); -  if (mixed tdef = p->tagmap_tags[name]) -  if (stringp (tdef)) -  return ({tdef}); -  else if (arrayp (tdef)) -  return tdef[0] (p, p->tag_args(), @tdef[1..], @extra); -  else -  return tdef (p, p->tag_args(), @extra); -  else if (mixed cdef = p->tagmap_containers[name]) -  // A container has been added. -  p->_low_add_container (name, p_html_compat_tagmap_container_cb); -  return 1; - } -  - int(1..1)|string|array p_html_compat_tagmap_container_cb ( -  Parser.HTML p, mapping(string:string) args, string content, mixed... extra) - { -  string name = p->flag_parse_html_compat ? lower_case (p->tag_name()) : p->tag_name(); -  if (mixed cdef = p->tagmap_containers[name]) -  if (stringp (cdef)) -  return ({cdef}); -  else if (arrayp (cdef)) -  return cdef[0] (p, args, content, @cdef[1..], @extra); -  else -  return cdef (p, args, content, @extra); -  else -  // The container has disappeared from the mapping. -  p->_low_add_container (name, 0); -  return 1; - } -  - array p_html_compat_entity_cb (Parser.HTML p, string str) - { +     string entity = p->tag_name();    if (sizeof (entity) && entity[0] != '#') return p->handle_var (entity);    return p->type->free_text ? 0 : ({});   }