Skip to content

C
cpython
Commit f75f2591 authored by Fred Drake's avatar Fred Drake
Browse files
Options

Support environments {fulllineitems} and {classdesc}, more of the new logical 

markup.

The info generation now works, yet again.
parent fcef27c5
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 24 deletions
Doc/partparse.py
View file @ f75f2591
...@@ -1334,7 +1334,7 @@ def changeit(buf, pp): ...@@ -1334,7 +1334,7 @@ def changeit(buf, pp):
chunk(GROUP, ch.where, [])] chunk(GROUP, ch.where, [])]
length, i = length+2, i+2 length, i = length+2, i+2
elif envname in ('itemize', 'list'): elif envname in ('itemize', 'list', 'fulllineitems'):
if hist.itemizenesting > len(itemizesymbols): if hist.itemizenesting > len(itemizesymbols):
raise error, 'too deep itemize nesting' raise error, 'too deep itemize nesting'
if envname == 'list': if envname == 'list':
...@@ -1419,12 +1419,11 @@ def changeit(buf, pp): ...@@ -1419,12 +1419,11 @@ def changeit(buf, pp):
if length != len(pp): if length != len(pp):
raise 'STILL, SOMETHING wrong', `i` raise 'STILL, SOMETHING wrong', `i`
elif envname in ('funcdesc', 'funcdescni', 'classdesc'):
elif envname in ('funcdesc', 'funcdescni'):
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
i, length = i+1, length+1 i, length = i+1, length+1
length, i = do_funcdesc(length, buf, pp, i, length, i = do_funcdesc(length, buf, pp, i,
envname=="funcdesc") envname[-2:] != "ni")
elif envname == 'excdesc': elif envname == 'excdesc':
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
...@@ -1435,7 +1434,7 @@ def changeit(buf, pp): ...@@ -1435,7 +1434,7 @@ def changeit(buf, pp):
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
i, length = i+1, length+1 i, length = i+1, length+1
length, i = do_datadesc(length, buf, pp, i, length, i = do_datadesc(length, buf, pp, i,
envname=="datadesc") envname[-2:] != "ni")
elif envname == 'opcodedesc': elif envname == 'opcodedesc':
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
...@@ -1472,7 +1471,7 @@ def changeit(buf, pp): ...@@ -1472,7 +1471,7 @@ def changeit(buf, pp):
chunk(GROUP, ch.where, [ chunk(GROUP, ch.where, [
chunk(PLAIN, ch.where, 'example')])] chunk(PLAIN, ch.where, 'example')])]
i, length = i+2, length+2 i, length = i+2, length+2
elif envname in ('itemize', 'list'): elif envname in ('itemize', 'list', 'fulllineitems'):
hist.itemizenesting = hist.itemizenesting - 1 hist.itemizenesting = hist.itemizenesting - 1
pp[i:i] = [chunk(CSLINE, ch.where, 'end'), pp[i:i] = [chunk(CSLINE, ch.where, 'end'),
chunk(GROUP, ch.where, [ chunk(GROUP, ch.where, [
...@@ -1497,7 +1496,7 @@ def changeit(buf, pp): ...@@ -1497,7 +1496,7 @@ def changeit(buf, pp):
pp.insert(i, chunk(DENDLINE, ch.where, '\n')) pp.insert(i, chunk(DENDLINE, ch.where, '\n'))
i, length = i+1, length+1 i, length = i+1, length+1
elif envname in ('funcdesc', 'excdesc', 'datadesc', elif envname in ('funcdesc', 'excdesc', 'datadesc', 'classdesc',
'funcdescni', 'datadescni'): 'funcdescni', 'datadescni'):
pp[i:i] = [chunk(CSLINE, ch.where, 'end'), pp[i:i] = [chunk(CSLINE, ch.where, 'end'),
chunk(GROUP, ch.where, [ chunk(GROUP, ch.where, [
...@@ -1597,10 +1596,6 @@ def changeit(buf, pp): ...@@ -1597,10 +1596,6 @@ def changeit(buf, pp):
elif s_buf_data == 'program': elif s_buf_data == 'program':
ch.data = "strong" ch.data = "strong"
elif s_buf_data == "fulllineitems":
del pp[i-1]
i, length = i-1, length-1
elif s_buf_data == 'item': elif s_buf_data == 'item':
ch.chtype = chunk_type[CSLINE] ch.chtype = chunk_type[CSLINE]
length, newi = getoptarg(length, buf, pp, i) length, newi = getoptarg(length, buf, pp, i)
...@@ -2093,7 +2088,7 @@ def changeit(buf, pp): ...@@ -2093,7 +2088,7 @@ def changeit(buf, pp):
elif s_buf_data in ('url', 'module', 'function', 'cfunction', elif s_buf_data in ('url', 'module', 'function', 'cfunction',
'keyword', 'method', 'exception', 'constant', 'keyword', 'method', 'exception', 'constant',
'email', 'class'): 'email', 'class', 'member', 'cdata', 'ctype'):
ch.data = "code" ch.data = "code"
elif s_buf_data == 'label': elif s_buf_data == 'label':
......
Doc/tools/partparse.py
View file @ f75f2591
...@@ -1334,7 +1334,7 @@ def changeit(buf, pp): ...@@ -1334,7 +1334,7 @@ def changeit(buf, pp):
chunk(GROUP, ch.where, [])] chunk(GROUP, ch.where, [])]
length, i = length+2, i+2 length, i = length+2, i+2
elif envname in ('itemize', 'list'): elif envname in ('itemize', 'list', 'fulllineitems'):
if hist.itemizenesting > len(itemizesymbols): if hist.itemizenesting > len(itemizesymbols):
raise error, 'too deep itemize nesting' raise error, 'too deep itemize nesting'
if envname == 'list': if envname == 'list':
...@@ -1419,12 +1419,11 @@ def changeit(buf, pp): ...@@ -1419,12 +1419,11 @@ def changeit(buf, pp):
if length != len(pp): if length != len(pp):
raise 'STILL, SOMETHING wrong', `i` raise 'STILL, SOMETHING wrong', `i`
elif envname in ('funcdesc', 'funcdescni', 'classdesc'):
elif envname in ('funcdesc', 'funcdescni'):
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
i, length = i+1, length+1 i, length = i+1, length+1
length, i = do_funcdesc(length, buf, pp, i, length, i = do_funcdesc(length, buf, pp, i,
envname=="funcdesc") envname[-2:] != "ni")
elif envname == 'excdesc': elif envname == 'excdesc':
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
...@@ -1435,7 +1434,7 @@ def changeit(buf, pp): ...@@ -1435,7 +1434,7 @@ def changeit(buf, pp):
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
i, length = i+1, length+1 i, length = i+1, length+1
length, i = do_datadesc(length, buf, pp, i, length, i = do_datadesc(length, buf, pp, i,
envname=="datadesc") envname[-2:] != "ni")
elif envname == 'opcodedesc': elif envname == 'opcodedesc':
pp.insert(i, chunk(PLAIN, ch.where, '')) pp.insert(i, chunk(PLAIN, ch.where, ''))
...@@ -1472,7 +1471,7 @@ def changeit(buf, pp): ...@@ -1472,7 +1471,7 @@ def changeit(buf, pp):
chunk(GROUP, ch.where, [ chunk(GROUP, ch.where, [
chunk(PLAIN, ch.where, 'example')])] chunk(PLAIN, ch.where, 'example')])]
i, length = i+2, length+2 i, length = i+2, length+2
elif envname in ('itemize', 'list'): elif envname in ('itemize', 'list', 'fulllineitems'):
hist.itemizenesting = hist.itemizenesting - 1 hist.itemizenesting = hist.itemizenesting - 1
pp[i:i] = [chunk(CSLINE, ch.where, 'end'), pp[i:i] = [chunk(CSLINE, ch.where, 'end'),
chunk(GROUP, ch.where, [ chunk(GROUP, ch.where, [
...@@ -1497,7 +1496,7 @@ def changeit(buf, pp): ...@@ -1497,7 +1496,7 @@ def changeit(buf, pp):
pp.insert(i, chunk(DENDLINE, ch.where, '\n')) pp.insert(i, chunk(DENDLINE, ch.where, '\n'))
i, length = i+1, length+1 i, length = i+1, length+1
elif envname in ('funcdesc', 'excdesc', 'datadesc', elif envname in ('funcdesc', 'excdesc', 'datadesc', 'classdesc',
'funcdescni', 'datadescni'): 'funcdescni', 'datadescni'):
pp[i:i] = [chunk(CSLINE, ch.where, 'end'), pp[i:i] = [chunk(CSLINE, ch.where, 'end'),
chunk(GROUP, ch.where, [ chunk(GROUP, ch.where, [
...@@ -1597,10 +1596,6 @@ def changeit(buf, pp): ...@@ -1597,10 +1596,6 @@ def changeit(buf, pp):
elif s_buf_data == 'program': elif s_buf_data == 'program':
ch.data = "strong" ch.data = "strong"
elif s_buf_data == "fulllineitems":
del pp[i-1]
i, length = i-1, length-1
elif s_buf_data == 'item': elif s_buf_data == 'item':
ch.chtype = chunk_type[CSLINE] ch.chtype = chunk_type[CSLINE]
length, newi = getoptarg(length, buf, pp, i) length, newi = getoptarg(length, buf, pp, i)
...@@ -2093,7 +2088,7 @@ def changeit(buf, pp): ...@@ -2093,7 +2088,7 @@ def changeit(buf, pp):
elif s_buf_data in ('url', 'module', 'function', 'cfunction', elif s_buf_data in ('url', 'module', 'function', 'cfunction',
'keyword', 'method', 'exception', 'constant', 'keyword', 'method', 'exception', 'constant',
'email', 'class'): 'email', 'class', 'member', 'cdata', 'ctype'):
ch.data = "code" ch.data = "code"
elif s_buf_data == 'label': elif s_buf_data == 'label':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7