diff options
author | Samuel GOUGEON <sgougeon@free.fr> | 2016-12-21 13:48:20 +0100 |
---|---|---|
committer | Samuel GOUGEON <sgougeon@free.fr> | 2016-12-21 13:48:20 +0100 |
commit | 253a8019f4fda73119f232c65c1c606624795207 (patch) | |
tree | ecdde8add2cb84ec03693c5a0034dfaf026fb602 /scilab | |
parent | 070653459ef4f5fdfa8de2f52312623ae3917b52 (diff) | |
download | scilab-253a8019f4fda73119f232c65c1c606624795207.zip scilab-253a8019f4fda73119f232c65c1c606624795207.tar.gz |
* Bug #13877 fixed - '<' in <screen> areas were not rendered in help browser
Change-Id: I90539c88b8781e7ad95fd815d3ba9b1085a38d2e
Diffstat (limited to 'scilab')
-rw-r--r-- | scilab/CHANGES.md | 1 | ||||
-rw-r--r-- | scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md index fa69f7c..f7f9365 100644 --- a/scilab/CHANGES.md +++ b/scilab/CHANGES.md | |||
@@ -360,6 +360,7 @@ Bug Fixes | |||
360 | * [#13651](http://bugzilla.scilab.org/show_bug.cgi?id=13651): It was not possible to `copy` an axes into an uicontrol frame. | 360 | * [#13651](http://bugzilla.scilab.org/show_bug.cgi?id=13651): It was not possible to `copy` an axes into an uicontrol frame. |
361 | * [#13757](http://bugzilla.scilab.org/show_bug.cgi?id=13757): The toolbox menu dit not load properly ATOMS modules not autoloaded. | 361 | * [#13757](http://bugzilla.scilab.org/show_bug.cgi?id=13757): The toolbox menu dit not load properly ATOMS modules not autoloaded. |
362 | * [#13856](http://bugzilla.scilab.org/show_bug.cgi?id=13856): `messagebox` crashed under Windows in 5.5 Scilab version and updated in version 6. | 362 | * [#13856](http://bugzilla.scilab.org/show_bug.cgi?id=13856): `messagebox` crashed under Windows in 5.5 Scilab version and updated in version 6. |
363 | * [#13877](http://bugzilla.scilab.org/show_bug.cgi?id=13877): `<` characters included in `<screen>` areas were not rendered in the help browser. | ||
363 | * [#13878](http://bugzilla.scilab.org/show_bug.cgi?id=13878): tokens([]) returns []. | 364 | * [#13878](http://bugzilla.scilab.org/show_bug.cgi?id=13878): tokens([]) returns []. |
364 | * [#13895](http://bugzilla.scilab.org/show_bug.cgi?id=13895): p.a.h = 1; p.b.h = 3; p(:).h CRASH | 365 | * [#13895](http://bugzilla.scilab.org/show_bug.cgi?id=13895): p.a.h = 1; p.b.h = 3; p(:).h CRASH |
365 | * [#13990](http://bugzilla.scilab.org/show_bug.cgi?id=13990): `warning` with localization enabled some memory corruption | 366 | * [#13990](http://bugzilla.scilab.org/show_bug.cgi?id=13990): `warning` with localization enabled some memory corruption |
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java index 14cb5ff..9d0fb32 100644 --- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java +++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java | |||
@@ -1177,7 +1177,7 @@ public class HTMLDocbookTagConverter extends DocbookTagConverter implements Temp | |||
1177 | */ | 1177 | */ |
1178 | public String handleScreen(final Map<String, String> attributes, final String contents) throws SAXException { | 1178 | public String handleScreen(final Map<String, String> attributes, final String contents) throws SAXException { |
1179 | String id = attributes.get("id"); | 1179 | String id = attributes.get("id"); |
1180 | String str = encloseContents("div", "screen", encloseContents("pre", contents)); | 1180 | String str = encloseContents("div", "screen", encloseContents("pre", contents.replace("<", "<"))); |
1181 | if (id != null) { | 1181 | if (id != null) { |
1182 | return "<a name=\"" + id + "\"></a>" + str; | 1182 | return "<a name=\"" + id + "\"></a>" + str; |
1183 | } else { | 1183 | } else { |