From 6709a723d4d12977f50e85e56bdda1dd5a8544a9 Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Thu, 10 Apr 2025 17:49:03 -0400 Subject: [PATCH 1/3] 8354320: Changes to jpackage.md cause pandoc warning --- src/jdk.jpackage/share/man/jpackage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md index c50370c9641b5..c4228c42db5df 100644 --- a/src/jdk.jpackage/share/man/jpackage.md +++ b/src/jdk.jpackage/share/man/jpackage.md @@ -225,7 +225,7 @@ The `jpackage` tool will take as input a Java application and a Java run-time im An expandable substring should be enclosed between the dollar sign character ($) and the first following non-alphanumeric - character. Alternatively, it can be enclosed between "${" and "}" + character. Alternatively, it can be enclosed between "\${" and "}" substrings. Expandable substrings are case-sensitive on Unix and From 33364c72ae209575696c1634d044babe001ad518 Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Fri, 11 Apr 2025 09:26:54 -0400 Subject: [PATCH 2/3] Add missing backslash character --- src/jdk.jpackage/share/man/jpackage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md index c4228c42db5df..af6f4f986628e 100644 --- a/src/jdk.jpackage/share/man/jpackage.md +++ b/src/jdk.jpackage/share/man/jpackage.md @@ -236,7 +236,7 @@ The `jpackage` tool will take as input a Java application and a Java run-time im will be ignored, and these expandable substrings will be replaced by values calculated by the app launcher. - Prefix the dollar sign character with the backslash character (\) + Prefix the dollar sign character with the backslash character (\\) to prevent substring expansion. `--java-options` *options* From c9d11ffa933c5580cea7c1e57bdb3f8223aed452 Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Fri, 11 Apr 2025 09:46:25 -0400 Subject: [PATCH 3/3] Disable tex_math_dollars extension --- make/autoconf/basic_tools.m4 | 10 +++++++++- src/jdk.jpackage/share/man/jpackage.md | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4 index eac14207b1da9..5815c55c962ab 100644 --- a/make/autoconf/basic_tools.m4 +++ b/make/autoconf/basic_tools.m4 @@ -468,7 +468,15 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC], AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown]) if $PANDOC --list-extensions | $GREP -q '+smart'; then AC_MSG_RESULT([yes]) - PANDOC_MARKDOWN_FLAG="markdown-smart" + PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-smart" + else + AC_MSG_RESULT([no]) + fi + + AC_MSG_CHECKING([if the pandoc tex_math_dollars extension needs to be disabled for markdown]) + if $PANDOC --list-extensions | $GREP -q '+tex_math_dollars'; then + AC_MSG_RESULT([yes]) + PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-tex_math_dollars" else AC_MSG_RESULT([no]) fi diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md index af6f4f986628e..34e524f9eeece 100644 --- a/src/jdk.jpackage/share/man/jpackage.md +++ b/src/jdk.jpackage/share/man/jpackage.md @@ -225,7 +225,7 @@ The `jpackage` tool will take as input a Java application and a Java run-time im An expandable substring should be enclosed between the dollar sign character ($) and the first following non-alphanumeric - character. Alternatively, it can be enclosed between "\${" and "}" + character. Alternatively, it can be enclosed between "${" and "}" substrings. Expandable substrings are case-sensitive on Unix and