[jspwiki] branch master updated: [JSPWIKI-1167] prettify line numbering is wrong with longer lines

[brushed]

This is an automated email from the ASF dual-hosted git repository.

brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 86da49709 [JSPWIKI-1167] prettify line numbering is wrong with longer 
lines
86da49709 is described below

commit 86da49709738694a54a98bfdab0ce07ecd822166
Author: brushed <dirk.frederi...@gmail.com>
AuthorDate: Sat Sep 9 21:58:40 2023 +0200

    [JSPWIKI-1167] prettify line numbering is wrong with longer lines
    
    Prettified code lines should not wrap around, to avoid mismatch with line 
numbering.
---
 ChangeLog.md                                               | 7 +++++++
 jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
 jspwiki-war/src/main/styles/haddock/default/prettify.less  | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 6f2b102b8..52f23d409 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -19,6 +19,13 @@ under the License.
 
 **2023-09-09  Dirk Frederickx (brushed AT apache DOT org)**
 
+* _2.12.2-git-02_
+
+* [JSPWIKI-1167](https://issues.apache.org/jira/browse/JSPWIKI-1167) - 
prettify: line numbering is wrong with longer lines
+    Prettified code lines should not wrap around, to avoid mismatch with line 
numbering.
+    
+**2023-09-09  Dirk Frederickx (brushed AT apache DOT org)**
+
 * _2.12.2-git-01_
 
 * [JSPWIKI-1165](https://issues.apache.org/jira/browse/JSPWIKI-1165) - long 
text in monospace font inside {{}} is shown without scroll bar
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java 
b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 80004ef50..b59013b1f 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -69,7 +69,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "01";
+    public static final String     BUILD         = "02";
 
     /**
      *  This is the generic version string you should use when printing out 
the version.  It is of
diff --git a/jspwiki-war/src/main/styles/haddock/default/prettify.less 
b/jspwiki-war/src/main/styles/haddock/default/prettify.less
index 581c2a42b..618024e11 100644
--- a/jspwiki-war/src/main/styles/haddock/default/prettify.less
+++ b/jspwiki-war/src/main/styles/haddock/default/prettify.less
@@ -89,5 +89,11 @@ pre.prettylines {
     -moz-hyphens: none;
     -ms-hyphens: none;
     hyphens: none;
+    
+    code {
+        //was set to pre-wrap;  better is pre;
+        //to avoid wrapping around; and losing alignment with the pretty-lines 
line-numbers
+        white-space: inherit;
+    }
 
 }