fixes #551

Author: jph00

fastcore/xml.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/11_xml.ipynb.
 
 # %% auto 0
-__all__ = ['xt', 'to_xml', 'Html', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1',
-           'H2', 'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img',
-           'A', 'Nav', 'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td',
+__all__ = ['voids', 'xt', 'to_xml', 'Html', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P',
+           'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br',
+           'Img', 'A', 'Nav', 'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td',
            'Caption', 'Col', 'Colgroup', 'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset',
            'Legend', 'Details', 'Summary', 'Main', 'Header', 'Footer', 'Section', 'Article', 'Aside', 'Figure',
            'Figcaption', 'Mark', 'Small', 'Iframe', 'Object', 'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas',
@@ -43,6 +43,9 @@ def xt(tag:str, *c, **kw):
 for o in _all_: _g[o] = partial(xt, o.lower())
 
 # %% ../nbs/11_xml.ipynb 9
+voids = set('area base br col command embed hr img input keygen link meta param source track wbr'.split())
+
+# %% ../nbs/11_xml.ipynb 10
 def to_xml(elm, lvl=0):
     "Convert `xt` element tree into an XML string"
     if isinstance(elm, tuple): return '\n'.join(to_xml(o) for o in elm)
@@ -58,8 +61,9 @@ def to_xml(elm, lvl=0):
         sattrs = (f'{k}="{escape(str(v), quote=False)}"' for k,v in attrs.items())
         stag += ' ' + ' '.join(sattrs)
 
-    if not cs: return f'{sp}<{stag}></{tag}>\n'
+    cltag = '' if tag in voids else f'</{tag}>'
+    if not cs: return f'{sp}<{stag}>{cltag}\n'
     res = f'{sp}<{stag}>\n'
     res += ''.join(to_xml(c, lvl=lvl+2) for c in cs)
-    res += f'{sp}</{tag}>\n'
+    if tag not in voids: res += f'{sp}{cltag}\n'
     return res

nbs/11_xml.ipynb

@@ -118,7 +118,9 @@
        " (['head', (['title', ('Some page',), {}],), {}],\n",
        "  ['body',\n",
        "   (['div',\n",
-       "     (['p', ('Some text',), {}], ['img', (), {'src': 'filename'}]),\n",
+       "     (['p', ('Some text',), {}],\n",
+       "      ['input', (), {'name': 'me'}],\n",
+       "      ['img', (), {'src': 'filename'}]),\n",
        "     {'class': 'myclass'}],),\n",
        "   {}]),\n",
        " {}]"
@@ -132,11 +134,22 @@
    "source": [
     "samp = Html(\n",
     "    Head(Title('Some page')),\n",
-    "    Body(Div(P('Some text'), Img(src=\"filename\"), klass='myclass'))\n",
+    "    Body(Div(P('Some text'), Input(name='me'), Img(src=\"filename\"), klass='myclass'))\n",
     ")\n",
     "samp"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c7de63a4",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "voids = set('area base br col command embed hr img input keygen link meta param source track wbr'.split())"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -160,10 +173,11 @@
     "        sattrs = (f'{k}=\"{escape(str(v), quote=False)}\"' for k,v in attrs.items())\n",
     "        stag += ' ' + ' '.join(sattrs)\n",
     "    \n",
-    "    if not cs: return f'{sp}<{stag}></{tag}>\\n'\n",
+    "    cltag = '' if tag in voids else f'</{tag}>'\n",
+    "    if not cs: return f'{sp}<{stag}>{cltag}\\n'\n",
     "    res = f'{sp}<{stag}>\\n'\n",
     "    res += ''.join(to_xml(c, lvl=lvl+2) for c in cs)\n",
-    "    res += f'{sp}</{tag}>\\n'\n",
+    "    if tag not in voids: res += f'{sp}{cltag}\\n'\n",
     "    return res"
    ]
   },
@@ -188,7 +202,8 @@
        "      <p>\n",
        "Some text\n",
        "      </p>\n",
-       "      <img src=\"filename\"></img>\n",
+       "      <input name=\"me\">\n",
+       "      <img src=\"filename\">\n",
        "    </div>\n",
        "  </body>\n",
        "</html>\n",