Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit d3601e4

Browse files
wakitawakita
committed
Downgraded from sbt 1.0.2 to 1.0.0
1 parent 0234f8d commit d3601e4

File tree

15 files changed

+26
-28
lines changed

15 files changed

+26
-28
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
/quiz
2+
/docs/quiz/*
13
quiz
4+
!/docs/quiz/quiz01*
25

36
/.history
47
/docs/tmp

‎Makefile‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ clean:
2121
# Markdown -> HTML is achieved in two-stages.
2222
html: server docs/index.html $(HTML)
2323

24-
HTML_DEP = docs/dev/kw.js lib/phantom.js lib/slide.yaml
24+
HTML_DEP = docs/dev/kw.js lib/phantom.js slide/slide.yaml
2525

2626
docs/slide/%.html: $(HTML_DEP) slide/%.md
2727
$(eval slide := $(basename $(notdir $@)))
@@ -31,10 +31,9 @@ docs/slide/%.html: $(HTML_DEP) slide/%.md
3131

3232
@# Firstly, Pandoc generates a temporary HTML file:
3333
@# slide/*.md -> tmp/*.html
34-
@echo "pandoc: $(md) => $(html1)"
35-
@pandoc lib/slide.yaml $(md) \
36-
--include-in-header=lib/slide.header \
37-
--include-after-body=lib/slide.footer \
34+
@echo "pandoc: $(slide) => $(html1)"
35+
@pandoc slide/slide.yaml $(md) \
36+
--include-in-header=slide/slide.header \
3837
--to=revealjs --slide-level=2 \
3938
--standalone \
4039
--output=$(html1) \
@@ -56,9 +55,9 @@ docs/note/%.html: note/%.md
5655
$(eval md := $(addprefix note/, $(addsuffix .md, $(note))))
5756
$(eval html := $(addprefix docs/note/, $(addsuffix .html, $(note))))
5857

59-
@pandoc lib/note.yaml $(md) \
60-
--include-in-header=lib/note.header \
61-
--include-after-body=lib/note.footer \
58+
@echo "pandoc: $(note) => $(html)"
59+
@pandoc note/note.yaml $(md) \
60+
--include-in-header=note/note.header \
6261
--standalone --to=html --output=$(html) \
6362
--smart
6463

@@ -67,8 +66,10 @@ docs/quiz/%.html: quiz/%.md
6766
$(eval quiz := $(basename $(notdir $@)))
6867
$(eval md := $(addprefix quiz/, $(addsuffix .md, $(quiz))))
6968
$(eval html := $(addprefix docs/quiz/, $(addsuffix .html, $(quiz))))
70-
@pandoc lib/quiz.yaml $(md) \
71-
--include-in-header=lib/quiz.header \
69+
70+
@echo "pandoc: $(quiz) => $(html)"
71+
@pandoc quiz/quiz.yaml $(md) \
72+
--include-in-header=quiz/quiz.header \
7273
--standalone --to=html --output=$(html) \
7374
--highlight-style=monochrome \
7475
--smart

‎docs/note/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
</style>
4747
<script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/highlight/highlight.js"></script>
4848
<script>hljs.initHighlightingOnLoad();</script>
49+
<link rel="stylesheet" type="text/css" href="/lecture/lib/reveal.js-3.5.0/css/theme/solarized.css">
50+
<link rel="stylesheet" type="text/css" href="/lecture/lib/kw.css">
4951
</head>
5052
<body>
5153
<div id="header">
@@ -81,7 +83,5 @@ <h1 id="gitリポジトリの初期化">Gitリポジトリの初期化</h1>
8183
<span class="fu">git</span> clone git@github.com:is-prg1b/lx01</code></pre></div>
8284
<p>GitHubのデータが更新された場合は，適宜 <code>git pull</code> して下さい．最新版に更新できます．</p>
8385
<p>GitHubから複製したデータを直接変更すると <code>git pull</code> のときにエラーが出ます．</p>
84-
<link rel="stylesheet" type="text/css" href="/lecture/lib/reveal.js-3.5.0/css/theme/solarized.css">
85-
<link rel="stylesheet" type="text/css" href="/lecture/lib/kw.css">
8686
</body>
8787
</html>

‎docs/note/lx02-tests.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<style type="text/css">code{white-space: pre;}</style>
1010
<script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/highlight/highlight.js"></script>
1111
<script>hljs.initHighlightingOnLoad();</script>
12+
<link rel="stylesheet" type="text/css" href="/lecture/lib/reveal.js-3.5.0/css/theme/solarized.css">
13+
<link rel="stylesheet" type="text/css" href="/lecture/lib/kw.css">
1214
</head>
1315
<body>
1416
<div id="header">
@@ -250,7 +252,5 @@ <h1 id="lx02k">lx02k</h1>
250252
[info] Passed: Total 4, Failed 0, Errors 0, Passed 4
251253
[success] Total time: 2 s, completed Sep 29, 2017 12:24:24 PM</code></pre>
252254
</note>
253-
<link rel="stylesheet" type="text/css" href="/lecture/lib/reveal.js-3.5.0/css/theme/solarized.css">
254-
<link rel="stylesheet" type="text/css" href="/lecture/lib/kw.css">
255255
</body>
256256
</html>

‎docs/note/makefile.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
</style>
4747
<script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/highlight/highlight.js"></script>
4848
<script>hljs.initHighlightingOnLoad();</script>
49+
<link rel="stylesheet" type="text/css" href="/lecture/lib/reveal.js-3.5.0/css/theme/solarized.css">
50+
<link rel="stylesheet" type="text/css" href="/lecture/lib/kw.css">
4951
</head>
5052
<body>
5153
<div id="header">
@@ -150,7 +152,5 @@ <h3 class="date">2017年9月26日</h3>
150152
<li id="fn1"><p>かつて，ソフトウェアのビルドに長大な時間がかかったときには，たとえ <code>make</code> を利用してもビルド作業に何十分もかかった．ビルドの合間に剣玉をしていたために当時のIBM東京基礎研の研究員はん剣玉上手だった．<a href="#fnref1">↩</a></p></li>
151153
</ol>
152154
</div>
153-
<link rel="stylesheet" type="text/css" href="/lecture/lib/reveal.js-3.5.0/css/theme/solarized.css">
154-
<link rel="stylesheet" type="text/css" href="/lecture/lib/kw.css">
155155
</body>
156156
</html>

‎docs/slide/lx02.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
<!--[if lt IE 9]>
6060
<script src="/lecture/lib/reveal.js-3.5.0/lib/js/html5shiv.js"></script>
6161
<![endif]-->
62-
<link rel="stylesheet" href="https://use.edgefonts.net/c/7d333d/1w;source-code-pro,2,gm0:W:i4,gm6:W:i7,glz:W:n4,gm5:W:n7/k/localhost" media="all"><script src="//use.edgefonts.net/source-code-pro.js"></script><script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/zoom-js/zoom.js"></script><script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/notes/notes.js"></script>
62+
<link rel="stylesheet" href="https://use.edgefonts.net/c/7d333d/1w;source-code-pro,2,gm0:W:i4,gm6:W:i7,glz:W:n4,gm5:W:n7/k/localhost" media="all"><script src="//use.edgefonts.net/source-code-pro.js"></script>
63+
<link rel="stylesheet" type="text/css" href="lecture/lib/kw.css"><script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/zoom-js/zoom.js"></script><script type="text/javascript" src="/lecture/lib/reveal.js-3.5.0/plugin/notes/notes.js"></script>
6364
</head>
6465
<body style="-webkit-transition: -webkit-transform 0.8s ease; transition: -webkit-transform 0.8s ease;">
6566
<div class="reveal slide center ready" role="application" data-transition-speed="default" data-background-transition="fade">
@@ -383,7 +384,6 @@ <h2>lx02?: おさらい＆残りは任せた</h2>
383384
]
384385
});
385386
</script>
386-
<link rel="stylesheet" type="text/css" href="lecture/lib/kw.css">
387387

388388

389389
</body></html>

‎lib/note.header‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎lib/quiz.header‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/quiz.yaml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎lib/slide.header‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)