Am 03.03.2017 um 19:20 schrieb sebb:
On 3 March 2017 at 18:07, Felix Schumacher
<[email protected]> wrote:
Am 03.03.2017 um 18:51 schrieb sebb:
On 1 March 2017 at 17:37, Felix Schumacher
<[email protected]> wrote:
Am 01.03.2017 um 14:00 schrieb sebb:
On 8 October 2016 at 16:26,  <[email protected]> wrote:
Author: fschumacher
Date: Sat Oct  8 15:26:31 2016
New Revision: 1763904

URL: http://svn.apache.org/viewvc?rev=1763904&view=rev
Log:
Apply stylesheet recursively to code and source elements.
-1

Just discovered that this has broken several pages, for example

get-started.html
1.4.7 Logging and error messages
I have applied a fix. I think it is OK now.
There's still an issue - most of the <pre> blocks now have spurious
spaces or line-breaks.
This messes up the layout.

It's particularly noticeable for properties reference 20.22  - the
'mode' description

Also the code items on that page have leading and/or trailing spaces
which look odd.
That's nothing new. Look at any link. The link will be too wide, which looks
odd. Same for bold or other emphasized text fragments. That is one reason,
why I would like to get rid of vsl.

I think the change should be reverted for both <source> and <code>.
That would mean, that we would have to change the documentation, as there
are code/source elements, that have embedded other elements. Those would not
work any more (and have been the reason for the original change).

I will have a look at it.

Most probably the macros would have to be written with less spaces in
between them.
That would help, but is going to be tedious.

Or we don't allow embedded elements in code and/or source?
Are there many occurrences of these?

A hack would be to have two versions - the original and the new one
that uses runloop.
Have a look at r1785358, I hope it satisfies you (at least for the moment). The strange new lines in 20.22 are gone. As a plus, the links are shortened, also.

The trick is to put comments at the end of lines, that are not really line endings. The comment for velocity seems to be "##".

Felix

Regards,
  Felix

The subsequent fix (r1785002) seems OK.

Thanks for spotting this.
   Felix

Modified:
       jmeter/trunk/xdocs/stylesheets/site_printable.vsl

Modified: jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL:

http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=1763904&r1=1763903&r2=1763904&view=diff


==============================================================================
--- jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jmeter/trunk/xdocs/stylesheets/site_printable.vsl Sat Oct  8
15:26:31
2016
@@ -133,7 +133,7 @@ $value.content
    #end

    #macro ( code $value)
-<tt class="code">$escape.getText($value.getText())</tt>
+<tt class="code">#runloop($value)</tt>
    #end

    #macro ( source $value)
@@ -146,7 +146,7 @@ $value.content
    </tr>
    <tr>
    <td bgcolor="#023264" width="1"><img src="/images/void.gif"
width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
-<td
bgcolor="#ffffff"><pre>$escape.getText($value.getText())</pre></td>
+<td bgcolor="#ffffff"><pre>#runloop($value)</pre></td>
    <td bgcolor="#023264" width="1"><img src="/images/void.gif"
width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
    </tr>
    <tr>



Reply via email to