From dbc3dac871616c8549cc3ddce01cd0e98f83c1f6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 19 Nov 2016 20:02:19 +0000 Subject: Include embedded style map when explicit style map is set --- mammoth/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'mammoth/__init__.py') diff --git a/mammoth/__init__.py b/mammoth/__init__.py index 7735fcf..fe480ec 100644 --- a/mammoth/__init__.py +++ b/mammoth/__init__.py @@ -5,6 +5,9 @@ from .docx.style_map import write_style_map, read_style_map __all__ = ["convert_to_html", "extract_raw_text", "images", "underline"] +_undefined = object() + + def convert_to_html(*args, **kwargs): return convert(*args, output_format="html", **kwargs) @@ -13,11 +16,13 @@ def convert_to_markdown(*args, **kwargs): return convert(*args, output_format="markdown", **kwargs) -def convert(fileobj, transform_document=None, id_prefix=None, **kwargs): +def convert(fileobj, transform_document=None, id_prefix=None, include_embedded_style_map=_undefined, **kwargs): + if include_embedded_style_map is _undefined: + include_embedded_style_map = True if transform_document is None: transform_document = lambda x: x - if kwargs.get("style_map") is None: - kwargs["style_map"] = read_style_map(fileobj) + if include_embedded_style_map: + kwargs["embedded_style_map"] = read_style_map(fileobj) return options.read_options(kwargs).bind(lambda convert_options: docx.read(fileobj).map(transform_document).bind(lambda document: conversion.convert_document_element_to_html( -- cgit v1.2.3