Merge branch 'release-20170720'

Author: wistaria

.gitignore

@@ -3,6 +3,8 @@
 */.DS_Store
 */*.aux
 */*.dvi
+*/*.fls
+*/*.fdb_latexmk
 */*.log
 */*.nav
 */*.out

Makefile

@@ -1,8 +1,8 @@
+.PHONY: all default clean distclean
 default clean distclean:
 	(cd overview && make $@)
 	(cd installation && make $@)
 	(cd tutorial && make $@)
 	(cd python && make $@)
 	(cd pyalps && make $@)
-	(cd matplotlib && make $@)
 	(cd alpsize && make $@)

README.md

@@ -1,39 +1,47 @@
-ALPS/tutorial
+ALPS Tutorial
 =============
 
-Japanese tutorial materials for ALPS Library/Application (http://alps.comp-phys.org)
+CCMS hands-on materials for ALPS Library/Application / CCMS ALPS講習会のための資料
 
-ALPS講習会のための日本語資料
+* ALPS on MateriApps: http://ma.cms-initiative.jp/ja/listapps/alps
+* ALPS: http://alps.comp-phys.org
 
 Table of Contents / 内容
 ============================
 
-* ALPS Tutorial - Overview / ALPSチュートリアル - 概要
-* Installation of ALPS / ALPSのインストール
-* ALPS Application Tutorial / ALPSアプリケーションチュートリアル
-* Python
-* Introduction to ALPS Python / ALPS Python入門
-* Introduction to Matplotlib / Matplotlib入門
-* How to ``alpsize'' your application / アプリケーションのALPS化
+1. Overview / 概要
+2. Installation of ALPS / ALPSのインストール
+3. Application Tutorial (1) / アプリケーション実習(1)
+4. Introduction to Python / Python入門
+5. Introduction to ALPS Python / ALPS Python入門
+6. Application Tutorial (2) / アプリケーション実習(2)
+7. "Alpsize" your application / アプリケーションのALPS化
+
+Github repository of alps-tutorial
+===================================
+
+All LaTeX sources and figures of ALPS tutorial materials are available on Github:
+
+* https://github.com/cmsi/alps-tutorial
 
 How to generte PDF files / PDF生成方法
 ==============================================
 
 * sh make_dist.sh
 
-生成済のPDFファイル / Pre-generated PDF files
+Pre-generated PDF files / 生成済のPDFファイル
 ======================================================
 
-* http://sourceforge.net/projects/alps-tutorial/files/
+Pre-generated PDF files (normal screen and wide screen versions) are available at
+
+* https://github.com/cmsi/alps-tutorial/releases
 
 Authors / 著者
-=================
+====================
 
-* Synge Todo (Department of Physics, Univ. of Tokyo) / 藤堂眞治 (東大院理)
-* Haruhiko Matsuo (RIST) / 松尾春彦 (RIST)
-* Ryo Igarashi (ISSP, Univ. of Tokyo) / 五十嵐 亮 (東大物性研)
+CCMS hands-on materials for ALPS Library/Application are written and maintained by [Japanese ALPS support team](https://github.com/cmsi/alps-tutorial/graphs/contributors?type=a) <alps@exa.phys.s.u-tokyo.ac.jp>
 
 License / ライセンス
 ==========================
 
-This turorial handout is licensed under a Creative Commons Attribution 3.0 Unported License. / このチュートリアル資料は、クリエイティブ・コモンズ 表示 3.0 非移植ライセンスの下に提供されています。 (http://creativecommons.org/licenses/by/3.0/)
+This turorial handout is licensed under a Creative Commons Attribution 3.0 Unported License. / このチュートリアル資料は、クリエイティブ・コモンズ 表示 3.0 非移植ライセンスの下に提供されています。 [http://creativecommons.org/licenses/by/3.0/](http://creativecommons.org/licenses/by/3.0/)

alpsize/Makefile

@@ -1,27 +1,24 @@
 BASENAME = alpsize
 SRC = ${BASENAME}.tex ../style/*.sty ../style/*.bb
+PLATEX = platex -shell-escape -interaction=nonstopmode
 
 default: ${BASENAME}-wide.pdf ${BASENAME}-normal.pdf
 
-${BASENAME}-wide.dvi: ${BASENAME}-wide.tex ${SRC}
-	TEXINPUTS=.:../style//: platex -shell-escape ${BASENAME}-wide.tex
-	TEXINPUTS=.:../style//: platex ${BASENAME}-wide.tex
-	TEXINPUTS=.:../style//: platex ${BASENAME}-wide.tex
+${BASENAME}-wide.pdf: ${BASENAME}-wide.tex ${SRC}
+	TEXINPUTS=.:../style//: latexmk -pdfdvi -use-make -latex="${PLATEX}" \
+	 -e '$$dvipdf = "dvipdfmx %O -o %D %S"' \
+	 ${BASENAME}-wide.tex
 
-${BASENAME}-wide.pdf: ${BASENAME}-wide.dvi
-	TEXINPUTS=.:../style//: dvipdfmx ${BASENAME}-wide.dvi
+${BASENAME}-normal.pdf: ${BASENAME}-normal.tex ${SRC}
+	TEXINPUTS=.:../style//: latexmk -pdfdvi -use-make -latex="${PLATEX}" \
+	 -e '$$dvipdf = "dvipdfmx %O -o %D %S"' \
+	 ${BASENAME}-normal.tex
 
-${BASENAME}-normal.dvi: ${BASENAME}-normal.tex ${SRC}
-	TEXINPUTS=.:../style//: platex -shell-escape ${BASENAME}-normal.tex
-	TEXINPUTS=.:../style//: platex ${BASENAME}-normal.tex
-	TEXINPUTS=.:../style//: platex ${BASENAME}-normal.tex
-
-${BASENAME}-normal.pdf: ${BASENAME}-normal.dvi
-	TEXINPUTS=.:../style//: dvipdfmx ${BASENAME}-normal.dvi
+.sty:
 
 clean:
-	rm -f ${BASENAME}*.aux ${BASENAME}*.dvi ${BASENAME}*.log ${BASENAME}*.nav ${BASENAME}*.out ${BASENAME}*.snm ${BASENAME}*.toc ${BASENAME}*.vrb
-	rm -rf auto *.xbb ../style/*.xbb
+	@latexmk -c ${BASENAME}-wide.tex ${BASENAME}-normal.tex
+	@rm -f *.nav *.snm *.vrb
 
 distclean: clean
-	rm -f ${BASENAME}-wide.pdf ${BASENAME}-normal.pdf
+	@latexmk -C ${BASENAME}-wide.tex ${BASENAME}-normal.tex