Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/remove old style mu logo #49

Merged
merged 6 commits into from
Jul 18, 2021
Merged

Feature/remove old style mu logo #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f2156d
Symlink Slovak logos to avoid duplicate files
Witiko May 24, 2021
8a93d73
Merge remote-tracking branch 'xvrabcov/master' into feature/remove-ol…
Witiko Jul 17, 2021
5202e64
Replace old-style MU logo with JVS MU logo and faculty seals in examples
Witiko Jul 17, 2021
7184457
Add proper handling of VERSION.tex file in Makefile
Witiko Jul 17, 2021
8be80a3
Load fithesis-mu-1*.clo size option, not fithesis-1*.clo
Witiko Jul 17, 2021
c562cef
Resize MU logo in examples
Witiko Jul 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ EXAMPLES=$(USEREXAMPLES) $(DEVEXAMPLES)
MISCELLANEOUS=example/mu/example.bib $(USEREXAMPLES:.pdf=.tex) \
README.md
RESOURCES=$(STYLEFILES) $(LOGOS) $(LOCALES)
SOURCES=$(DTXFILES) $(INSFILES) LICENSE.tex VERSION.tex
SOURCES=$(DTXFILES) $(INSFILES) LICENSE.tex
VERSION=VERSION.tex
AUXFILES=fithesis.aux fithesis.log fithesis.toc fithesis.ind \
fithesis.idx fithesis.out fithesis.ilg fithesis.gls \
fithesis.glo fithesis.hd fithesis.lot
Expand Down Expand Up @@ -91,7 +92,7 @@ $(USEREXAMPLES): $(CLASSFILES) $(RESOURCES)
make -BC $(dir $@)

# This target typesets the technical documentation.
$(MANUAL): $(DTXFILES)
$(MANUAL) $(VERSION): $(DTXFILES)
pdflatex $<
pdflatex $<
makeindex -s gind.ist $(basename $@)
Expand All @@ -107,21 +108,21 @@ $(TDSARCHIVE):
mv "$$DIR"/$@ $@ && rm -rf "$$DIR"

# This target generates a distribution file.
$(DISTARCHIVE): $(SOURCES) $(LATEXFILES) $(MAKES) \
$(DISTARCHIVE): $(SOURCES) $(VERSION) $(LATEXFILES) $(MAKES) \
$(USEREXAMPLE_SOURCES) $(DOCS) $(PDFSOURCES) $(MISCELLANEOUS) \
$(EXAMPLES)
DIR=`mktemp -d` && \
cp -v $(TDSARCHIVE) "$$DIR" && \
tar c $^ | tar xvC "$$DIR" && \
(cd "$$DIR" && zip -r -v -nw $@ *) && \
(cd "$$DIR" && zip --symlinks -r -v -nw $@ *) && \
mv "$$DIR"/$@ . && rm -rf "$$DIR"

# This target generates a CTAN distribution file.
$(CTANARCHIVE): $(LOGOS) $(SOURCES) $(DOCS) README.md
$(CTANARCHIVE): $(LOGOS) $(SOURCES) $(VERSION) $(DOCS) README.md
DIR=`mktemp -d` && mkdir -p "$$DIR/fithesis" && \
cp -v $(TDSARCHIVE) "$$DIR" && \
tar c $^ | tar xvC "$$DIR/fithesis" && \
(cd "$$DIR" && zip -r -v -nw $@ *) && \
(cd "$$DIR" && zip --symlinks -r -v -nw $@ *) && \
mv "$$DIR"/$@ . && rm -rf "$$DIR"

# This pseudo-target installs the class, locale, style, and logo
Expand Down Expand Up @@ -168,6 +169,10 @@ install-docs:
@# Documentation
mkdir -p "$(to)/doc/latex/fithesis"
tar c $(DOCS) README.md | tar xvC "$(to)/doc/latex/fithesis"

@# Source files
mkdir -p "$(to)/source/latex/fithesis"
tar c $(VERSION) | tar xvC "$(to)/source/latex/fithesis"

@# Rebuild the hash
[ "$(nohash)" = "true" ] || texhash
Expand Down
2 changes: 1 addition & 1 deletion example/mu/example-terms-abbrs.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
}

% Example of LoA entry
\newacronym{MUNI}{MUNI}{Masaryk University}
\newacronym{MU}{MU}{the Masaryk University}
139 changes: 58 additions & 81 deletions example/mu/example.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
% \begin{macrocode}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% I, the copyright holder of this work, release this work into the
%% public domain. This applies worldwide. In some countries this may
Expand All @@ -13,7 +12,7 @@
%% to enable the default options for the printed version
%% of a document.
%% color, %% Uncomment these lines (by removing the %% at the
%% %% beginning) to use color in the digital version of your
%% %% beginning) to use color in the printed version of your
%% %% document
twoside, %% The `twoside` option enables double-sided typesetting.
%% Use at least 120 g/m² paper to prevent show-through.
Expand Down Expand Up @@ -68,11 +67,6 @@
%%
%% The following section sets up the metadata of the thesis.
%<*econ>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added elements that are used
% by thesis@bibEntry and thesis@titlePage: field, fieldEn,
% departmentEn, programme, programmeEn. [TV]}
% \begin{macrocode}

\thesissetup{
date = \the\year/\the\month/\the\day,
Expand Down Expand Up @@ -136,10 +130,6 @@
}
%</econ>
%<*fi>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added element that is used
% by thesis@titlePage: department. [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -169,13 +159,6 @@
}
%</fi>
%<*fsps>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added elements that are used
% by thesis@bibEntry and thesis@titlePage: field, fieldEn,
% department, departmentEn, titleEn, TeXtitleEn, keywords,
% keywordsEn, TeXkeywords, TeXkeywordsEn, programme,
% programmeEn, abstract, abstractEn. [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -217,12 +200,6 @@
}
%</fsps>
%<*fss>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added elements that are used
% by thesis@bibEntry and thesis@titlePage: advisor, field, fieldEn,
% department, departmentEn, titleEn, TeXtitleEn, programme,
% programmeEn. [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -271,10 +248,6 @@
}
%</fss>
%<*law>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added element that is used
% by thesis@titlePage: field [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -314,10 +287,6 @@
}
%</law>
%<*med>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/22}{Added element that is used
% by thesis@titlePage: programme [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -359,12 +328,6 @@
}
%</med>
%<*ped>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added elements that are used
% by thesis@bibEntry and thesis@titlePage: field, fieldEn,
% departmentEn, titleEn, TeXtitleEn, programme, programmeEn.
% [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -413,10 +376,6 @@
}
%</ped>
%<*pharm>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/26}{Added the \texttt{thesissetup}
% for the Faculty of Pharmacy. [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -465,12 +424,6 @@
}
%</pharm>
%<*phil>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/04}{Added elements that are used
% by thesis@bibEntry and thesis@titlePage: fieldEn, departmentEn,
% titleEn, TeXtitleEn, keywordsEn, TeXkeywordsEn, abstractEn,
% programme, programmeEn. [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -514,11 +467,6 @@
}
%</phil>
%<*sci>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/22}{Added elements that are used
% by thesis@bibEntry and thesis@titlePage: fieldEn,
% departmentEn, titleEn, TeXtitleEn, programmeEn. [TV]}
% \begin{macrocode}
\thesissetup{
date = \the\year/\the\month/\the\day,
university = mu,
Expand Down Expand Up @@ -572,16 +520,12 @@
},
}
%</sci>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/22}{Added \textsf{glossaries} package.
% [TV]}
% \begin{macrocode}
\usepackage{makeidx} %% The `makeidx` package contains
\makeindex %% helper commands for index typesetting.
\usepackage[acronym]{glossaries} %% The `glossaries` package
\renewcommand*\glspostdescription{\hfill} %% contains helper commands
\loadglsentries{example-terms-abbrs.tex} %% for glossary and loa
\makenoidxglossaries %% typesetting.
\loadglsentries{example-terms-abbrs.tex} %% for typesetting glossaries
\makenoidxglossaries %% and lists of abbreviations.
%% These additional packages are used within the document:
\usepackage{paralist} %% Compact list environments
\usepackage{amsmath} %% Mathematics
Expand Down Expand Up @@ -615,10 +559,6 @@
\makeatother

%</econ>
% \end{macrocode}
% \changes{v1.0.0}{2021/03/22}{Added \cs{printnoidxglossary} to print
% Glossary and List of Abbreviations. [TV]}
% \begin{macrocode}
%% Uncomment the following lines (by removing the %% at the beginning)
%% and to print out List of Abbreviations and/or Glossary in your
%% document. Titles for these tables can be changed by replacing the
Expand Down Expand Up @@ -691,8 +631,46 @@ document, there are [packages](https://www.ctan.org/pkg/markdown
"Markdown") that allow you to use more lightweight markup next
to it.

![logo](fithesis/logo/mu/fithesis-base-color.pdf "The logo of the
Masaryk University")
%<*econ>
![logo](fithesis/logo/mu/fithesis-econ-color "The old-style seal
of the Faculty of Economics and Administration")
%</econ>
%<*fi>
![logo](fithesis/logo/mu/fithesis-fi-color "The old-style seal of
the Faculty of Informatics")
%</fi>
%<*fsps>
![logo](fithesis/logo/mu/fithesis-fsps-color "The old-style seal
of the Faculty of Sports Studies")
%</fsps>
%<*fss>
![logo](fithesis/logo/mu/fithesis-fss-color "The old-style seal of
the Faculty of Social Studies")
%</fss>
%<*law>
![logo](fithesis/logo/mu/fithesis-law-color "The old-style seal of
the Faculty of Law")
%</law>
%<*med>
![logo](fithesis/logo/mu/fithesis-med-color "The old-style seal of
the Faculty of Medicine")
%</med>
%<*ped>
![logo](fithesis/logo/mu/fithesis-ped-color "The old-style seal of
the Faculty of Education")
%</ped>
%<*pharm>
![logo](fithesis/logo/mu/fithesis-pharm-color "The old-style seal
of the Faculty of Pharmacy")
%</pharm>
%<*phil>
![logo](fithesis/logo/mu/fithesis-phil-color "The old-style seal
of the Faculty of Arts")
%</phil>
%<*sci>
![logo](fithesis/logo/mu/fithesis-sci-color "The old-style seal of
the Faculty of Science")
%</sci>

| Right | Left | Default | Center |
|------:|:-----|---------|:------:|
Expand Down Expand Up @@ -947,29 +925,30 @@ proofs.
%% The optimum is about 250 pixels per 1 centimeter or 600
%% pixels per 1 inch. That means that a JPG or PNG image typeset
%% at 4 × 4 cm should be 1000 × 1000 px large or larger.
\includegraphics[width=4cm]{fithesis/logo/mu/fithesis-base-color.pdf}
\includegraphics[width=6.3cm]{fithesis/logo/mu/fithesis-base-english-color}
\end{center}
%<*econ>
\emph{Source: <<Image Source>>}
%</econ>
\caption{The logo of the Masaryk University at 40\,mm}
\caption{The logo of \acrlong{MU} at 6.3\,cm}
\label{fig:mulogo1}
\end{figure}

\begin{figure}
\begin{center}
\begin{minipage}{.66\textwidth}
\includegraphics[width=\textwidth]{fithesis/logo/mu/fithesis-base-color.pdf}
\begin{minipage}{.5\textwidth}
\includegraphics[width=\textwidth]{fithesis/logo/mu/fithesis-base-english-color}
\end{minipage}
\hfill % Fill the horizontal space between the images
\begin{minipage}{.33\textwidth}
\includegraphics[width=\textwidth]{fithesis/logo/mu/fithesis-base-color.pdf} \\
\includegraphics[width=\textwidth]{fithesis/logo/mu/fithesis-base-color.pdf}
\includegraphics[width=\textwidth]{fithesis/logo/mu/fithesis-base-english-color} \\[1em]
\includegraphics[width=\textwidth]{fithesis/logo/mu/fithesis-base-english-color}
\end{minipage}
\end{center}
%<*econ>
\emph{Source: <<Image Source>>}
%</econ>
\caption{The logo of the \acrlong{MUNI} at $\frac23$ and
\caption{The logo of \acrlong{MU} at $\frac12$ and
$\frac13$ of text width}
\label{fig:mulogo2}
\end{figure}
Expand All @@ -995,14 +974,13 @@ proofs.
\label{tab:weather}
\end{table}

The logo of the Masaryk University is shown in Figure
\ref{fig:mulogo1} and Figure \ref{fig:mulogo2} at pages
\pageref{fig:mulogo1} and \pageref{fig:mulogo2}. The weather
forecast is shown in Table \ref{tab:weather} at page
\pageref{tab:weather}. The following chapter is Chapter
\ref{chap:matheq} and starts at page \pageref{chap:matheq}.
Items \ref{item:star1}, \ref{item:star2}, and
\ref{item:star3} are starred in the following list:
The logo of \gls{MU} is shown in Figure \ref{fig:mulogo1} and
Figure \ref{fig:mulogo2} at pages \pageref{fig:mulogo1} and
\pageref{fig:mulogo2}. The weather forecast is shown in Table
\ref{tab:weather} at page \pageref{tab:weather}. The following
chapter is Chapter \ref{chap:matheq} and starts at page
\pageref{chap:matheq}. Items \ref{item:star1}, \ref{item:star2},
and \ref{item:star3} are starred in the following list:
\begin{compactenum}
\item some text
\item some other text
Expand Down Expand Up @@ -1248,4 +1226,3 @@ the index will be ill-sorted.
Here you can insert the appendices of your thesis.

\end{document}
% \end{macrocode}
6 changes: 6 additions & 0 deletions logo/mu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ all: $(PDFFILES)
%.pdf: %.eps
epstopdf $<

# These targets symlinl a Czech PDF logo to a Slovak PDF logo.
%-slovak.pdf: %-czech.pdf
ln -s $< $@
%-slovak-color.pdf: %-czech-color.pdf
ln -s $< $@

# This target removes all PDF logos.
implode:
rm -f $(PDFFILES)
Loading