Skip to content
Snippets Groups Projects
  • Anton Shestakov's avatar
    a74e9806
    highlight: produce correct markup when there's a blank line just before EOF · a74e9806
    Anton Shestakov authored
    Due to how the colorized output from pygments was stripped of <pre> elements,
    when there was an empty line at the end of a file, highlight extension produced
    an incorrect markup (no closing tags from the fileline/annotateline template).
    It wasn't usually noticeable, because browsers were smart enough to see where
    the missing tags should've been, but in monoblue style it resulted in the last
    line having twice the normal height.
    
    Instead of awkwardly trying to strip outer <pre></pre> tags, let's make the
    formatter with nowrap=True, which should do what we need in pygments since at
    least 0.5 (2006-10-30).
    
    Example from monoblue style:
    
    Before:
    
        <div class="source">
    
    <div style="font-family:monospace" class="parity0">
    <pre><a class="linenr" href="#l1" id="l1">     1</a> </pre>
    </div>
    <div style="font-family:monospace" class="parity1">
    <pre><a class="linenr" href="#l2" id="l2">     2</a>
        </div>
    
    Now:
    
        <div class="source">
    
    <div style="font-family:monospace" class="parity0">
    <pre><a class="linenr" href="#l1" id="l1">     1</a> </pre>
    </div>
    <div style="font-family:monospace" class="parity1">
    <pre><a class="linenr" href="#l2" id="l2">     2</a> </pre>
    </div>
        </div>
    
    (Notice the missing </pre></div> now in place)
    a74e9806
    History
    highlight: produce correct markup when there's a blank line just before EOF
    Anton Shestakov authored
    Due to how the colorized output from pygments was stripped of <pre> elements,
    when there was an empty line at the end of a file, highlight extension produced
    an incorrect markup (no closing tags from the fileline/annotateline template).
    It wasn't usually noticeable, because browsers were smart enough to see where
    the missing tags should've been, but in monoblue style it resulted in the last
    line having twice the normal height.
    
    Instead of awkwardly trying to strip outer <pre></pre> tags, let's make the
    formatter with nowrap=True, which should do what we need in pygments since at
    least 0.5 (2006-10-30).
    
    Example from monoblue style:
    
    Before:
    
        <div class="source">
    
    <div style="font-family:monospace" class="parity0">
    <pre><a class="linenr" href="#l1" id="l1">     1</a> </pre>
    </div>
    <div style="font-family:monospace" class="parity1">
    <pre><a class="linenr" href="#l2" id="l2">     2</a>
        </div>
    
    Now:
    
        <div class="source">
    
    <div style="font-family:monospace" class="parity0">
    <pre><a class="linenr" href="#l1" id="l1">     1</a> </pre>
    </div>
    <div style="font-family:monospace" class="parity1">
    <pre><a class="linenr" href="#l2" id="l2">     2</a> </pre>
    </div>
        </div>
    
    (Notice the missing </pre></div> now in place)
highlight.py 2.20 KiB