From 1138ae6656784c1ca82511b0f27675f8cbc19cf8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Wed, 2 Nov 2016 11:51:53 -0400 Subject: Docx reader utils: handle empty namespace in elemName Previously, if given an empty namespace: (elemName ns "" "foo") `elemName` would output a QName with a `Just ""` namespace. This is never what we want. Now we output a `Nothing`. If someone *does* want a `Just ""` in the namespace, they can enter the QName value explicitly. --- src/Text/Pandoc/Readers/Docx/Util.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Text/Pandoc/Readers/Docx') diff --git a/src/Text/Pandoc/Readers/Docx/Util.hs b/src/Text/Pandoc/Readers/Docx/Util.hs index 891f107b0..33d69ccf3 100644 --- a/src/Text/Pandoc/Readers/Docx/Util.hs +++ b/src/Text/Pandoc/Readers/Docx/Util.hs @@ -18,7 +18,8 @@ attrToNSPair (Attr (QName s _ (Just "xmlns")) val) = Just (s, val) attrToNSPair _ = Nothing elemName :: NameSpaces -> String -> String -> QName -elemName ns prefix name = QName name (lookup prefix ns) (Just prefix) +elemName ns prefix name = + QName name (lookup prefix ns) (if null prefix then Nothing else Just prefix) isElem :: NameSpaces -> String -> String -> Element -> Bool isElem ns prefix name element = -- cgit v1.2.3