Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ The release run heads these entries with the version and opens a fresh
short values is still a csv. One record is a line, not a table.
- A large text file appears at once: sizing the line numbers laid the page out
once per line. A megabyte took 38s and now takes under a second.
- **Deprecated** `HtmlConfig::embed_outline`, `no_drm`,
`background_image_format` and `background_image_dpi`. Nothing has read them
for a while; they still store and return what is set.

## v6.7.1 - 2026-08-16

Expand Down
4 changes: 4 additions & 0 deletions apple/include/OdrCoreObjC/ODRHtml.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ NS_SWIFT_NAME(HtmlConfig)
@property(nonatomic) uint8_t htmlIndent;
@property(nonatomic, copy) NSString *htmlIndentString;

/// @deprecated Inert.
@property(nonatomic, copy) NSString *backgroundImageFormat;
/// @deprecated Inert.
@property(nonatomic) double backgroundImageDpi;

/// Render only pages `[begin, end)`, 0-based. `nil` end means to the last page.
Expand All @@ -111,7 +113,9 @@ NS_SWIFT_NAME(HtmlConfig)
@property(nonatomic, copy) NSArray<NSString *> *pdfDualLayerFallbackFonts;
@property(nonatomic) double pdfDualLayerFallbackFontSizeAdjust;

/// @deprecated Inert.
@property(nonatomic) BOOL noDrm;
/// @deprecated Inert.
@property(nonatomic) BOOL embedOutline;

@property(nonatomic, copy, nullable) NSString *outputPath;
Expand Down
13 changes: 9 additions & 4 deletions jni/java/app/opendocument/core/HtmlConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ public final class HtmlConfig {
public int htmlIndent = 1;
public String htmlIndentString = "\t";

public String backgroundImageFormat = "png";
public double backgroundImageDpi = 144.0;
/** @deprecated Inert. */
@Deprecated public String backgroundImageFormat = "png";

/** @deprecated Inert. */
@Deprecated public double backgroundImageDpi = 144.0;

public int pageRangeBegin = 0;
/** {@code null} renders to the end of the document. */
Expand All @@ -55,9 +58,11 @@ public final class HtmlConfig {
};
public double pdfDualLayerFallbackFontSizeAdjust = 0.5;

public boolean noDrm = false;
/** @deprecated Inert. */
@Deprecated public boolean noDrm = false;

public boolean embedOutline = false;
/** @deprecated Inert. */
@Deprecated public boolean embedOutline = false;

/** {@code null} keeps output in the cache directory. */
public String outputPath;
Expand Down
12 changes: 8 additions & 4 deletions python/src/bind_html.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,22 @@ void odr_python::bind_html(py::module_ &m) {
.def_readwrite("html_indent", &odr::HtmlConfig::html_indent)
.def_readwrite("html_indent_string", &odr::HtmlConfig::html_indent_string)
.def_readwrite("background_image_format",
&odr::HtmlConfig::background_image_format)
&odr::HtmlConfig::background_image_format,
"Deprecated and inert.")
.def_readwrite("background_image_dpi",
&odr::HtmlConfig::background_image_dpi)
&odr::HtmlConfig::background_image_dpi,
"Deprecated and inert.")
.def_readwrite("page_range_begin", &odr::HtmlConfig::page_range_begin)
.def_readwrite("page_range_end", &odr::HtmlConfig::page_range_end)
.def_readwrite("pdf_text_mode", &odr::HtmlConfig::pdf_text_mode)
.def_readwrite("pdf_dual_layer_fallback_fonts",
&odr::HtmlConfig::pdf_dual_layer_fallback_fonts)
.def_readwrite("pdf_dual_layer_fallback_font_size_adjust",
&odr::HtmlConfig::pdf_dual_layer_fallback_font_size_adjust)
.def_readwrite("no_drm", &odr::HtmlConfig::no_drm)
.def_readwrite("embed_outline", &odr::HtmlConfig::embed_outline)
.def_readwrite("no_drm", &odr::HtmlConfig::no_drm,
"Deprecated and inert.")
.def_readwrite("embed_outline", &odr::HtmlConfig::embed_outline,
"Deprecated and inert.")
.def_readwrite("output_path", &odr::HtmlConfig::output_path)
.def_readwrite("resource_locator", &odr::HtmlConfig::resource_locator);

Expand Down
7 changes: 4 additions & 3 deletions src/odr/html.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ struct HtmlConfig {
std::uint8_t html_indent{1};
std::string html_indent_string{"\t"};

// background image
/// @deprecated Inert: no view renders a background image to a file.
std::string background_image_format{"png"};
/// @deprecated See @ref background_image_format.
double background_image_dpi{144.0};

// Paged-document page range (currently honored by the PDF pipeline): render
Expand All @@ -177,10 +178,10 @@ struct HtmlConfig {
"Arial", "Helvetica", "Liberation Sans", "DejaVu Sans", "Nimbus Sans"};
double pdf_dual_layer_fallback_font_size_adjust{0.5};

// drm options
/// @deprecated Inert: no output carries a restriction to lift.
bool no_drm{false};

// outline options
/// @deprecated Inert: an outline is never written.
bool embed_outline{false};

std::optional<std::string> output_path;
Expand Down
4 changes: 4 additions & 0 deletions wasm/js/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,13 @@ export interface HtmlConfig {
editable?: boolean;
textDocumentMargin?: boolean;
formatHtml?: boolean;
/** @deprecated Inert. */
embedOutline?: boolean;
/** @deprecated Inert. */
noDrm?: boolean;
/** @deprecated Inert. */
backgroundImageFormat?: string;
/** @deprecated Inert. */
backgroundImageDpi?: number;
pageRangeBegin?: number;
pageRangeEnd?: number;
Expand Down
Loading