fixes #1580

Author: jph00

nbdev/frontmatter.py

@@ -22,6 +22,7 @@
 _re_fm_nb = re.compile(_RE_FM_BASE+'$', flags=re.DOTALL)
 _re_fm_md = re.compile(_RE_FM_BASE, flags=re.DOTALL)
 
+# %% ../nbs/api/09_frontmatter.ipynb #1725f3b9
 def _fm2dict(s:str, nb=True):
     "Load YAML frontmatter into a `dict`"
     re_fm = _re_fm_nb if nb else _re_fm_md
@@ -42,12 +43,14 @@ def _md2dict(s:str):
         except Exception as e: warn(f'Failed to create YAML dict for:\n{r}\n\n{e}\n')
     return res
 
+# %% ../nbs/api/09_frontmatter.ipynb #4ba11b21
 def nb_frontmatter(nb):
     "Get frontmatter dict from `nb` without modifying cells"
-    for c in nb.cells:
-        if c.cell_type=='raw': return _fm2dict(c.source)
-        if c.cell_type=='markdown': return _md2dict(c.source)
-    return {}
+    raw = first(c for c in nb.cells if c.cell_type=='raw')
+    md  = first(c for c in nb.cells if c.cell_type=='markdown')
+    res = _md2dict(md.source) if md else {}
+    if raw: res.update(_fm2dict(raw.source))
+    return res
 
 # %% ../nbs/api/09_frontmatter.ipynb #1b5d9d32
 def _dict2fm(d): return f'---\n{yaml.dump(d)}\n---\n\n'

nbs/api/09_frontmatter.ipynb

@@ -73,8 +73,17 @@
     "---\\s*'''\n",
     "\n",
     "_re_fm_nb = re.compile(_RE_FM_BASE+'$', flags=re.DOTALL)\n",
-    "_re_fm_md = re.compile(_RE_FM_BASE, flags=re.DOTALL)\n",
-    "\n",
+    "_re_fm_md = re.compile(_RE_FM_BASE, flags=re.DOTALL)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "1725f3b9",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
     "def _fm2dict(s:str, nb=True):\n",
     "    \"Load YAML frontmatter into a `dict`\"\n",
     "    re_fm = _re_fm_nb if nb else _re_fm_md\n",
@@ -93,14 +102,24 @@
     "    if r:\n",
     "        try: res.update(yaml.safe_load('\\n'.join(r)))\n",
     "        except Exception as e: warn(f'Failed to create YAML dict for:\\n{r}\\n\\n{e}\\n')\n",
-    "    return res\n",
-    "\n",
+    "    return res"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "4ba11b21",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
     "def nb_frontmatter(nb):\n",
     "    \"Get frontmatter dict from `nb` without modifying cells\"\n",
-    "    for c in nb.cells:\n",
-    "        if c.cell_type=='raw': return _fm2dict(c.source)\n",
-    "        if c.cell_type=='markdown': return _md2dict(c.source)\n",
-    "    return {}"
+    "    raw = first(c for c in nb.cells if c.cell_type=='raw')\n",
+    "    md  = first(c for c in nb.cells if c.cell_type=='markdown')\n",
+    "    res = _md2dict(md.source) if md else {}\n",
+    "    if raw: res.update(_fm2dict(raw.source))\n",
+    "    return res"
    ]
   },
   {