Unverified Commit 42cfb98a authored by Vít Starý Novotný's avatar Vít Starý Novotný
Browse files

Merge remote-tracking branch 'xvrabcov/master'

parents 5e4bc027 629c3f86

.github/workflows/main.yml

+5 −0
Original line number Diff line number Diff line
@@ -43,3 +43,8 @@ jobs: 
        with:

          name: fithesis.zip

          path: fithesis.zip

      - name: Upload artifact fithesis.pdf

        uses: actions/upload-artifact@v2

        with:

          name: fithesis.pdf

          path: fithesis.pdf

Makefile

+24 −42
Original line number Diff line number Diff line 
SUBMAKES_REQUIRED=logo/mu locale style style/mu

SUBMAKES_EXTRA=guide/mu example/mu

SUBMAKES_TEST=test test/mu/blind test/mu/compare \

	test/mu/compare-example

SUBMAKES=$(SUBMAKES_REQUIRED) $(SUBMAKES_EXTRA) $(SUBMAKES_TEST)

SUBMAKES_EXTRA=example/mu

SUBMAKES=$(SUBMAKES_REQUIRED) $(SUBMAKES_EXTRA)



.PHONY: all base complete docs clean dist dist-implode implode \

	install install-base install-docs uninstall tests $(SUBMAKES)

	install install-base install-docs uninstall $(SUBMAKES)



CLASSFILES=fithesis.cls fithesis2.cls fithesis3.cls

CLASSFILES=fithesis.cls fithesis2.cls fithesis3.cls fithesis4.cls

STYLEFILES=style/*.sty style/*/*.sty style/*/*.clo

EPSLOGOS=logo/*/*.eps

PDFLOGOS=logo/*/*.pdf
@@ -16,15 +15,11 @@ DTXFILES=*.dtx locale/czech.dtx locale/english.dtx \ 
	locale/slovak.dtx style/*.dtx style/*/*.dtx

INSFILES=*.ins locale/czech.ins locale/english.ins \

	locale/slovak.ins style/*.ins style/*/*.ins

TESTS=test/*.tex test/mu/compare/*.pdf test/mu/compare/*.tex \

	test/mu/compare-example/*.pdf test/mu/comparepdf.sh \

	test/mu/update-tests.sh

MAKES=guide/mu/Makefile guide/mu/resources/Makefile \

	locale/Makefile	logo/mu/Makefile Makefile style/Makefile \

	style/mu/Makefile test/Makefile test/mu/blind/Makefile \

	test/mu/compare/Makefile test/mu/compare-example/Makefile

MAKES=locale/Makefile logo/mu/Makefile Makefile style/Makefile \

	style/mu/Makefile

USEREXAMPLE_SOURCES=example/mu/Makefile example/mu/example.dtx \

	example/mu/*.ins example/mu/latexmkrc

	example/mu/*.ins example/mu/latexmkrc \

	example/mu/example-terms-abbrs.tex

USEREXAMPLES=example/mu/econ-lualatex.pdf \

	example/mu/econ-pdflatex.pdf example/mu/fi-lualatex.pdf \

	example/mu/fi-pdflatex.pdf example/mu/fsps-lualatex.pdf \
@@ -34,22 +29,16 @@ USEREXAMPLES=example/mu/econ-lualatex.pdf \ 
	example/mu/med-pdflatex.pdf example/mu/ped-lualatex.pdf \

	example/mu/ped-pdflatex.pdf example/mu/phil-lualatex.pdf \

	example/mu/phil-pdflatex.pdf example/mu/sci-lualatex.pdf \

	example/mu/sci-pdflatex.pdf

DEVEXAMPLES=guide/EXAMPLE/DESCRIPTION guide/mu/DESCRIPTION \

	guide/mu/resources/DESCRIPTION guide/DESCRIPTION \

	locale/DESCRIPTION locale/EXAMPLE.dtx locale/EXAMPLE.ins \

	example/mu/sci-pdflatex.pdf example/mu/pharm-lualatex.pdf \

	example/mu/pharm-pdflatex.pdf

DEVEXAMPLES=locale/DESCRIPTION locale/EXAMPLE.dtx locale/EXAMPLE.ins \

	logo/EXAMPLE/DESCRIPTION logo/mu/DESCRIPTION \

	logo/DESCRIPTION style/EXAMPLE/DESCRIPTION style/mu/DESCRIPTION \

	style/DESCRIPTION test/DESCRIPTION test/EXAMPLE/DESCRIPTION \

	test/mu/DESCRIPTION test/mu/blind/DESCRIPTION \

	test/mu/compare/DESCRIPTION test/mu/compare-example/DESCRIPTION \

	example/EXAMPLE/DESCRIPTION example/mu/DESCRIPTION \

	style/DESCRIPTION example/EXAMPLE/DESCRIPTION example/mu/DESCRIPTION \

	example/DESCRIPTION

EXAMPLES=$(USEREXAMPLES) $(DEVEXAMPLES)

MISCELLANEOUS=guide/mu/resources/empty.tex guide/mu/guide.bib \

	guide/mu/guide.dtx guide/mu/*.ins guide/mu/resources/cog.pdf \

	guide/mu/resources/vader.pdf guide/mu/resources/yoda.pdf \

	example/mu/example.bib $(USEREXAMPLES:.pdf=.tex) README.md

MISCELLANEOUS=example/mu/example.bib $(USEREXAMPLES:.pdf=.tex) \

	README.md

RESOURCES=$(STYLEFILES) $(LOGOS) $(LOCALES)

SOURCES=$(DTXFILES) $(INSFILES) LICENSE.tex VERSION.tex

AUXFILES=fithesis.aux fithesis.log fithesis.toc fithesis.ind \
@@ -57,11 +46,8 @@ AUXFILES=fithesis.aux fithesis.log fithesis.toc fithesis.ind \ 
	fithesis.glo fithesis.hd fithesis.lot

MANUAL=fithesis.pdf

PDFSOURCES=fithesis.dtx

GUIDES=guide/mu/econ.pdf guide/mu/fi.pdf guide/mu/fsps.pdf \

	guide/mu/fss.pdf guide/mu/law.pdf guide/mu/med.pdf \

	guide/mu/ped.pdf guide/mu/phil.pdf guide/mu/sci.pdf

PDFS=$(MANUAL) $(GUIDES) $(USEREXAMPLES)

DOCS=$(MANUAL) $(GUIDES)

PDFS=$(MANUAL) $(USEREXAMPLES)

DOCS=$(MANUAL)

MAKEABLES=$(PDFS) $(CLASSFILES) $(VERSION)

TDSARCHIVE=fithesis.tds.zip

CTANARCHIVE=fithesis.ctan.zip
@@ -80,12 +66,11 @@ base: $(SUBMAKES_REQUIRED) 
	make $(CLASSFILES)



# This pseudo-target creates the class files and typesets the

# technical documentation, the user guides, and the user examples.

# technical documentation and the user examples.

complete: base

	make $(PDFS) clean



# This pseudo-target typesets the technical documentation and the

# user guides.

# This pseudo-target typesets the technical documentation.

docs:

	make $(DOCS) clean
@@ -93,9 +78,6 @@ docs: 
$(SUBMAKES):

	make -C $@ all



# This pseudo-target performs the tests.

tests: base $(SUBMAKES_TEST)



# This pseudo-target creates the distribution archive.

dist: dist-implode complete

	make $(TDSARCHIVE) $(DISTARCHIVE) $(CTANARCHIVE)
@@ -104,8 +86,8 @@ dist: dist-implode complete 
$(CLASSFILES): fithesis.ins fithesis.dtx

	xetex $<



# This target typesets the guides and user examples.

$(GUIDES) $(USEREXAMPLES): $(CLASSFILES) $(RESOURCES)

# This target typesets the user examples.

$(USEREXAMPLES): $(CLASSFILES) $(RESOURCES)

	make -BC $(dir $@)



# This target typesets the technical documentation.
@@ -125,7 +107,7 @@ $(TDSARCHIVE): 
	mv "$$DIR"/$@ $@ && rm -rf "$$DIR"



# This target generates a distribution file.

$(DISTARCHIVE): $(SOURCES) $(LATEXFILES) $(MAKES) $(TESTS) \

$(DISTARCHIVE): $(SOURCES) $(LATEXFILES) $(MAKES) \

	$(USEREXAMPLE_SOURCES) $(DOCS) $(PDFSOURCES) $(MISCELLANEOUS) \

	$(EXAMPLES)

	DIR=`mktemp -d` && \
@@ -143,7 +125,7 @@ $(CTANARCHIVE): $(LOGOS) $(SOURCES) $(DOCS) README.md 
	mv "$$DIR"/$@ . && rm -rf "$$DIR"



# This pseudo-target installs the class, locale, style, and logo

# files - as well as the technical documentation and user guides -

# files - as well as the technical documentation -

# into the TeX directory structure, whose root directory is

# specified within the "to" argument. Specify "nohash=true", if you

# wish to forgo the reindexing of the package database.
@@ -192,7 +174,7 @@ install-docs: 




# This pseudo-target uninstalls the class, locale, style, and logo

# files - as well as the technical documentation and user guides -

# files - as well as the technical documentation -

# from the TeX directory structure, whose root directory is

# specified within the "from" argument. Specify "nohash=true", if

# you wish to forgo the reindexing of the package database.

README.md

+2 −3
Original line number Diff line number Diff line 
# About #



`Fithesis3` is a document class for the typesetting of theses at

`Fithesis4` is a document class for the typesetting of theses at

the Masaryk University (Brno, Czech Republic). The class has been

designed for easy extensibility by style and locale files of other

academic institutions.
@@ -16,8 +16,7 @@ environment as well as the following tools: 
Aside from these tools, the installation requires a correctly

configured TeX distribution containing the pdfTeX, XeTeX and LuaTeX

engines as well as the LaTeX packages required for the typesetting

of the technical documentation within the `fithesis.dtx` file and

the guide files within the `guide/` subdirectory.

of the technical documentation within the `fithesis.dtx`.



For running the test suite using the `make tests` command, the

following tools are also required:

example/mu/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ PDFFILES=fi-pdflatex.pdf fi-lualatex.pdf sci-pdflatex.pdf sci-lualatex.pdf \ 
	ped-pdflatex.pdf ped-lualatex.pdf med-pdflatex.pdf med-lualatex.pdf \

	fss-pdflatex.pdf fss-lualatex.pdf fsps-pdflatex.pdf fsps-lualatex.pdf \

	phil-pdflatex.pdf phil-lualatex.pdf law-pdflatex.pdf law-lualatex.pdf \

	econ-pdflatex.pdf econ-lualatex.pdf

	econ-pdflatex.pdf econ-lualatex.pdf pharm-pdflatex.pdf \

	pharm-lualatex.pdf



PDFLATEX=pdflatex --shell-escape

LUALATEX=lualatex

AUXFILES=*.aux *.log *.out *.toc *.lot *.lof *.bcf *.blg *.run.xml \
@@ -21,7 +23,7 @@ all: $(OUTPUT) clean 
		$(patsubst %-pdflatex.tex,%-,$(subst lua,pdf,$@))*.tex



# This target typesets a pdfLaTeX example.

%-pdflatex.pdf: %-pdflatex.tex example.bib

%-pdflatex.pdf: %-pdflatex.tex example.bib example-terms-abbrs.tex

	$(PDFLATEX) $< # The initial typesetting.

	biber                               $(basename $<).bcf

	$(PDFLATEX) $< # Update the index after the bibliography insertion.
@@ -30,7 +32,7 @@ all: $(OUTPUT) clean 
	$(PDFLATEX) $<



# This target typesets a LuaLaTeX example.

%-lualatex.pdf: %-lualatex.tex example.bib

%-lualatex.pdf: %-lualatex.tex example.bib example-terms-abbrs.tex

	$(LUALATEX) $< # The initial typesetting.

	biber                               $(basename $<).bcf

	$(LUALATEX) $< # Update the index after the bibliography insertion.

example/mu/example-terms-abbrs.tex

0 → 100644
+12 −0
Original line number Diff line number Diff line 
% These are examples for entries in Glossary of Terms 

% and List of Abbreviations



% Example of Glossary entry

\newglossaryentry{Overleaf}

{

    name=Overleaf,

    description={is an online service for working with LaTex files.}

}



% Example of LoA entry

\newacronym{MUNI}{MUNI}{Masaryk University}