mercurial-scm/hg: mercurial/minirst.py annotate

annotate mercurial/minirst.py @ 15393:87bb6b7644f6 stable

minirst: use unicode string as intermediate form for replacement # this change redones part of 521c8e0c93bf, backed out by 0ad0ebe67815 Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences. [mpm: test changed to simple doctest]

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Mon, 31 Oct 2011 21:06:18 +0900
parents	e8076af14498
children	ee8f5e4ce7b8

rev	line source
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	1 # minirst.py - minimal reStructuredText parser
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	2 #
10443 62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	3 # Copyright 2009, 2010 Matt Mackall <mpm@selenic.com> and others
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	4 #
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9741 diff changeset	6 # GNU General Public License version 2 or any later version.
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	7
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	8 """simplified reStructuredText parser.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	9
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	10 This parser knows just enough about reStructuredText to parse the
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	11 Mercurial docstrings.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	12
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	13 It cheats in a major way: nested blocks are not really nested. They
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	14 are just indented blocks that look like they are nested. This relies
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	15 on the user to keep the right indentation for the blocks.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	16
12958 8957c39867f6 minirst: link to HelpStyleGuide in docstring Martin Geisler <mg@aragost.com> parents: 12867 diff changeset	17 Remember to update http://mercurial.selenic.com/wiki/HelpStyleGuide
8957c39867f6 minirst: link to HelpStyleGuide in docstring Martin Geisler <mg@aragost.com> parents: 12867 diff changeset	18 when adding support for new constructs.
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	19 """
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	20
15038 3f4d337cb80a minirst: drop debug code Matt Mackall <mpm@selenic.com> parents: 15037 diff changeset	21 import re
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	22 import util, encoding
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	23 from i18n import _
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	24
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	25 def replace(text, substs):
15393 87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	26 '''
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	27 Apply a list of (find, replace) pairs to a text.
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	28
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	29 >>> replace("foo bar", [('f', 'F'), ('b', 'B')])
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	30 'Foo Bar'
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	31 >>> encoding.encoding = 'latin1'
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	32 >>> replace('\\x81\\\\', [('\\\\', '/')])
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	33 '\\x81/'
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	34 >>> encoding.encoding = 'shiftjis'
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	35 >>> replace('\\x81\\\\', [('\\\\', '/')])
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	36 '\\x81\\\\'
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	37 '''
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	38
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	39 # some character encodings (cp932 for Japanese, at least) use
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	40 # ASCII characters other than control/alphabet/digit as a part of
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	41 # multi-bytes characters, so direct replacing with such characters
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	42 # on strings in local encoding causes invalid byte sequences.
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	43 utext = text.decode(encoding.encoding)
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	44 for f, t in substs:
15393 87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	45 utext = utext.replace(f, t)
87bb6b7644f6 minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15262 diff changeset	46 return utext.encode(encoding.encoding)
12651 17f28de168a4 minirst: refactor/simplify findblocks Martin Geisler <mg@lazybytes.net> parents: 12620 diff changeset	47
17f28de168a4 minirst: refactor/simplify findblocks Martin Geisler <mg@lazybytes.net> parents: 12620 diff changeset	48 _blockre = re.compile(r"\n(?:\s*\n)+")
17f28de168a4 minirst: refactor/simplify findblocks Martin Geisler <mg@lazybytes.net> parents: 12620 diff changeset	49
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	50 def findblocks(text):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	51 """Find continuous blocks of lines in text.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	52
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	53 Returns a list of dictionaries representing the blocks. Each block
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	54 has an 'indent' field and a 'lines' field.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	55 """
12651 17f28de168a4 minirst: refactor/simplify findblocks Martin Geisler <mg@lazybytes.net> parents: 12620 diff changeset	56 blocks = []
15036 bb96e12a3242 minirst: only strip leading newlines, not indentation Matt Mackall <mpm@selenic.com> parents: 15015 diff changeset	57 for b in _blockre.split(text.lstrip('\n').rstrip()):
12651 17f28de168a4 minirst: refactor/simplify findblocks Martin Geisler <mg@lazybytes.net> parents: 12620 diff changeset	58 lines = b.splitlines()
15123 9b41ccb2043e minirst: don't choke on empty text Matt Mackall <mpm@selenic.com> parents: 15122 diff changeset	59 if lines:
9b41ccb2043e minirst: don't choke on empty text Matt Mackall <mpm@selenic.com> parents: 15122 diff changeset	60 indent = min((len(l) - len(l.lstrip())) for l in lines)
9b41ccb2043e minirst: don't choke on empty text Matt Mackall <mpm@selenic.com> parents: 15122 diff changeset	61 lines = [l[indent:] for l in lines]
9b41ccb2043e minirst: don't choke on empty text Matt Mackall <mpm@selenic.com> parents: 15122 diff changeset	62 blocks.append(dict(indent=indent, lines=lines))
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	63 return blocks
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	64
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	65 def findliteralblocks(blocks):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	66 """Finds literal blocks and adds a 'type' field to the blocks.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	67
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	68 Literal blocks are given the type 'literal', all other blocks are
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	69 given type the 'paragraph'.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	70 """
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	71 i = 0
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	72 while i < len(blocks):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	73 # Searching for a block that looks like this:
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	74 #
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	75 # +------------------------------+
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	76 # \| paragraph \|
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	77 # \| (ends with "::") \|
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	78 # +------------------------------+
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	79 # +---------------------------+
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	80 # \| indented literal block \|
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	81 # +---------------------------+
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	82 blocks[i]['type'] = 'paragraph'
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	83 if blocks[i]['lines'][-1].endswith('::') and i + 1 < len(blocks):
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	84 indent = blocks[i]['indent']
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	85 adjustment = blocks[i + 1]['indent'] - indent
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	86
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	87 if blocks[i]['lines'] == ['::']:
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	88 # Expanded form: remove block
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	89 del blocks[i]
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	90 i -= 1
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	91 elif blocks[i]['lines'][-1].endswith(' ::'):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	92 # Partially minimized form: remove space and both
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	93 # colons.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	94 blocks[i]['lines'][-1] = blocks[i]['lines'][-1][:-3]
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	95 else:
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	96 # Fully minimized form: remove just one colon.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	97 blocks[i]['lines'][-1] = blocks[i]['lines'][-1][:-1]
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	98
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	99 # List items are formatted with a hanging indent. We must
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	100 # correct for this here while we still have the original
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	101 # information on the indentation of the subsequent literal
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	102 # blocks available.
9738 f52c4f7a4732 minirst: prepare for general types of bullet lists Martin Geisler <mg@lazybytes.net> parents: 9737 diff changeset	103 m = _bulletre.match(blocks[i]['lines'][0])
f52c4f7a4732 minirst: prepare for general types of bullet lists Martin Geisler <mg@lazybytes.net> parents: 9737 diff changeset	104 if m:
f52c4f7a4732 minirst: prepare for general types of bullet lists Martin Geisler <mg@lazybytes.net> parents: 9737 diff changeset	105 indent += m.end()
f52c4f7a4732 minirst: prepare for general types of bullet lists Martin Geisler <mg@lazybytes.net> parents: 9737 diff changeset	106 adjustment -= m.end()
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	107
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	108 # Mark the following indented blocks.
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	109 while i + 1 < len(blocks) and blocks[i + 1]['indent'] > indent:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	110 blocks[i + 1]['type'] = 'literal'
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	111 blocks[i + 1]['indent'] -= adjustment
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	112 i += 1
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	113 i += 1
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	114 return blocks
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	115
10447 e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	116 _bulletre = re.compile(r'(-\|[0-9A-Za-z]+\.\|$?[0-9A-Za-z]+$\|\\|) ')
13011 4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	117 _optionre = re.compile(r'^(-([a-zA-Z0-9]), )?(--[a-z0-9-]+)'
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	118 r'((.) +)(.)$')
10065 a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	119 _fieldre = re.compile(r':(?![: ])([^:])(?<! ):[ ]+(.)')
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	120 _definitionre = re.compile(r'[^ ]')
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	121 _tablere = re.compile(r'(=+\s+)*=+')
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	122
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	123 def splitparagraphs(blocks):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	124 """Split paragraphs into lists."""
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	125 # Tuples with (list type, item regexp, single line items?). Order
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	126 # matters: definition lists has the least specific regexp and must
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	127 # come last.
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	128 listtypes = [('bullet', _bulletre, True),
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	129 ('option', _optionre, True),
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	130 ('field', _fieldre, True),
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	131 ('definition', _definitionre, False)]
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	132
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	133 def match(lines, i, itemre, singleline):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	134 """Does itemre match an item at line i?
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	135
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	136 A list item can be followed by an idented line or another list
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	137 item (but only if singleline is True).
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	138 """
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	139 line1 = lines[i]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	140 line2 = i + 1 < len(lines) and lines[i + 1] or ''
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	141 if not itemre.match(line1):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	142 return False
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	143 if singleline:
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	144 return line2 == '' or line2[0] == ' ' or itemre.match(line2)
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	145 else:
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	146 return line2.startswith(' ')
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	147
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	148 i = 0
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	149 while i < len(blocks):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	150 if blocks[i]['type'] == 'paragraph':
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	151 lines = blocks[i]['lines']
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	152 for type, itemre, singleline in listtypes:
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	153 if match(lines, 0, itemre, singleline):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	154 items = []
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	155 for j, line in enumerate(lines):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	156 if match(lines, j, itemre, singleline):
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	157 items.append(dict(type=type, lines=[],
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	158 indent=blocks[i]['indent']))
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	159 items[-1]['lines'].append(line)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	160 blocks[i:i + 1] = items
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	161 break
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	162 i += 1
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	163 return blocks
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	164
10065 a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	165 _fieldwidth = 12
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	166
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	167 def updatefieldlists(blocks):
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	168 """Find key and maximum key width for field lists."""
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	169 i = 0
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	170 while i < len(blocks):
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	171 if blocks[i]['type'] != 'field':
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	172 i += 1
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	173 continue
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	174
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	175 keywidth = 0
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	176 j = i
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	177 while j < len(blocks) and blocks[j]['type'] == 'field':
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	178 m = _fieldre.match(blocks[j]['lines'][0])
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	179 key, rest = m.groups()
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	180 blocks[j]['lines'][0] = rest
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	181 blocks[j]['key'] = key
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	182 keywidth = max(keywidth, len(key))
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	183 j += 1
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	184
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	185 for block in blocks[i:j]:
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	186 block['keywidth'] = keywidth
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	187 i = j + 1
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	188
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	189 return blocks
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	190
13011 4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	191 def updateoptionlists(blocks):
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	192 i = 0
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	193 while i < len(blocks):
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	194 if blocks[i]['type'] != 'option':
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	195 i += 1
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	196 continue
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	197
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	198 optstrwidth = 0
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	199 j = i
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	200 while j < len(blocks) and blocks[j]['type'] == 'option':
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	201 m = _optionre.match(blocks[j]['lines'][0])
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	202
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	203 shortoption = m.group(2)
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	204 group3 = m.group(3)
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	205 longoption = group3[2:].strip()
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	206 desc = m.group(6).strip()
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	207 longoptionarg = m.group(5).strip()
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	208 blocks[j]['lines'][0] = desc
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	209
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	210 noshortop = ''
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	211 if not shortoption:
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	212 noshortop = ' '
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	213
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	214 opt = "%s%s" % (shortoption and "-%s " % shortoption or '',
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	215 ("%s--%s %s") % (noshortop, longoption,
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	216 longoptionarg))
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	217 opt = opt.rstrip()
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	218 blocks[j]['optstr'] = opt
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	219 optstrwidth = max(optstrwidth, encoding.colwidth(opt))
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	220 j += 1
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	221
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	222 for block in blocks[i:j]:
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	223 block['optstrwidth'] = optstrwidth
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	224 i = j + 1
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	225 return blocks
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	226
10443 62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	227 def prunecontainers(blocks, keep):
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	228 """Prune unwanted containers.
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	229
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	230 The blocks must have a 'type' field, i.e., they should have been
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	231 run through findliteralblocks first.
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	232 """
10444 e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	233 pruned = []
10443 62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	234 i = 0
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	235 while i + 1 < len(blocks):
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	236 # Searching for a block that looks like this:
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	237 #
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	238 # +-------+---------------------------+
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	239 # \| ".. container ::" type \|
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	240 # +---+ \|
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	241 # \| blocks \|
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	242 # +-------------------------------+
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	243 if (blocks[i]['type'] == 'paragraph' and
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	244 blocks[i]['lines'][0].startswith('.. container::')):
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	245 indent = blocks[i]['indent']
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	246 adjustment = blocks[i + 1]['indent'] - indent
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	247 containertype = blocks[i]['lines'][0][15:]
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	248 prune = containertype not in keep
10444 e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	249 if prune:
e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	250 pruned.append(containertype)
10443 62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	251
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	252 # Always delete "..container:: type" block
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	253 del blocks[i]
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	254 j = i
15102 a7e375d087f6 minirst: fix container stripping logic Matt Mackall <mpm@selenic.com> parents: 15039 diff changeset	255 i -= 1
10443 62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	256 while j < len(blocks) and blocks[j]['indent'] > indent:
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	257 if prune:
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	258 del blocks[j]
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	259 else:
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	260 blocks[j]['indent'] -= adjustment
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	261 j += 1
62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	262 i += 1
10444 e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	263 return blocks, pruned
10443 62d484a81dfe minirst: support containers Martin Geisler <mg@lazybytes.net> parents: 10282 diff changeset	264
10984 68b7d2d668ce minirst: support all recommended title adornments Martin Geisler <mg@lazybytes.net> parents: 10983 diff changeset	265 _sectionre = re.compile(r"""^([-=`:.'"~^_*+#])\1+$""")
68b7d2d668ce minirst: support all recommended title adornments Martin Geisler <mg@lazybytes.net> parents: 10983 diff changeset	266
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	267 def findtables(blocks):
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	268 '''Find simple tables
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	269
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	270 Only simple one-line table elements are supported
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	271 '''
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	272
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	273 for block in blocks:
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	274 # Searching for a block that looks like this:
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	275 #
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	276 # === ==== ===
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	277 # A B C
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	278 # === ==== === <- optional
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	279 # 1 2 3
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	280 # x y z
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	281 # === ==== ===
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	282 if (block['type'] == 'paragraph' and
15192 3834ca04664a rst: fix detection of single-row tables Matt Mackall <mpm@selenic.com> parents: 15145 diff changeset	283 len(block['lines']) > 2 and
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	284 _tablere.match(block['lines'][0]) and
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	285 block['lines'][0] == block['lines'][-1]):
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	286 block['type'] = 'table'
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	287 block['header'] = False
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	288 div = block['lines'][0]
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	289
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	290 # column markers are ASCII so we can calculate column
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	291 # position in bytes
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	292 columns = [x for x in xrange(len(div))
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	293 if div[x] == '=' and (x == 0 or div[x - 1] == ' ')]
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	294 rows = []
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	295 for l in block['lines'][1:-1]:
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	296 if l == div:
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	297 block['header'] = True
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	298 continue
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	299 row = []
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	300 # we measure columns not in bytes or characters but in
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	301 # colwidth which makes things tricky
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	302 pos = columns[0] # leading whitespace is bytes
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	303 for n, start in enumerate(columns):
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	304 if n + 1 < len(columns):
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	305 width = columns[n + 1] - start
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	306 v = encoding.getcols(l, pos, width) # gather columns
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	307 pos += len(v) # calculate byte position of end
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	308 row.append(v.strip())
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	309 else:
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	310 row.append(l[pos:].strip())
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	311 rows.append(row)
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	312
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	313 block['table'] = rows
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	314
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	315 return blocks
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	316
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	317 def findsections(blocks):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	318 """Finds sections.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	319
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	320 The blocks must have a 'type' field, i.e., they should have been
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	321 run through findliteralblocks first.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	322 """
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	323 for block in blocks:
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	324 # Searching for a block that looks like this:
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	325 #
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	326 # +------------------------------+
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	327 # \| Section title \|
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	328 # \| ------------- \|
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	329 # +------------------------------+
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	330 if (block['type'] == 'paragraph' and
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	331 len(block['lines']) == 2 and
12867 eda77c3e246a minirst: use colwidth to match title lengths (issue2455) Matt Mackall <mpm@selenic.com> parents: 12819 diff changeset	332 encoding.colwidth(block['lines'][0]) == len(block['lines'][1]) and
10984 68b7d2d668ce minirst: support all recommended title adornments Martin Geisler <mg@lazybytes.net> parents: 10983 diff changeset	333 _sectionre.match(block['lines'][1])):
10983 287a5cdf7743 minirst: correctly format sections containing inline markup Martin Geisler <mg@lazybytes.net> parents: 10972 diff changeset	334 block['underline'] = block['lines'][1][0]
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	335 block['type'] = 'section'
10983 287a5cdf7743 minirst: correctly format sections containing inline markup Martin Geisler <mg@lazybytes.net> parents: 10972 diff changeset	336 del block['lines'][1]
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	337 return blocks
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	338
9623 32727ce029de minirst: convert ``foo`` into "foo" upon display Martin Geisler <mg@lazybytes.net> parents: 9540 diff changeset	339 def inlineliterals(blocks):
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	340 substs = [('``', '"')]
9623 32727ce029de minirst: convert ``foo`` into "foo" upon display Martin Geisler <mg@lazybytes.net> parents: 9540 diff changeset	341 for b in blocks:
10983 287a5cdf7743 minirst: correctly format sections containing inline markup Martin Geisler <mg@lazybytes.net> parents: 10972 diff changeset	342 if b['type'] in ('paragraph', 'section'):
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	343 b['lines'] = [replace(l, substs) for l in b['lines']]
9623 32727ce029de minirst: convert ``foo`` into "foo" upon display Martin Geisler <mg@lazybytes.net> parents: 9540 diff changeset	344 return blocks
32727ce029de minirst: convert ``foo`` into "foo" upon display Martin Geisler <mg@lazybytes.net> parents: 9540 diff changeset	345
10972 0a2c6948f5f4 doc, minirst: support hg interpreted text role Martin Geisler <mg@aragost.com> parents: 10937 diff changeset	346 def hgrole(blocks):
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	347 substs = [(':hg:`', '"hg '), ('`', '"')]
10972 0a2c6948f5f4 doc, minirst: support hg interpreted text role Martin Geisler <mg@aragost.com> parents: 10937 diff changeset	348 for b in blocks:
10983 287a5cdf7743 minirst: correctly format sections containing inline markup Martin Geisler <mg@lazybytes.net> parents: 10972 diff changeset	349 if b['type'] in ('paragraph', 'section'):
11192 babf9a5f5528 minirst: handle line breaks in hg role Martin Geisler <mg@aragost.com> parents: 11189 diff changeset	350 # Turn :hg:`command` into "hg command". This also works
babf9a5f5528 minirst: handle line breaks in hg role Martin Geisler <mg@aragost.com> parents: 11189 diff changeset	351 # when there is a line break in the command and relies on
babf9a5f5528 minirst: handle line breaks in hg role Martin Geisler <mg@aragost.com> parents: 11189 diff changeset	352 # the fact that we have no stray back-quotes in the input
babf9a5f5528 minirst: handle line breaks in hg role Martin Geisler <mg@aragost.com> parents: 11189 diff changeset	353 # (run the blocks through inlineliterals first).
11464 521c8e0c93bf minirst: use unicode string as intermediate form for replacement FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11297 diff changeset	354 b['lines'] = [replace(l, substs) for l in b['lines']]
10972 0a2c6948f5f4 doc, minirst: support hg interpreted text role Martin Geisler <mg@aragost.com> parents: 10937 diff changeset	355 return blocks
0a2c6948f5f4 doc, minirst: support hg interpreted text role Martin Geisler <mg@aragost.com> parents: 10937 diff changeset	356
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	357 def addmargins(blocks):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	358 """Adds empty blocks for vertical spacing.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	359
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	360 This groups bullets, options, and definitions together with no vertical
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	361 space between them, and adds an empty block between all other blocks.
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	362 """
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	363 i = 1
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	364 while i < len(blocks):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	365 if (blocks[i]['type'] == blocks[i - 1]['type'] and
10936 2853c891ac41 minirst: add margin around definition items Martin Geisler <mg@lazybytes.net> parents: 10447 diff changeset	366 blocks[i]['type'] in ('bullet', 'option', 'field')):
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	367 i += 1
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	368 else:
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	369 blocks.insert(i, dict(lines=[''], indent=0, type='margin'))
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	370 i += 2
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	371 return blocks
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	372
12819 5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	373 def prunecomments(blocks):
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	374 """Remove comments."""
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	375 i = 0
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	376 while i < len(blocks):
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	377 b = blocks[i]
13009 54be08fa4d1d minirst: modified minirst to also recognize empty comments. Erik Zielke <ez@aragost.com> parents: 13003 diff changeset	378 if b['type'] == 'paragraph' and (b['lines'][0].startswith('.. ') or
54be08fa4d1d minirst: modified minirst to also recognize empty comments. Erik Zielke <ez@aragost.com> parents: 13003 diff changeset	379 b['lines'] == ['..']):
12819 5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	380 del blocks[i]
13003 876a931dd230 minirst: better interaction between comments and margins Martin Geisler <mg@aragost.com> parents: 12958 diff changeset	381 if i < len(blocks) and blocks[i]['type'] == 'margin':
876a931dd230 minirst: better interaction between comments and margins Martin Geisler <mg@aragost.com> parents: 12958 diff changeset	382 del blocks[i]
12819 5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	383 else:
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	384 i += 1
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	385 return blocks
5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	386
12620 9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	387 _admonitionre = re.compile(r"\.\. (admonition\|attention\|caution\|danger\|"
9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	388 r"error\|hint\|important\|note\|tip\|warning)::",
9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	389 flags=re.IGNORECASE)
9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	390
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	391 def findadmonitions(blocks):
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	392 """
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	393 Makes the type of the block an admonition block if
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	394 the first line is an admonition directive
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	395 """
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	396 i = 0
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	397 while i < len(blocks):
12620 9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	398 m = _admonitionre.match(blocks[i]['lines'][0])
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	399 if m:
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	400 blocks[i]['type'] = 'admonition'
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	401 admonitiontitle = blocks[i]['lines'][0][3:m.end() - 2].lower()
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	402
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	403 firstline = blocks[i]['lines'][0][m.end() + 1:]
12620 9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	404 if firstline:
9a9312e84e4e minirst: small code cleanup Martin Geisler <mg@lazybytes.net> parents: 12388 diff changeset	405 blocks[i]['lines'].insert(1, ' ' + firstline)
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	406
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	407 blocks[i]['admonitiontitle'] = admonitiontitle
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	408 del blocks[i]['lines'][0]
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	409 i = i + 1
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	410 return blocks
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	411
12652 3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	412 _admonitiontitles = {'attention': _('Attention:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	413 'caution': _('Caution:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	414 'danger': _('!Danger!') ,
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	415 'error': _('Error:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	416 'hint': _('Hint:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	417 'important': _('Important:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	418 'note': _('Note:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	419 'tip': _('Tip:'),
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	420 'warning': _('Warning!')}
3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	421
13011 4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	422 def formatoption(block, width):
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	423 desc = ' '.join(map(str.strip, block['lines']))
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	424 colwidth = encoding.colwidth(block['optstr'])
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	425 usablewidth = width - 1
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	426 hanging = block['optstrwidth']
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	427 initindent = '%s%s ' % (block['optstr'], ' ' * ((hanging - colwidth)))
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	428 hangindent = ' ' * (encoding.colwidth(initindent) + 1)
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	429 return ' %s\n' % (util.wrap(desc, usablewidth,
13011 4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	430 initindent=initindent,
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	431 hangindent=hangindent))
4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	432
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	433 def formatblock(block, width):
c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	434 """Format a block according to width."""
9417 4c3fb45123e5 util, minirst: do not crash with COLUMNS=0 Martin Geisler <mg@lazybytes.net> parents: 9293 diff changeset	435 if width <= 0:
4c3fb45123e5 util, minirst: do not crash with COLUMNS=0 Martin Geisler <mg@lazybytes.net> parents: 9293 diff changeset	436 width = 78
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	437 indent = ' ' * block['indent']
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	438 if block['type'] == 'admonition':
12652 3c31c0e42b11 minirst: pull admonition titles out formatblock function Martin Geisler <mg@lazybytes.net> parents: 12651 diff changeset	439 admonition = _admonitiontitles[block['admonitiontitle']]
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	440 hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip())
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	441
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	442 defindent = indent + hang * ' '
75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	443 text = ' '.join(map(str.strip, block['lines']))
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	444 return '%s\n%s\n' % (indent + admonition,
bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	445 util.wrap(text, width=width,
bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	446 initindent=defindent,
bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	447 hangindent=defindent))
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	448 if block['type'] == 'margin':
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	449 return '\n'
9735 97d0d910fa5d minirst: remove unnecessary "elif:" statements Martin Geisler <mg@lazybytes.net> parents: 9623 diff changeset	450 if block['type'] == 'literal':
9291 cd5b6a11b607 minirst: indent literal blocks with two spaces Martin Geisler <mg@lazybytes.net> parents: 9156 diff changeset	451 indent += ' '
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	452 return indent + ('\n' + indent).join(block['lines']) + '\n'
9735 97d0d910fa5d minirst: remove unnecessary "elif:" statements Martin Geisler <mg@lazybytes.net> parents: 9623 diff changeset	453 if block['type'] == 'section':
12867 eda77c3e246a minirst: use colwidth to match title lengths (issue2455) Matt Mackall <mpm@selenic.com> parents: 12819 diff changeset	454 underline = encoding.colwidth(block['lines'][0]) * block['underline']
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	455 return "%s%s\n%s%s\n" % (indent, block['lines'][0],indent, underline)
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	456 if block['type'] == 'table':
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	457 table = block['table']
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	458 # compute column widths
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	459 widths = [max([encoding.colwidth(e) for e in c]) for c in zip(*table)]
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	460 text = ''
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	461 span = sum(widths) + len(widths) - 1
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	462 indent = ' ' * block['indent']
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	463 hang = ' ' * (len(indent) + span - widths[-1])
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	464
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	465 for row in table:
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	466 l = []
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	467 for w, v in zip(widths, row):
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	468 pad = ' ' * (w - encoding.colwidth(v))
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	469 l.append(v + pad)
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	470 l = ' '.join(l)
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	471 l = util.wrap(l, width=width, initindent=indent, hangindent=hang)
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	472 if not text and block['header']:
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	473 text = l + '\n' + indent + '-' * (min(width, span)) + '\n'
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	474 else:
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	475 text += l + "\n"
df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	476 return text
9735 97d0d910fa5d minirst: remove unnecessary "elif:" statements Martin Geisler <mg@lazybytes.net> parents: 9623 diff changeset	477 if block['type'] == 'definition':
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	478 term = indent + block['lines'][0]
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	479 hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip())
5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	480 defindent = indent + hang * ' '
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	481 text = ' '.join(map(str.strip, block['lines'][1:]))
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	482 return '%s\n%s\n' % (term, util.wrap(text, width=width,
bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	483 initindent=defindent,
bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	484 hangindent=defindent))
10937 a9d5943d2a30 minirst: removed unnecessary initindent variable Martin Geisler <mg@lazybytes.net> parents: 10936 diff changeset	485 subindent = indent
9735 97d0d910fa5d minirst: remove unnecessary "elif:" statements Martin Geisler <mg@lazybytes.net> parents: 9623 diff changeset	486 if block['type'] == 'bullet':
10447 e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	487 if block['lines'][0].startswith('\| '):
e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	488 # Remove bullet for line blocks and add no extra
e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	489 # indention.
e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	490 block['lines'][0] = block['lines'][0][2:]
e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	491 else:
e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	492 m = _bulletre.match(block['lines'][0])
e957cc7cbd14 minirst: support line blocks Martin Geisler <mg@lazybytes.net> parents: 10444 diff changeset	493 subindent = indent + m.end() * ' '
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	494 elif block['type'] == 'field':
10065 a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	495 keywidth = block['keywidth']
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	496 key = block['key']
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	497
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	498 subindent = indent + _fieldwidth * ' '
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	499 if len(key) + 2 > _fieldwidth:
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	500 # key too large, use full line width
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	501 key = key.ljust(width)
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	502 elif keywidth + 2 < _fieldwidth:
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	503 # all keys are small, add only two spaces
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	504 key = key.ljust(keywidth + 2)
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	505 subindent = indent + (keywidth + 2) * ' '
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	506 else:
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	507 # mixed sizes, use fieldwidth for this one
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	508 key = key.ljust(_fieldwidth)
a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	509 block['lines'][0] = key + block['lines'][0]
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	510 elif block['type'] == 'option':
13011 4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	511 return formatoption(block, width)
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	512
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	513 text = ' '.join(map(str.strip, block['lines']))
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11192 diff changeset	514 return util.wrap(text, width=width,
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11192 diff changeset	515 initindent=indent,
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	516 hangindent=subindent) + '\n'
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	517
15261 e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	518 def formathtml(blocks):
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	519 """Format RST blocks as HTML"""
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	520
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	521 out = []
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	522 headernest = ''
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	523 listnest = []
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	524
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	525 def openlist(start, level):
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	526 if not listnest or listnest[-1][0] != start:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	527 listnest.append((start, level))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	528 out.append('<%s>\n' % start)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	529
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	530 blocks = [b for b in blocks if b['type'] != 'margin']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	531
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	532 for pos, b in enumerate(blocks):
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	533 btype = b['type']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	534 level = b['indent']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	535 lines = b['lines']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	536
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	537 if btype == 'admonition':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	538 admonition = _admonitiontitles[b['admonitiontitle']]
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	539 text = ' '.join(map(str.strip, lines))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	540 out.append('<p>\n<b>%s</b> %s\n</p>\n' % (admonition, text))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	541 elif btype == 'paragraph':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	542 out.append('<p>\n%s\n</p>\n' % '\n'.join(lines))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	543 elif btype == 'margin':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	544 pass
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	545 elif btype == 'literal':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	546 out.append('<pre>\n%s\n</pre>\n' % '\n'.join(lines))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	547 elif btype == 'section':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	548 i = b['underline']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	549 if i not in headernest:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	550 headernest += i
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	551 level = headernest.index(i) + 1
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	552 out.append('<h%d>%s</h%d>\n' % (level, lines[0], level))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	553 elif btype == 'table':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	554 table = b['table']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	555 t = []
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	556 for row in table:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	557 l = []
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	558 for v in zip(row):
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	559 if not t:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	560 l.append('<th>%s</th>' % v)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	561 else:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	562 l.append('<td>%s</td>' % v)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	563 t.append(' <tr>%s</tr>\n' % ''.join(l))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	564 out.append('<table>\n%s</table>\n' % ''.join(t))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	565 elif btype == 'definition':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	566 openlist('dl', level)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	567 term = lines[0]
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	568 text = ' '.join(map(str.strip, lines[1:]))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	569 out.append(' <dt>%s\n <dd>%s\n' % (term, text))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	570 elif btype == 'bullet':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	571 bullet, head = lines[0].split(' ', 1)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	572 if bullet == '-':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	573 openlist('ul', level)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	574 else:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	575 openlist('ol', level)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	576 out.append(' <li> %s\n' % ' '.join([head] + lines[1:]))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	577 elif btype == 'field':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	578 openlist('dl', level)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	579 key = b['key']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	580 text = ' '.join(map(str.strip, lines))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	581 out.append(' <dt>%s\n <dd>%s\n' % (key, text))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	582 elif btype == 'option':
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	583 openlist('dl', level)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	584 opt = b['optstr']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	585 desc = ' '.join(map(str.strip, lines))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	586 out.append(' <dt>%s\n <dd>%s\n' % (opt, desc))
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	587
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	588 # close lists if indent level of next block is lower
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	589 if listnest:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	590 start, level = listnest[-1]
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	591 if pos == len(blocks) - 1:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	592 out.append('</%s>\n' % start)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	593 listnest.pop()
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	594 else:
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	595 nb = blocks[pos + 1]
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	596 ni = nb['indent']
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	597 if (ni < level or
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	598 (ni == level and
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	599 nb['type'] not in 'definition bullet field option')):
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	600 out.append('</%s>\n' % start)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	601 listnest.pop()
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	602
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	603 return ''.join(out)
e2df5b866d22 minirst: add basic HTML formatting support Matt Mackall <mpm@selenic.com> parents: 15192 diff changeset	604
15012 ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	605 def parse(text, indent=0, keep=None):
ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	606 """Parse text into a list of blocks"""
ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	607 pruned = []
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	608 blocks = findblocks(text)
9540 cad36e496640 help: un-indent help topics Martin Geisler <mg@lazybytes.net> parents: 9417 diff changeset	609 for b in blocks:
cad36e496640 help: un-indent help topics Martin Geisler <mg@lazybytes.net> parents: 9417 diff changeset	610 b['indent'] += indent
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	611 blocks = findliteralblocks(blocks)
15037 df47381b41d6 minirst: add simple table support Matt Mackall <mpm@selenic.com> parents: 15036 diff changeset	612 blocks = findtables(blocks)
10444 e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	613 blocks, pruned = prunecontainers(blocks, keep or [])
10983 287a5cdf7743 minirst: correctly format sections containing inline markup Martin Geisler <mg@lazybytes.net> parents: 10972 diff changeset	614 blocks = findsections(blocks)
9623 32727ce029de minirst: convert ``foo`` into "foo" upon display Martin Geisler <mg@lazybytes.net> parents: 9540 diff changeset	615 blocks = inlineliterals(blocks)
10972 0a2c6948f5f4 doc, minirst: support hg interpreted text role Martin Geisler <mg@aragost.com> parents: 10937 diff changeset	616 blocks = hgrole(blocks)
9737 5f101af4a921 minirst: combine list parsing in one function Martin Geisler <mg@lazybytes.net> parents: 9735 diff changeset	617 blocks = splitparagraphs(blocks)
10065 a1ae0ed78d1a minirst: improve layout of field lists Martin Geisler <mg@lazybytes.net> parents: 10064 diff changeset	618 blocks = updatefieldlists(blocks)
13011 4936a04b6792 minirst: improved support for option lists. Erik Zielke <ez@aragost.com> parents: 13009 diff changeset	619 blocks = updateoptionlists(blocks)
13003 876a931dd230 minirst: better interaction between comments and margins Martin Geisler <mg@aragost.com> parents: 12958 diff changeset	620 blocks = addmargins(blocks)
12819 5082e2f3f8e0 minirst: ignore comments Martin Geisler <mg@lazybytes.net> parents: 12652 diff changeset	621 blocks = prunecomments(blocks)
12388 75f044d4dbf5 minirst: Support for admonitions Erik Zielke <ez@aragost.com> parents: 11464 diff changeset	622 blocks = findadmonitions(blocks)
15012 ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	623 return blocks, pruned
ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	624
15013 4a1e3c761ec7 minirst: add formatblocks helper Matt Mackall <mpm@selenic.com> parents: 15012 diff changeset	625 def formatblocks(blocks, width):
15125 bdc595059108 minirst: end all blocks with newlines Matt Mackall <mpm@selenic.com> parents: 15123 diff changeset	626 text = ''.join(formatblock(b, width) for b in blocks)
15013 4a1e3c761ec7 minirst: add formatblocks helper Matt Mackall <mpm@selenic.com> parents: 15012 diff changeset	627 return text
4a1e3c761ec7 minirst: add formatblocks helper Matt Mackall <mpm@selenic.com> parents: 15012 diff changeset	628
15262 e8076af14498 minirst: add style flag to format Matt Mackall <mpm@selenic.com> parents: 15261 diff changeset	629 def format(text, width=80, indent=0, keep=None, style='plain'):
15012 ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	630 """Parse and format the text according to width."""
ee766af457ed minirst: add parse method to get document structure Matt Mackall <mpm@selenic.com> parents: 14433 diff changeset	631 blocks, pruned = parse(text, indent, keep or [])
15262 e8076af14498 minirst: add style flag to format Matt Mackall <mpm@selenic.com> parents: 15261 diff changeset	632 if style == 'html':
e8076af14498 minirst: add style flag to format Matt Mackall <mpm@selenic.com> parents: 15261 diff changeset	633 text = formathtml(blocks)
e8076af14498 minirst: add style flag to format Matt Mackall <mpm@selenic.com> parents: 15261 diff changeset	634 else:
e8076af14498 minirst: add style flag to format Matt Mackall <mpm@selenic.com> parents: 15261 diff changeset	635 text = ''.join(formatblock(b, width) for b in blocks)
10444 e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	636 if keep is None:
e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	637 return text
e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	638 else:
e99e0e077bc4 minirst: report pruned container types Martin Geisler <mg@lazybytes.net> parents: 10443 diff changeset	639 return text, pruned
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	640
15014 a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	641 def getsections(blocks):
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	642 '''return a list of (section name, nesting level, blocks) tuples'''
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	643 nest = ""
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	644 level = 0
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	645 secs = []
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	646 for b in blocks:
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	647 if b['type'] == 'section':
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	648 i = b['underline']
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	649 if i not in nest:
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	650 nest += i
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	651 level = nest.index(i) + 1
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	652 nest = nest[:level]
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	653 secs.append((b['lines'][0], level, [b]))
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	654 else:
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	655 if not secs:
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	656 # add an initial empty section
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	657 secs = [('', 0, [])]
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	658 secs[-1][2].append(b)
a814e986859f minirst: add getsections helper Matt Mackall <mpm@selenic.com> parents: 15013 diff changeset	659 return secs
9156 c9c7e8cdac9c minimal reStructuredText parser Martin Geisler <mg@lazybytes.net> parents: diff changeset	660
15015 ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	661 def decorateblocks(blocks, width):
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	662 '''generate a list of (section name, line text) pairs for search'''
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	663 lines = []
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	664 for s in getsections(blocks):
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	665 section = s[0]
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	666 text = formatblocks(s[2], width)
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	667 lines.append([(section, l) for l in text.splitlines(True)])
ee6988aea74e minirst: add decorateblocks search helper Matt Mackall <mpm@selenic.com> parents: 15014 diff changeset	668 return lines
15039 c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	669
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	670 def maketable(data, indent=0, header=False):
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	671 '''Generate an RST table for the given table data'''
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	672
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	673 widths = [max(encoding.colwidth(e) for e in c) for c in zip(*data)]
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	674 indent = ' ' * indent
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	675 div = indent + ' '.join('=' * w for w in widths) + '\n'
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	676
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	677 out = [div]
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	678 for row in data:
15144 87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	679 l = []
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	680 for w, v in zip(widths, row):
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	681 pad = ' ' * (w - encoding.colwidth(v))
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	682 l.append(v + pad)
87bb975a1844 minirst: fix column handling for simple tables Matt Mackall <mpm@selenic.com> parents: 15125 diff changeset	683 out.append(indent + ' '.join(l) + "\n")
15039 c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	684 if header and len(data) > 1:
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	685 out.insert(2, div)
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	686 out.append(div)
c981f4a9ea74 minirst: add a helper function to build an RST table from an array Matt Mackall <mpm@selenic.com> parents: 15038 diff changeset	687 return ''.join(out)

Mercurial > public > mercurial-scm > hg

annotate mercurial/minirst.py @ 15393:87bb6b7644f6 stable