comparison mercurial/minirst.py @ 10983:287a5cdf7743

minirst: correctly format sections containing inline markup

Before, a section like

  ``foo``
  -------

would be formatted as

  "foo"
  -------

We now recompute the length of the underline when formatting the
section.

10982:0a548640e012

        # | -------------                |
        # +------------------------------+
        if (block['type'] == 'paragraph' and
            len(block['lines']) == 2 and
            block['lines'][1] == '-' * len(block['lines'][0])):
            block['type'] = 'section'
    return blocks


def inlineliterals(blocks):
    for b in blocks:
        if b['type'] == 'paragraph':
            b['lines'] = [l.replace('``', '"') for l in b['lines']]
    return blocks


_hgrolere = re.compile(r':hg:`([^`]+)`')

def hgrole(blocks):
    for b in blocks:
        if b['type'] == 'paragraph':
            b['lines'] = [_hgrolere.sub(r'"hg \1"', l) for l in b['lines']]
    return blocks


def addmargins(blocks):

        return ''
    if block['type'] == 'literal':
        indent += '  '
        return indent + ('\n' + indent).join(block['lines'])
    if block['type'] == 'section':
        return indent + ('\n' + indent).join(block['lines'])
    if block['type'] == 'definition':
        term = indent + block['lines'][0]
        hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip())
        defindent = indent + hang * ' '
        text = ' '.join(map(str.strip, block['lines'][1:]))

    blocks = findblocks(text)
    for b in blocks:
        b['indent'] += indent
    blocks = findliteralblocks(blocks)
    blocks, pruned = prunecontainers(blocks, keep or [])
    blocks = inlineliterals(blocks)
    blocks = hgrole(blocks)
    blocks = splitparagraphs(blocks)
    blocks = updatefieldlists(blocks)
    blocks = findsections(blocks)
    blocks = addmargins(blocks)
    text = '\n'.join(formatblock(b, width) for b in blocks)
    if keep is None:
        return text
    else:

10983:287a5cdf7743

        # | -------------                |
        # +------------------------------+
        if (block['type'] == 'paragraph' and
            len(block['lines']) == 2 and
            block['lines'][1] == '-' * len(block['lines'][0])):
            block['underline'] = block['lines'][1][0]
            block['type'] = 'section'
            del block['lines'][1]
    return blocks


def inlineliterals(blocks):
    for b in blocks:
        if b['type'] in ('paragraph', 'section'):
            b['lines'] = [l.replace('``', '"') for l in b['lines']]
    return blocks


_hgrolere = re.compile(r':hg:`([^`]+)`')

def hgrole(blocks):
    for b in blocks:
        if b['type'] in ('paragraph', 'section'):
            b['lines'] = [_hgrolere.sub(r'"hg \1"', l) for l in b['lines']]
    return blocks


def addmargins(blocks):

        return ''
    if block['type'] == 'literal':
        indent += '  '
        return indent + ('\n' + indent).join(block['lines'])
    if block['type'] == 'section':
        underline = len(block['lines'][0]) * block['underline']
        return "%s%s\n%s%s" % (indent, block['lines'][0],indent, underline)
    if block['type'] == 'definition':
        term = indent + block['lines'][0]
        hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip())
        defindent = indent + hang * ' '
        text = ' '.join(map(str.strip, block['lines'][1:]))

    blocks = findblocks(text)
    for b in blocks:
        b['indent'] += indent
    blocks = findliteralblocks(blocks)
    blocks, pruned = prunecontainers(blocks, keep or [])
    blocks = findsections(blocks)
    blocks = inlineliterals(blocks)
    blocks = hgrole(blocks)
    blocks = splitparagraphs(blocks)
    blocks = updatefieldlists(blocks)
    blocks = addmargins(blocks)
    text = '\n'.join(formatblock(b, width) for b in blocks)
    if keep is None:
        return text
    else: