glen/mkdocs-semiliterate
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 11 Wiki Activity

feat: Implement double-quoted filename features. #13

Merged
glen merged 7 commits from quoted_filename into main 2021-02-12 17:11:07 +00:00
Conversation 0 Commits 7 Files Changed 19 +9 -1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10f73a4828 - Show all commits

10
mkdocs_semiliterate/plugin.py
View File

@ -91,9 +91,12 @@ is checked for `{! ... !}`.
# OK, we have found (the start of) an inclusion and must process it # OK, we have found (the start of) an inclusion and must process it
preamble = line[:include_match.start()] preamble = line[:include_match.start()]
remainder = line[include_match.end(1):] remainder = line[include_match.end(1):]
doublequoted = False
body_pattern = StreamInclusion.include_quoted_file body_pattern = StreamInclusion.include_quoted_file
if include_match[2].isspace(): if include_match[2].isspace():
body_pattern = StreamInclusion.include_bare_file body_pattern = StreamInclusion.include_bare_file
elif include_match[2] == '"':
doublequoted = True
body_match = body_pattern.search(remainder) body_match = body_pattern.search(remainder)
if not body_match: if not body_match:
for extra_line in self.input_stream: for extra_line in self.input_stream:
@ -105,7 +108,12 @@ is checked for `{! ... !}`.
errmsg = "semiliterate: End of file while scanning for `!}`" errmsg = "semiliterate: End of file while scanning for `!}`"
utils.log.error(errmsg) utils.log.error(errmsg)
raise EOFError(errmsg) raise EOFError(errmsg)
include_path = self.include_root + '/' + body_match['fn'] filename = body_match['fn']
if doublequoted:
filename = (filename.encode('latin-1', 'backslashreplace')
.decode('unicode-escape'))
include_path = self.include_root + '/' + filename
print(f"Including |{include_path}|")
new_root = re.match(r'(.*)/', include_path)[1] new_root = re.match(r'(.*)/', include_path)[1]
try: try:
include_parameters = yaml.safe_load(body_match['yml']) include_parameters = yaml.safe_load(body_match['yml'])