From d6bf64baaecea3a34c1f272ff2270ec6c1c5ae00 Mon Sep 17 00:00:00 2001 From: Andrew E Slaughter Date: Fri, 14 Dec 2018 08:40:05 -0700 Subject: [PATCH 1/2] Fix regex in MOOSEDocs package extension (refs #12528) --- python/MooseDocs/extensions/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/MooseDocs/extensions/package.py b/python/MooseDocs/extensions/package.py index 642681541b28..06462d9375d6 100644 --- a/python/MooseDocs/extensions/package.py +++ b/python/MooseDocs/extensions/package.py @@ -115,7 +115,7 @@ def defaultSettings(): def createToken(self, parent, info, page): content = info['inline'] if 'inline' in info else info['block'] - content = re.sub(r'__(?P[A-Z]+)__', self.subFunction, content, flags=re.UNICODE) + content = re.sub(r'__(?P[A-Z\_]+)__', self.subFunction, content, flags=re.UNICODE) core.Code(parent, style="max-height:{};".format(self.settings['max-height']), language=self.settings['language'], content=content) return parent From 4f3bd789fd2db796c7f29ad32b6b02e6fa60ad5a Mon Sep 17 00:00:00 2001 From: Andrew E Slaughter Date: Mon, 17 Dec 2018 15:12:11 -0700 Subject: [PATCH 2/2] Remove extract character from regex. --- python/MooseDocs/extensions/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/MooseDocs/extensions/package.py b/python/MooseDocs/extensions/package.py index 06462d9375d6..9a4d9975cdb1 100644 --- a/python/MooseDocs/extensions/package.py +++ b/python/MooseDocs/extensions/package.py @@ -115,7 +115,7 @@ def defaultSettings(): def createToken(self, parent, info, page): content = info['inline'] if 'inline' in info else info['block'] - content = re.sub(r'__(?P[A-Z\_]+)__', self.subFunction, content, flags=re.UNICODE) + content = re.sub(r'__(?P[A-Z_]+)__', self.subFunction, content, flags=re.UNICODE) core.Code(parent, style="max-height:{};".format(self.settings['max-height']), language=self.settings['language'], content=content) return parent