Merge remote-tracking branch 'swc-styles/gh-pages' into gh-pages (9b27e176) · Commits · NDIP / Nova Packages / Nova Carpentry Tutorial

_layouts/base.html

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
		<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/syntax.css" />
		{% if site.carpentry == "swc" %}
		<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
		{% elsif site.carpentry == "dc" %}

assets/css/syntax.css

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		.highlight .hll { background-color: #ffffcc }
		.highlight { background: #f8f8f8; }
		.highlight .c { color: #408080; font-style: italic } /* Comment */
		.highlight .err { border: 1px solid #FF0000 } /* Error */
		.highlight .k { color: #008000; font-weight: bold } /* Keyword */
		.highlight .o { color: #666666 } /* Operator */
		.highlight .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
		.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */
		.highlight .cp { color: #BC7A00 } /* Comment.Preproc */
		.highlight .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
		.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */
		.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */
		.highlight .gd { color: #A00000 } /* Generic.Deleted */
		.highlight .ge { font-style: italic } /* Generic.Emph */
		.highlight .gr { color: #FF0000 } /* Generic.Error */
		.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
		.highlight .gi { color: #00A000 } /* Generic.Inserted */
		.highlight .go { color: #888888 } /* Generic.Output */
		.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
		.highlight .gs { font-weight: bold } /* Generic.Strong */
		.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
		.highlight .gt { color: #0044DD } /* Generic.Traceback */
		.highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
		.highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
		.highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
		.highlight .kp { color: #008000 } /* Keyword.Pseudo */
		.highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
		.highlight .kt { color: #B00040 } /* Keyword.Type */
		.highlight .m { color: #666666 } /* Literal.Number */
		.highlight .s { color: #BA2121 } /* Literal.String */
		.highlight .na { color: #7D9029 } /* Name.Attribute */
		.highlight .nb { color: #008000 } /* Name.Builtin */
		.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */
		.highlight .no { color: #880000 } /* Name.Constant */
		.highlight .nd { color: #AA22FF } /* Name.Decorator */
		.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
		.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
		.highlight .nf { color: #0000FF } /* Name.Function */
		.highlight .nl { color: #A0A000 } /* Name.Label */
		.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
		.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
		.highlight .nv { color: #19177C } /* Name.Variable */
		.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
		.highlight .w { color: #bbbbbb } /* Text.Whitespace */
		.highlight .mb { color: #666666 } /* Literal.Number.Bin */
		.highlight .mf { color: #666666 } /* Literal.Number.Float */
		.highlight .mh { color: #666666 } /* Literal.Number.Hex */
		.highlight .mi { color: #666666 } /* Literal.Number.Integer */
		.highlight .mo { color: #666666 } /* Literal.Number.Oct */
		.highlight .sa { color: #BA2121 } /* Literal.String.Affix */
		.highlight .sb { color: #BA2121 } /* Literal.String.Backtick */
		.highlight .sc { color: #BA2121 } /* Literal.String.Char */
		.highlight .dl { color: #BA2121 } /* Literal.String.Delimiter */
		.highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
		.highlight .s2 { color: #BA2121 } /* Literal.String.Double */
		.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
		.highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */
		.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
		.highlight .sx { color: #008000 } /* Literal.String.Other */
		.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
		.highlight .s1 { color: #BA2121 } /* Literal.String.Single */
		.highlight .ss { color: #19177C } /* Literal.String.Symbol */
		.highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */
		.highlight .fm { color: #0000FF } /* Name.Function.Magic */
		.highlight .vc { color: #19177C } /* Name.Variable.Class */
		.highlight .vg { color: #19177C } /* Name.Variable.Global */
		.highlight .vi { color: #19177C } /* Name.Variable.Instance */
		.highlight .vm { color: #19177C } /* Name.Variable.Magic */
		.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */

bin/chunk-options.R

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ opts_chunk$set(tidy = FALSE, results = "markup", comment = NA,
		hook_in <- function(x, options) {
		stringr::str_c("\n\n~~~\n",
		paste0(x, collapse="\n"),
		"\n~~~\n{: .r}\n\n")
		"\n~~~\n{: .language-r}\n\n")
		}

		hook_out <- function(x, options) {

bin/lesson_check.py

+8 −40

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ REQUIRED_FILES = {
		'%/LICENSE.md': True,
		'%/README.md': False,
		'%/_extras/discuss.md': True,
		'%/_extras/figures.md': True,
		'%/_extras/guide.md': True,
		'%/index.md': True,
		'%/reference.md': True,
		@@ -72,12 +71,14 @@ KNOWN_CODEBLOCKS = {
		'error',
		'output',
		'source',
		'bash',
		'make',
		'matlab',
		'python',
		'r',
		'sql'
		'language-bash',
		'html',
		'language-make',
		'language-matlab',
		'language-python',
		'language-r',
		'language-shell',
		'language-sql'
		}

		# What fields are required in teaching episode metadata?
		@@ -114,7 +115,6 @@ def main():
		for filename in docs.keys():
		checker = create_checker(args, filename, docs[filename])
		checker.check()
		check_figures(args.source_dir, args.reporter)

		args.reporter.report()

		@@ -255,38 +255,6 @@ def check_fileset(source_dir, reporter, filenames_present):
		seen)


		def check_figures(source_dir, reporter):
		"""Check that all figures are present and referenced."""

		# Get references.
		try:
		all_figures_html = os.path.join(source_dir, '_includes', 'all_figures.html')
		with open(all_figures_html, 'r') as reader:
		text = reader.read()
		figures = P_FIGURE_REFS.findall(text)
		referenced = [os.path.split(f)[1] for f in figures if '/fig/' in f]
		except FileNotFoundError as e:
		reporter.add(all_figures_html,
		'File not found')
		return

		# Get actual image files (ignore non-image files).
		fig_dir_path = os.path.join(source_dir, 'fig')
		actual = [f for f in os.listdir(fig_dir_path) if os.path.splitext(f)[1] in IMAGE_FILE_SUFFIX]

		# Report differences.
		unexpected = set(actual) - set(referenced)
		reporter.check(not unexpected,
		None,
		'Unexpected image files: {0}',
		', '.join(sorted(unexpected)))
		missing = set(referenced) - set(actual)
		reporter.check(not missing,
		None,
		'Missing image files: {0}',
		', '.join(sorted(missing)))


		def create_checker(args, filename, info):
		"""Create appropriate checker for file."""

bin/lesson_initialize.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -242,8 +242,8 @@ exclude:
		- Makefile
		- bin

		# Turn off built-in syntax highlighting.
		highlighter: false
		# Turn on built-in syntax highlighting.
		highlighter: rouge
		'''

		ROOT_INDEX_MD = '''\