Merge remote-tracking branch 'origin/master'

vsch · vsch · commit 776c6f7e44ed · 2023-04-30T19:34:00.000-04:00
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/html/HtmlRenderer.java b/flexmark/src/main/java/com/vladsch/flexmark/html/HtmlRenderer.java
@@ -541,7 +541,7 @@ public void dispose() {
             this.myLinkResolvers = new LinkResolver[linkResolverFactories.size()];
             this.doNotRenderLinksNesting = htmlOptions.doNotRenderLinksInDocument ? 0 : 1;
             this.htmlIdGenerator = htmlIdGeneratorFactory != null ? htmlIdGeneratorFactory.create(this)
-                    : (!(htmlOptions.renderHeaderId || htmlOptions.generateHeaderIds) ? HtmlIdGenerator.NULL : new HeaderIdGenerator.Factory().create(this));
+                    : (!(htmlOptions.generateHeaderIds) ? HtmlIdGenerator.NULL : new HeaderIdGenerator.Factory().create(this));
 
             htmlWriter.setContext(this);
 
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/html/renderer/CoreNodeRenderer.java b/flexmark/src/main/java/com/vladsch/flexmark/html/renderer/CoreNodeRenderer.java
@@ -117,7 +117,7 @@ void render(Document node, NodeRendererContext context, HtmlWriter html) {
     void render(Heading node, NodeRendererContext context, HtmlWriter html) {
         if (context.getHtmlOptions().renderHeaderId) {
             String id = context.getNodeId(node);
-            if (id != null) {
+            if (id != null && id.length() > 0) {
                 html.attr("id", id);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void render(Document node, NodeRendererContext context, HtmlWriter html) {`
`117`	`117`	`void render(Heading node, NodeRendererContext context, HtmlWriter html) {`
`118`	`118`	`if (context.getHtmlOptions().renderHeaderId) {`
`119`	`119`	`String id = context.getNodeId(node);`
`120`		`- if (id != null) {`
	`120`	`+ if (id != null && id.length() > 0) {`
`121`	`121`	`html.attr("id", id);`
`122`	`122`	`}`
`123`	`123`	`}`