Skip to content

Commit

Permalink
Merge branch 'naboj-structure'
Browse files Browse the repository at this point in the history
  • Loading branch information
sesquideus committed Dec 10, 2023
2 parents f783e13 + b097a6c commit 5213dd8
Show file tree
Hide file tree
Showing 134 changed files with 2,077 additions and 1,993 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ build/
output/
source/
_*/
.idea/*
svg-inkscape/
21 changes: 14 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,27 @@
path = source/naboj/phys
url = git@github.com:TrojstenSK/naboj-physics
branch = master
[submodule "source/naboj/test"]
path = source/naboj/test
url = git@github.com:TrojstenSK/dgs-naboj-testing
branch = master
[submodule "source/seminar/FKS"]
path = source/seminar/FKS
url = git@github.com:TrojstenSK/FKS
url = git@github.com:TrojstenSK/fks
branch = master
[submodule "source/seminar/testing"]
path = source/seminar/testing
url = git@github.com:TrojstenSK/dgs-seminar-testing.git
[submodule "source/seminar/FX"]
path = source/seminar/FX
url = git@github.com:TrojstenSK/FX-problems
[submodule "source/seminar/test"]
path = source/seminar/test
url = git@github.com:TrojstenSK/dgs-seminar-testing
branch = main
[submodule "source/scholar/TA1"]
path = source/scholar/TA1
url = git@github.com:sesquideus/TA1
[submodule "source/scholar/TA2"]
path = source/scholar/TA2
url = git@github.com:sesquideus/TA2
[submodule "source/seminar/FX"]
path = source/seminar/FX
url = git@github.com:TrojstenSK/FX-problems
[submodule "source/scholar/STA"]
path = source/scholar/STA
url = git@github.com:sesquideus/teaching-STA
107 changes: 0 additions & 107 deletions .idea/workspace.xml

This file was deleted.

16 changes: 13 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Remove all stupid builtin rules and variables
MAKEFLAGS += --no-builtin-rules --no-builtin-variables --warn-undefined-variables

SUPPORTED_LANGUAGES = sk en cs hu pl es de fr ru

path := $(abspath $(lastword $(MAKEFILE_LIST)))
cdir := $(dir $(path))

Expand Down Expand Up @@ -41,11 +43,11 @@ endef

# _pandoc(language, format, pretty_format)
define _pandoc
@echo -e '$(c_action)[pandoc] Converting \
@echo -e '$(c_action)[convert] Converting \
$(c_extension)Markdown$(c_action) file $(c_filename)$<$(c_action) to \
$(c_extension)$(3)$(c_action) file $(c_filename)$@$(c_action):$(c_default)'
$(c_extension)$(3)$(c_action) file $(c_filename)$@$(c_action)$(c_default)'
@mkdir -p $(dir $@)
python3 core/convert.py $(2) $(1) $< $@ || exit 1;
python3 convert.py $(2) $(1) $< $@ || exit 1;
endef

# pandoctex(language)
Expand Down Expand Up @@ -77,6 +79,14 @@ endef

include modules/*/module.mk

build/core/i18n/%.tex: \
core/templates/override.jtt
@mkdir -p $(dir $@)
python3 core/builder/i18n.py 'core/i18n/' 'core/templates/' $* -o $(dir $@)

build/core/i18n: \
$$(foreach lang,$$(SUPPORTED_LANGUAGES),build/core/i18n/$$(lang).tex) ;

# DeGeŠ convert Markdown file to TeX (for XeLaTeX)
# THIS IS CURRENTLY HARDCODED TO WORK IN SLOVAK ONLY, OVERRIDE THIS IN MODULE!
build/%.tex: source/%.md
Expand Down
2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ python_version = "3.12"
[dev-packages]
pytest = "*"
"flake8" = "*"
ipython = "*"

[packages]
pyyaml = "*"
Expand All @@ -27,3 +28,4 @@ argparsedirs = "*"
schema = "*"
pandoc-minted = "*"
pygments = "*"
enschema = "*"
Loading

0 comments on commit 5213dd8

Please sign in to comment.