Skip to content

Commit 2b4499c

Browse files
authored
Merge pull request #1 from CppCon/master
Bring fork up-to-date with upstream
2 parents 5876898 + bd272c0 commit 2b4499c

File tree

40 files changed

+45
-5
lines changed

40 files changed

+45
-5
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
**CNL A Compositional Numeric Library** by **John McFarlane**
2+
3+
Additional information: https://github.com/johnmcfarlane/cnl/

README.md

Lines changed: 35 additions & 2 deletions
Large diffs are not rendered by default.

_tools/add.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def get_author_from_readme_md(path):
6161

6262
if match:
6363
return match.group(2)
64-
64+
6565
return ""
6666

6767
def md_path(path):
@@ -129,7 +129,11 @@ def generate_index(readme, path):
129129
dir_contents.sort(key=lambda s: s.lower())
130130

131131
for name in dir_contents:
132-
generate_entry(readme, name, join(path, name))
132+
try:
133+
# empty directories or other such issues get skipped over
134+
generate_entry(readme, name, join(path, name))
135+
except:
136+
pass
133137

134138

135139
def add_presentation(path):
@@ -166,7 +170,7 @@ def add_presentation(path):
166170
title = match.group(1)
167171
author = match.group(2)
168172
else:
169-
title_author_regex = re.compile("(.*) - (.*) - CppCon " +
173+
title_author_regex = re.compile("(.*) - (.*) - CppCon " +
170174
str(CPPCON_YEAR) + r"\.[^.]*$")
171175

172176
title_author_match = title_author_regex.search(filename)

0 commit comments

Comments
 (0)