@@ -71,7 +71,7 @@
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."¶
- This Internet-Draft will expire on July 19, 2024.¶
+ This Internet-Draft will expire on July 29, 2024.
¶
diff --git a/xml2rfc/writers/html.py b/xml2rfc/writers/html.py
index 3ae6a58d..71f2072d 100644
--- a/xml2rfc/writers/html.py
+++ b/xml2rfc/writers/html.py
@@ -2158,18 +2158,14 @@ def render_reference(self, h, x):
self.render(inner, c)
for ctag in ('title', 'refcontent', 'stream', 'seriesInfo', 'date', ):
for c in x.iterdescendants(ctag):
- if p.tag == 'referencegroup' and c.tag == 'seriesInfo' and c.get('name') == 'DOI':
- # Don't render DOI within a reference group
- continue
if len(inner):
inner[-1].tail = ', '
self.render(inner, c)
- if p.tag != 'referencegroup':
- target = x.get('target')
- if len(inner):
- inner[-1].tail = ', '
- if target:
- inner.append( build.span('<', build.a(target, href=target), '>') )
+ target = x.get('target')
+ if len(inner):
+ inner[-1].tail = ', '
+ if target:
+ inner.append( build.span('<', build.a(target, href=target), '>') )
if len(inner):
inner[-1].tail = '. '
for ctag in ('annotation', ):
diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py
index 3d6fb45e..a48a1142 100644
--- a/xml2rfc/writers/text.py
+++ b/xml2rfc/writers/text.py
@@ -2725,16 +2725,12 @@ def render_reference(self, e, width, **kwargs):
elements = []
for ctag in ('title', 'refcontent', 'stream', 'seriesInfo', 'date',):
for c in e.iterdescendants(ctag):
- if p.tag == 'referencegroup' and c.tag == 'seriesInfo' and c.get('name') == 'DOI':
- # Don't render DOI within a reference group
- continue
elements.append(c)
- if p.tag != 'referencegroup':
- target = e.get('target')
- if target:
- url = self.element('refcontent')
- url.text = '<%s>' % target
- elements.append(url)
+ target = e.get('target')
+ if target:
+ url = self.element('refcontent')
+ url.text = '<%s>' % target
+ elements.append(url)
set_joiners(kwargs, {
None: Joiner(', ', 0, 0, False, False),
'annotation': Joiner(' ', 0, 0, False, False),