From a250d275efdb90b0eb0c079e5f9193af755ae74d Mon Sep 17 00:00:00 2001
From: Daniel Paoliello <danpao@microsoft.com>
Date: Mon, 19 Aug 2024 15:01:32 -0700
Subject: [PATCH 1/2] [mdman] Add a test for a code block split across multiple
 lines in an options template

---
 crates/mdman/tests/compare/expected/options.1         | 5 +++++
 crates/mdman/tests/compare/expected/options.md        | 4 ++++
 crates/mdman/tests/compare/expected/options.txt       | 4 ++++
 crates/mdman/tests/compare/includes/options-common.md | 5 +++++
 4 files changed, 18 insertions(+)

diff --git a/crates/mdman/tests/compare/expected/options.1 b/crates/mdman/tests/compare/expected/options.1
index d362421e9f0..44dec79db1f 100644
--- a/crates/mdman/tests/compare/expected/options.1
+++ b/crates/mdman/tests/compare/expected/options.1
@@ -69,6 +69,11 @@ Flag with optional value.
 .RS 4
 Alternate syntax for optional value (with required = for disambiguation).
 .RE
+.sp
+\fB\-\-split\-block\fR
+.RS 4
+An option where the description has a \fBblock statement  that is split across multiple lines\fR
+.RE
 .SH "EXAMPLES"
 .sp
 .RS 4
diff --git a/crates/mdman/tests/compare/expected/options.md b/crates/mdman/tests/compare/expected/options.md
index 19b0b443b64..524c837d1c5 100644
--- a/crates/mdman/tests/compare/expected/options.md
+++ b/crates/mdman/tests/compare/expected/options.md
@@ -58,6 +58,10 @@ A description of the command.
 <dd class="option-desc">Alternate syntax for optional value (with required = for disambiguation).</dd>
 
 
+<dt class="option-term" id="option-options---split-block"><a class="option-anchor" href="#option-options---split-block"></a><code>--split-block</code></dt>
+<dd class="option-desc">An option where the description has a <code>block statement  that is split across multiple lines</code></dd>
+
+
 </dl>
 
 
diff --git a/crates/mdman/tests/compare/expected/options.txt b/crates/mdman/tests/compare/expected/options.txt
index 9bfdec67c95..f585cba466a 100644
--- a/crates/mdman/tests/compare/expected/options.txt
+++ b/crates/mdman/tests/compare/expected/options.txt
@@ -43,6 +43,10 @@ OPTIONS
            Alternate syntax for optional value (with required = for
            disambiguation).
 
+       --split-block
+           An option where the description has a block statement that is split
+           across multiple lines
+
 EXAMPLES
        1. An example
 
diff --git a/crates/mdman/tests/compare/includes/options-common.md b/crates/mdman/tests/compare/includes/options-common.md
index 07404e3f74c..56f727a10cb 100644
--- a/crates/mdman/tests/compare/includes/options-common.md
+++ b/crates/mdman/tests/compare/includes/options-common.md
@@ -11,4 +11,9 @@ Flag with optional value.
 Alternate syntax for optional value (with required = for disambiguation).
 {{/option}}
 
+{{#option "`--split-block`"}}
+An option where the description has a `block statement
+that is split across multiple lines`
+{{/option}}
+
 {{/options}}

From 8e2a37cc17db38a87a335117a83302e5a1d67a70 Mon Sep 17 00:00:00 2001
From: Daniel Paoliello <danpao@microsoft.com>
Date: Mon, 19 Aug 2024 15:02:04 -0700
Subject: [PATCH 2/2] [mdman] Normalize newlines when rendering options

---
 crates/mdman/src/hbs.rs                        | 3 +++
 crates/mdman/tests/compare/expected/options.1  | 2 +-
 crates/mdman/tests/compare/expected/options.md | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/mdman/src/hbs.rs b/crates/mdman/src/hbs.rs
index 09726b83ce7..ca739900cf0 100644
--- a/crates/mdman/src/hbs.rs
+++ b/crates/mdman/src/hbs.rs
@@ -139,6 +139,9 @@ impl HelperDef for OptionHelper<'_> {
         // Render the block.
         let block = t.renders(r, gctx, rc)?;
 
+        // Windows newlines can break some rendering, so normalize.
+        let block = block.replace("\r\n", "\n");
+
         // Get the name of this page.
         let man_name = gctx
             .data()
diff --git a/crates/mdman/tests/compare/expected/options.1 b/crates/mdman/tests/compare/expected/options.1
index 44dec79db1f..02ba1eb66bc 100644
--- a/crates/mdman/tests/compare/expected/options.1
+++ b/crates/mdman/tests/compare/expected/options.1
@@ -72,7 +72,7 @@ Alternate syntax for optional value (with required = for disambiguation).
 .sp
 \fB\-\-split\-block\fR
 .RS 4
-An option where the description has a \fBblock statement  that is split across multiple lines\fR
+An option where the description has a \fBblock statement that is split across multiple lines\fR
 .RE
 .SH "EXAMPLES"
 .sp
diff --git a/crates/mdman/tests/compare/expected/options.md b/crates/mdman/tests/compare/expected/options.md
index 524c837d1c5..0178cac2d7c 100644
--- a/crates/mdman/tests/compare/expected/options.md
+++ b/crates/mdman/tests/compare/expected/options.md
@@ -59,7 +59,7 @@ A description of the command.
 
 
 <dt class="option-term" id="option-options---split-block"><a class="option-anchor" href="#option-options---split-block"></a><code>--split-block</code></dt>
-<dd class="option-desc">An option where the description has a <code>block statement  that is split across multiple lines</code></dd>
+<dd class="option-desc">An option where the description has a <code>block statement that is split across multiple lines</code></dd>
 
 
 </dl>