You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2018/12/09 01:18:36 UTC
[4/4] tomee-site-generator git commit: Trim whitespace on headings
Trim whitespace on headings
Project: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/commit/e1f56acd
Tree: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/tree/e1f56acd
Diff: http://git-wip-us.apache.org/repos/asf/tomee-site-generator/diff/e1f56acd
Branch: refs/heads/master
Commit: e1f56acdd154d2a28eedfb996b67bfad646fd14b
Parents: 04c3ce6
Author: David Blevins <da...@gmail.com>
Authored: Sat Dec 8 17:18:08 2018 -0800
Committer: David Blevins <da...@gmail.com>
Committed: Sat Dec 8 17:18:08 2018 -0800
----------------------------------------------------------------------
.../website/AsciidocAdjustHeadingLevels.java | 2 +-
.../AsciidocAdjustHeadingLevelsTest.java | 53 ++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/e1f56acd/src/main/java/org/apache/tomee/website/AsciidocAdjustHeadingLevels.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/tomee/website/AsciidocAdjustHeadingLevels.java b/src/main/java/org/apache/tomee/website/AsciidocAdjustHeadingLevels.java
index 03f2cb6..7c7a397 100644
--- a/src/main/java/org/apache/tomee/website/AsciidocAdjustHeadingLevels.java
+++ b/src/main/java/org/apache/tomee/website/AsciidocAdjustHeadingLevels.java
@@ -141,7 +141,7 @@ public class AsciidocAdjustHeadingLevels {
}
public String fix(final String line) {
- return line.replaceAll("^[=#]*", current);
+ return line.trim().replaceAll("^[=#]* *", current + " ");
}
}
}
http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/e1f56acd/src/test/java/org/apache/tomee/website/AsciidocAdjustHeadingLevelsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tomee/website/AsciidocAdjustHeadingLevelsTest.java b/src/test/java/org/apache/tomee/website/AsciidocAdjustHeadingLevelsTest.java
index 7cde793..429189f 100644
--- a/src/test/java/org/apache/tomee/website/AsciidocAdjustHeadingLevelsTest.java
+++ b/src/test/java/org/apache/tomee/website/AsciidocAdjustHeadingLevelsTest.java
@@ -225,4 +225,57 @@ public class AsciidocAdjustHeadingLevelsTest extends Assert {
assertEquals(expected, actual);
}
+
+ @Test
+ public void testAdjustPadding() throws Exception {
+
+ final File content = File.createTempFile("content-", ".adoc");
+
+ IO.copy(IO.read("==Colors\n" +
+ "Some random text\n" +
+ "==== Reds\n" +
+ "More random text\n" +
+ "===== Crimson is a kind of Red\n" +
+ "More random text\n" +
+ "===== Ruby Red\n" +
+ "More random text\n" +
+ "More random text\n" +
+ "===Greens\n" +
+ "#####Emerald\n" +
+ "\n" +
+ "More random text\n" +
+ "\n" +
+ "==== Forrest Green\n" +
+ "More random text\n" +
+ "= Shapes\n" +
+ "More random text\n" +
+ "\n\n"
+ ), content);
+
+ AsciidocAdjustHeadingLevels.process(content);
+
+ final String expected = "= Colors\n" +
+ "Some random text\n" +
+ "== Reds\n" +
+ "More random text\n" +
+ "=== Crimson is a kind of Red\n" +
+ "More random text\n" +
+ "=== Ruby Red\n" +
+ "More random text\n" +
+ "More random text\n" +
+ "== Greens\n" +
+ "=== Emerald\n" +
+ "\n" +
+ "More random text\n" +
+ "\n" +
+ "=== Forrest Green\n" +
+ "More random text\n" +
+ "= Shapes\n" +
+ "More random text\n";
+
+ final String actual = IO.slurp(content);
+
+ assertEquals(expected, actual);
+ }
+
}
\ No newline at end of file