Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Lesson_Materials/Image_Convolution/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
#### Input/output image locations
</div>
<div class="container">
<code class="language-cpp" data-line-numbers>
<pre>
<pre><code class="language-cpp" data-line-numbers>

auto inputImageFile = "../Code_Exercises/Images/dogs.png";
auto outputImageFile = ../Code_Exercises/Images/blurred_dogs.png";
</code></pre>
Expand All @@ -166,8 +166,8 @@
#### Convolution filters
</div>
<div class="container">
<code class="language-cpp" data-line-numbers>
<pre>
<pre><code class="language-cpp" data-line-numbers>

auto filter = util::generate_filter(util::filter_type filterType, int width);
</code></pre>
</div>
Expand Down
11 changes: 8 additions & 3 deletions Scripts/LessonChecker.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,12 @@ def handle_starttag(self, tag, attrs):
self._warn(
f"misalligned <code> and <pre> tags in lesson {self.lesson_name} line num: {self.getpos()[0]}"
)
lcode = self.last_code_idx

if "code" in self.output[-1]:
self.output.insert(-1, "<pre>")
assert lcode is not None

if "code" in self.output[lcode]:
self.output.insert(lcode, "<pre>")
return

case _:
Expand All @@ -205,8 +208,10 @@ def handle_starttag(self, tag, attrs):
# Fetch the original case of the impropperly escaped code
raw_tag = self.get_starttag_text()

assert raw_tag is not None

self.output.append(
f"&lt;{raw_tag.lstrip("<").rstrip(">")}&gt;" # pyright: ignore
f"&lt;{raw_tag.lstrip("<").rstrip(">")}&gt;"
)
return

Expand Down
10 changes: 10 additions & 0 deletions Scripts/test_LessonChecker.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@
"expected_return": True,
"expected_output": '<pre><code class="language-cpp" data-line-numbers></code></pre>',
},
{
"name": "fix_mismatched_pre_code_newline_tabs_between_code_pre",
"body": "<code>\n\t\t\t\t\t\t<pre></code></pre>",
"extract": False,
"verify": False,
"fix": True,
"silent": True,
"expected_return": True,
"expected_output": '<pre><code class="language-cpp" data-line-numbers>\n\t\t\t\t\t\t</code></pre>',
},
{
"name": "fix_improper_escaped_ref",
"body": '<pre><code class="language-cpp" data-line-numbers>&evt</code></pre>',
Expand Down
Loading