Skip to content

Commit 86da497

Browse files
committed
[JSPWIKI-1167] prettify line numbering is wrong with longer lines
Prettified code lines should not wrap around, to avoid mismatch with line numbering.
1 parent 3a73236 commit 86da497

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ under the License.
1919

2020
**2023-09-09 Dirk Frederickx (brushed AT apache DOT org)**
2121

22+
* _2.12.2-git-02_
23+
24+
* [JSPWIKI-1167](https://issues.apache.org/jira/browse/JSPWIKI-1167) - prettify: line numbering is wrong with longer lines
25+
Prettified code lines should not wrap around, to avoid mismatch with line numbering.
26+
27+
**2023-09-09 Dirk Frederickx (brushed AT apache DOT org)**
28+
2229
* _2.12.2-git-01_
2330

2431
* [JSPWIKI-1165](https://issues.apache.org/jira/browse/JSPWIKI-1165) - long text in monospace font inside {{}} is shown without scroll bar

jspwiki-api/src/main/java/org/apache/wiki/api/Release.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public final class Release {
6969
* <p>
7070
* If the build identifier is empty, it is not added.
7171
*/
72-
public static final String BUILD = "01";
72+
public static final String BUILD = "02";
7373

7474
/**
7575
* This is the generic version string you should use when printing out the version. It is of

jspwiki-war/src/main/styles/haddock/default/prettify.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,11 @@ pre.prettylines {
8989
-moz-hyphens: none;
9090
-ms-hyphens: none;
9191
hyphens: none;
92+
93+
code {
94+
//was set to pre-wrap; better is pre;
95+
//to avoid wrapping around; and losing alignment with the pretty-lines line-numbers
96+
white-space: inherit;
97+
}
9298

9399
}

0 commit comments

Comments
 (0)