diff --git a/Makefile b/Makefile
index 5730691..351627d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,7 @@
build:
pandoc \
- --bibliography db.bib \
- --bibliography design.bib \
- --bibliography fp.bib \
- --bibliography sink.bib \
- --bibliography langs/haskell.bib \
- --bibliography langs/R.bib \
- --citeproc \
- --csl=jcsl.csl \
- --template=./uikit.html\
- -o README.html \
+ --citeproc \
+ --csl=templates/jcsl.csl \
+ --template=templates/uikit.html \
+ -o README.html \
-s citations.txt
diff --git a/README.html b/README.html
index a488429..a8e3baf 100644
--- a/README.html
+++ b/README.html
@@ -17,68 +17,94 @@
-
-- Б. А. Новиков, Н. Г.
-Графеева;, Е. А. Горшкова. “Основы технологий баз данных,”
-2020. [Online; accessed 1. May 2023]. https://www.postgrespro.ru/education/books/dbtech.
+ Функциональщина
+
- Salim,
P. “Functional Design and
Architecture,” 2023. [Online; accessed 21. Apr. 2023]. https://www.manning.com/books/functional-design-and-architecture.
-- there are many of
-them. “Практика функционального
+
- Multiple authors.
+“Практика функционального
программирования,” 2022. [Online; accessed 1. May 2023].
https://fprog.ru.
-- Misra, Jayadev.
-Effective Theories in Programming
-Practice, 2023. Vol. 47.
+
+ОМП
+
- graninas. “software-design-in-haskell,” 2023. [Online;
-accessed 21. Apr. 2023]. https://github.com/graninas/software-design-in-haskell.
-- albohlabs. “awesome-haskell,” 2023. [Online; accessed
-21. Apr. 2023]. https://github.com/albohlabs/awesome-haskell.
-- steshaw. “plt,” 2023. [Online; accessed 21. Apr.
-2023]. “The
+Haskell Road to Logic, Maths and Programming,” 2020.
+[Online; accessed 22. Apr. 2023]. https://staff.fnwi.uva.nl/d.j.n.vaneijck2/HR.
+- Sannella,
+Donald, Michael Fourman, Haoran Peng, and Philip Wadler. Introduction to Computation: Haskell, Logic and
+Automatahttps://link.springer.com/book/10.1007/978-3-030-76908-6.
+
+Теория языков
+программирования
+
+- github/steshaw.
+“plt,” 2023. [Online; accessed
+21. Apr. 2023]. https://github.com/steshaw/plt.
- “Programming Language Foundations in Agda
Table of Contents,” 2023. [Online; accessed 21. Apr. 2023;
nice reference]. https://plfa.github.io.
+- Misra, Jayadev.
+Effective Theories in Programming
+Practice, 2023. Vol. 47.
+
+Логика
+
+Базы данных
+
+Языки
+R
+
+Haskell
+
- Hutton, Graham.
Programming in Haskell,
2016.
-- Sannella,
-Donald, Michael Fourman, Haoran Peng, and Philip Wadler. Introduction to Computation: Haskell, Logic and
-Automatahttps://link.springer.com/book/10.1007/978-3-030-76908-6.
-- “The
-Haskell Road to Logic, Maths and Programming,” 2020.
-[Online; accessed 22. Apr. 2023]. https://staff.fnwi.uva.nl/d.j.n.vaneijck2/HR.
- Bragilevsky,
Vitaly. Haskell in Depth, 2021. https://www.oreilly.com/library/view/haskell-in-depth/9781617295409.
-- Wickham, Hadley.
-“Advanced R,” 2023. [Online; accessed 25. Apr.
-2023]. https://adv-r.hadley.nz.
+- github/graninas.
+“software-design-in-haskell,”
+2023. [Online; accessed 21. Apr. 2023]. https://github.com/graninas/software-design-in-haskell.
+- github/albohlabs. “awesome-haskell,” 2023. [Online; accessed
+21. Apr. 2023]. https://github.com/albohlabs/awesome-haskell.
diff --git a/citations.txt b/citations.txt
index dd3d341..d91bc0e 100644
--- a/citations.txt
+++ b/citations.txt
@@ -1,19 +1,37 @@
---
title: "home lib"
output: markdown
-bibliography: [db.bib, design.bib]
+bibliography: [db.bib, design.bib, fp.bib, sink.bib, logic.bib, langs/haskell.bib, langs/R.bib]
---
-- [@db-core]
+## Функциональщина
- [@func-design-architecture]
- [@fp-practice]
-- [@Misra2023Jan]
-- [@github-software-design-in-haskell]
-- [@github-awesome-haskell]
+
+## ОМП
+- [@haskell-road-to-logic]
+- [@computation-intro]
+
+## Теория языков программирования
- [@github-plt]
- [@plf-agda]
+- [@Misra2023Jan]
+
+## Логика
+
+- [@huth2004logic]
+
+## Базы данных
+- [@db-core]
+
+## Языки
+
+### R
+- [@advanced-R]
+
+### Haskell
+
- [@Hutton2016Sep]
-- [@computation-intro]
-- [@haskell-road-to-logic]
- [@haskell-in-depth]
-- [@advanced-R]
+- [@github-software-design-in-haskell]
+- [@github-awesome-haskell]
diff --git a/fp.bib b/fp.bib
index e60a40f..6c878b3 100644
--- a/fp.bib
+++ b/fp.bib
@@ -1,5 +1,5 @@
@misc{fp-practice,
- author = {{there are many of them}},
+ author = {{Multiple authors}},
title = {{Практика функционального программирования}},
year = {2022},
month = feb,
diff --git a/logic.bib b/logic.bib
new file mode 100644
index 0000000..74fd2e1
--- /dev/null
+++ b/logic.bib
@@ -0,0 +1,19 @@
+@book{huth2004logic,
+ abstract = {"Recent years have seen the development of powerful tools for verifying hardware and software systems, as companies worldwide realise the need for improved means of validating their products. There is increasing demand for training in basic methods in formal reasoning so that students can gain proficiency in logic-based verification methods. At the same time, the shift towards internet-based distributed computing creates the need for individuals who are able to reason about sophisticated autonomous agent-oriented software acting on large networks." "The second edition of this successful textbook addresses both those requirements, by continuing to provide an introduction to formal reasoning that is both relevant to the needs of modern computer science and rigorous enough for practical application. The presentation is clear and simple, with core material being described early in the book, and further technicalities introduced only where they are needed by the applications. A key feature is the full exposition of model-checking, and the new edition supports the most up-to--date versions of the tools NuSMV and Alloy. Improvements to the first edition have been made throughout, with extra and expanded sections on linear-time temporal logic model checking, SAT solvers, second-order logic, the Alloy specification tool, and programming by contract. The coverage of model-checking has been substantially updated. Further exercises have been added."--Jacket.},
+ added-at = {2015-12-26T14:47:38.000+0100},
+ address = {Cambridge [U.K.]; New York},
+ author = {Huth, Michael and Ryan, Mark},
+ biburl = {https://www.bibsonomy.org/bibtex/2012167e8834a5c2d2aeaf83694841b87/mabed},
+ description = {Suchergebnis auf Amazon.de für: 052154310X},
+ interhash = {aa67e9133236648e9355fac3520ce171},
+ intrahash = {012167e8834a5c2d2aeaf83694841b87},
+ isbn = {052154310X 9780521543101},
+ keywords = {model_checking},
+ publisher = {Cambridge University Press},
+ refid = {54960031},
+ timestamp = {2015-12-26T14:47:38.000+0100},
+ title = {Logic in computer science : modelling and reasoning about systems},
+ url = {http://www.amazon.de/s/url=search-alias%3Daps&field-keywords=052154310X},
+ year = 2004
+}
+
diff --git a/sink.bib b/sink.bib
index 69dad39..267a772 100644
--- a/sink.bib
+++ b/sink.bib
@@ -13,7 +13,7 @@
}
@misc{github-software-design-in-haskell,
- author = {graninas},
+ author = {github/graninas},
title = {{software-design-in-haskell}},
journal = {GitHub},
year = {2023},
@@ -24,7 +24,7 @@
}
@misc{github-awesome-haskell,
- author = {albohlabs},
+ author = {github/albohlabs},
title = {{awesome-haskell}},
journal = {GitHub},
year = {2023},
@@ -35,7 +35,7 @@
}
@misc{github-plt,
- author = {steshaw},
+ author = {github/steshaw},
title = {{plt}},
journal = {GitHub},
year = {2023},
diff --git a/jcsl.csl b/templates/jcsl.csl
similarity index 100%
rename from jcsl.csl
rename to templates/jcsl.csl
diff --git a/uikit.html b/templates/uikit.html
similarity index 100%
rename from uikit.html
rename to templates/uikit.html