Merge pull request #18 from demanasta/develop

Develop
demanasta · Jan 2, 2018 · bd1b462 · bd1b462
2 parents 29907c7 + e5f259d
commit bd1b462
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ install:
    - sudo apt-get install texlive-full
 #   - sudo apt-get install texlive-xetex
    - sudo apt-get install biber
+   - sudo apt-get install fonts-cmu
 #   - sudo apt-get install latexmk
 #   - curl -L https://github.com/holgern/travis-texlive/releases/download/2017-09-18_02/texlive.tar.xz | tar -JxC ~
 #   - PATH=$HOME/texlive/bin/x86_64-linux:$PATH

diff --git a/Chapter3/ch3pres.tex b/Chapter3/ch3pres.tex
@@ -8,7 +8,7 @@ \section{Μεθοδολογία}
   \label{fr3:frank_tr}
   \begin{columns}
     \begin{column}{.65\textwidth}
-    \vskip.1cm
+    %\vskip.1cm
       {\small Η διαφορά της γωνίας σε δύο χρονικές στιγμές:}
       \[ \delta\phi_\alpha=\delta \theta_\beta - \delta \theta_\gamma \]
  \vskip.1cm

diff --git a/Classes/beamerLct.cls b/Classes/beamerLct.cls
@@ -594,7 +594,7 @@
   \begin{minipage}[t]{0.10\textwidth}
     \centering\raisebox{\dimexpr \topskip-\height}{\@crestleft}
   \end{minipage}\hfill
-  \begin{minipage}[t]{0.79\textwidth}
+  \begin{minipage}[t]{0.76\textwidth}
     \centering \vspace*{-0.4cm}{\large \textbf{\@university} \par}
     \vspace*{0.1cm}  {\small \@dept \par}
     \vspace*{0.1cm}  {\small \@lab  \par}

diff --git a/Preamble/preambleLct.tex b/Preamble/preambleLct.tex
@@ -82,10 +82,9 @@
   \setmainfont[Mapping=tex-text]{GFS Neohellenic}
 %  \setmainfont[Mapping=tex-text]{GFS Artemisia}
 %  \setmainfont[Mapping=tex-text]{GFS Elpis} %low resolution printing
-%  \setmainfont[Mapping=tex-text]{Linux Libertine T}
-%  \setmainfont[Mapping=tex-text]{Linux Libertine O}
 
-%  % For use with XeLaTeX
+
+%%  % For use with XeLaTeX, enable Libertine
 %    \setmainfont[
 %      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
 %      Extension         = .otf,
@@ -97,28 +96,34 @@
 %    {LGR}
 %  %  % load font from system font
 %     \newfontfamily\libertinesystemfont{Linux Libertine O}
-%%************* Latin Modern, not support greek*****************************
-%  \usepackage{lmodern}
-%  \usepackage[T1]{fontenc}
+
+%  %% use xetex, enable Biolinum Fonts
+%  \setmainfont[
+%      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
+%      Extension         = .otf,
+%      UprightFont = LinBiolinum_R,
+%      BoldFont = LinBiolinum_RB, % Linux Libertine O Regular Semibold
+%      ItalicFont = LinBiolinum_RI,
+%      %BoldItalicFont = LinBiolinum_RZI, % Linux Libertine O Regular Semibold Italic
+%    ]
+%    {LGR}
+%  %  % load font from system font
+%     \newfontfamily\libertinesystemfont{Linux Biolinum O}
+
 
 \else
   \usepackage{fontspec}
   \usefonttheme{professionalfonts} % using non standard fonts for beamer
   \usefonttheme{serif} % default family is serif
 
-  %% use xetex, enable Biolinum Fonts
-  \setmainfont[
-      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
-      Extension         = .otf,
-      UprightFont = LinBiolinum_R,
-      BoldFont = LinBiolinum_RB, % Linux Libertine O Regular Semibold
-      ItalicFont = LinBiolinum_RI,
-      %BoldItalicFont = LinBiolinum_RZI, % Linux Libertine O Regular Semibold Italic
-    ]
-    {LGR}
-  %  % load font from system font
-     \newfontfamily\libertinesystemfont{Linux Biolinum O}
-
+  %% Use Computer Modern Unicode Fonts, Support Greek Font
+  \setmainfont[Mapping=tex-text, Scale=0.90]{CMU Serif}
+  \setsansfont[Mapping=tex-text, Scale=0.90]{CMU Sans Serif}
+  \setmonofont{CMU Typewriter Text}
+
+%%************* Latin Modern, not support greek*****************************
+%  \usepackage{lmodern}
+%  \usepackage[T1]{fontenc}
 
 \fi % custom font class
 

diff --git a/Preamble/preamblePhD.tex b/Preamble/preamblePhD.tex
@@ -81,10 +81,9 @@
   \setmainfont[Mapping=tex-text]{GFS Neohellenic}
 %  \setmainfont[Mapping=tex-text]{GFS Artemisia}
 %  \setmainfont[Mapping=tex-text]{GFS Elpis} %low resolution printing
-%  \setmainfont[Mapping=tex-text]{Linux Libertine T}
-%  \setmainfont[Mapping=tex-text]{Linux Libertine O}
 
-%  % For use with XeLaTeX
+
+%%  % For use with XeLaTeX, enable Libertine
 %    \setmainfont[
 %      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
 %      Extension         = .otf,
@@ -96,28 +95,34 @@
 %    {LGR}
 %  %  % load font from system font
 %     \newfontfamily\libertinesystemfont{Linux Libertine O}
-%%************* Latin Modern, not support greek*****************************
-%  \usepackage{lmodern}
-%  \usepackage[T1]{fontenc}
+
+%  %% use xetex, enable Biolinum Fonts
+%  \setmainfont[
+%      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
+%      Extension         = .otf,
+%      UprightFont = LinBiolinum_R,
+%      BoldFont = LinBiolinum_RB, % Linux Libertine O Regular Semibold
+%      ItalicFont = LinBiolinum_RI,
+%      %BoldItalicFont = LinBiolinum_RZI, % Linux Libertine O Regular Semibold Italic
+%    ]
+%    {LGR}
+%  %  % load font from system font
+%     \newfontfamily\libertinesystemfont{Linux Biolinum O}
+
 
 \else
   \usepackage{fontspec}
   \usefonttheme{professionalfonts} % using non standard fonts for beamer
   \usefonttheme{serif} % default family is serif
 
-  %% use xetex, enable Biolinum Fonts
-  \setmainfont[
-      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
-      Extension         = .otf,
-      UprightFont = LinBiolinum_R,
-      BoldFont = LinBiolinum_RB, % Linux Libertine O Regular Semibold
-      ItalicFont = LinBiolinum_RI,
-      %BoldItalicFont = LinBiolinum_RZI, % Linux Libertine O Regular Semibold Italic
-    ]
-    {LGR}
-  %  % load font from system font
-     \newfontfamily\libertinesystemfont{Linux Biolinum O}
-
+  %% Use Computer Modern Unicode Fonts, Support Greek Font
+  \setmainfont[Mapping=tex-text, Scale=0.90]{CMU Serif}
+  \setsansfont[Mapping=tex-text, Scale=0.90]{CMU Sans Serif}
+  \setmonofont{CMU Typewriter Text}
+
+%%************* Latin Modern, not support greek*****************************
+%  \usepackage{lmodern}
+%  \usepackage[T1]{fontenc}
 
 \fi % custom font class
 

diff --git a/Preamble/preamblePub.tex b/Preamble/preamblePub.tex
@@ -81,10 +81,9 @@
   \setmainfont[Mapping=tex-text]{GFS Neohellenic}
 %  \setmainfont[Mapping=tex-text]{GFS Artemisia}
 %  \setmainfont[Mapping=tex-text]{GFS Elpis} %low resolution printing
-%  \setmainfont[Mapping=tex-text]{Linux Libertine T}
-%  \setmainfont[Mapping=tex-text]{Linux Libertine O}
 
-%  % For use with XeLaTeX
+
+%%  % For use with XeLaTeX, enable Libertine
 %    \setmainfont[
 %      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
 %      Extension         = .otf,
@@ -96,28 +95,34 @@
 %    {LGR}
 %  %  % load font from system font
 %     \newfontfamily\libertinesystemfont{Linux Libertine O}
-%%************* Latin Modern, not support greek*****************************
-%  \usepackage{lmodern}
-%  \usepackage[T1]{fontenc}
+
+%  %% use xetex, enable Biolinum Fonts
+%  \setmainfont[
+%      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
+%      Extension         = .otf,
+%      UprightFont = LinBiolinum_R,
+%      BoldFont = LinBiolinum_RB, % Linux Libertine O Regular Semibold
+%      ItalicFont = LinBiolinum_RI,
+%      %BoldItalicFont = LinBiolinum_RZI, % Linux Libertine O Regular Semibold Italic
+%    ]
+%    {LGR}
+%  %  % load font from system font
+%     \newfontfamily\libertinesystemfont{Linux Biolinum O}
+
 
 \else
   \usepackage{fontspec}
   \usefonttheme{professionalfonts} % using non standard fonts for beamer
   \usefonttheme{serif} % default family is serif
 
-  %% use xetex, enable Biolinum Fonts
-  \setmainfont[
-      Path              = /usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/, %./libertine/opentype/,
-      Extension         = .otf,
-      UprightFont = LinBiolinum_R,
-      BoldFont = LinBiolinum_RB, % Linux Libertine O Regular Semibold
-      ItalicFont = LinBiolinum_RI,
-      %BoldItalicFont = LinBiolinum_RZI, % Linux Libertine O Regular Semibold Italic
-    ]
-    {LGR}
-  %  % load font from system font
-     \newfontfamily\libertinesystemfont{Linux Biolinum O}
-
+  %% Use Computer Modern Unicode Fonts, Support Greek Font
+  \setmainfont[Mapping=tex-text, Scale=0.90]{CMU Serif}
+  \setsansfont[Mapping=tex-text, Scale=0.90]{CMU Sans Serif}
+  \setmonofont{CMU Typewriter Text}
+
+%%************* Latin Modern, not support greek*****************************
+%  \usepackage{lmodern}
+%  \usepackage[T1]{fontenc}
 
 \fi % custom font class
 

diff --git a/README.md b/README.md
@@ -19,13 +19,13 @@ Templates for academic presentations -- pre-released
 --------------------------------------------------------------------------------
 ## Features
 
-* Supports LaTeX, XeLaTeX and LuaLaTeX
+* Supports XeLaTeX and LuaLaTeX
 
-* Support Greek Language and Fonts (GFS)
+* Support Greek Language and Fonts (GFS, CMU, Libertine)
 
 * Adaptive Title Page: Title page adapts to title length
 
-* Pre-defined and custom fonts (Biolinum O / Professional fonts) with math support
+* Pre-defined and custom fonts (CMU serif / Professional fonts) with math support
 
 * Option to generate only specific chapters and references without the frontmatter and title page. Useful for review and corrections.
 
@@ -62,7 +62,7 @@ Usage: `sh ./compile-thesis.sh [OPTIONS] [filename]`
 
 [option]  clean: removes temporary files no filename required
 
-### Using the make file (Unix/Linux)  still some bugs
+### Using the make file (Unix/Linux)
 
 The template supports PDF, DVI and PS formats. All three formats can be generated
 with the provided `Makefile`.
@@ -143,10 +143,19 @@ Then select you presentation style on `preamble.tex` file
 
 * `notes=only`: Prints only notes of each frame
 
-* `printbib`: Include bibliography at the end of the presentation (__bug__: not working with makefile!)
+* `printbib`: Include bibliography at the end of the presentation.
 
 * `progrbar`: Enable progress bar in the frame. Chose this option after your  first compilation. Disable on *chapter* mode.
 
+### Choosing Fonts
+
+All three style support different fonts, configured in `preamble***.tex` file:
+
+* `default (empty)` : When no font is specified, `Computer Modern Unicode - CMU` is used as the default font with Math Support. CMU font is alternative to `Latin Modern` but it support Greek language. To install cmu-fonts in debian destribution run: `$ sudo apt-get install fonts-cmu`
+
+* `customfont` :  Any custom font can be set in preamble using this option. Some fonts had already set. Default custom font is `GFS Neohellenic` with math support.
+
+
 ## Contributing
 
 1. Create an issue and describe your idea

diff --git a/pres-info.tex b/pres-info.tex
@@ -70,9 +70,9 @@
 
 
 
-%% -----------------------------------------------------------------------------
-%% 3.Publication's section INFO
-%% -----------------------------------------------------------------------------
+%%% -----------------------------------------------------------------------------
+%%% 3.Publication's section INFO
+%%% -----------------------------------------------------------------------------
 %%% The title of the thesis
 %\prestitle{Α Beamer-{\LaTeX} / {\XeLaTeX} template \\ for conference presentations }
 %
@@ -104,8 +104,8 @@
 %% -----------------------------------------------------------------------------
 %% 4.Course section INFO
 %% -----------------------------------------------------------------------------
-
-%%% Department (eg. Department of Engineering, Maths, Physics)
+%
+%%%% Department (eg. Department of Engineering, Maths, Physics)
 %\dept{ΣΧΟΛΗ ΑΓΡΟΝΟΜΩΝ \& ΤΟΠΟΓΡΑΦΩΝ ΜΗΧΑΝΙΚΩΝ}
 %
 %%% Laboratory
@@ -135,9 +135,9 @@
 %%% Submission date
 %% Default is set as {\monthname[\the\month]\space\the\year}
 %% \degreedate{\today} 
-%\coursedate{5 Ιουλίου 2017}
-%
-%
+%\coursedate{01 Οκτωβρίου 2017}
+
+
 
 
 

diff --git a/sty/beamerthemeBluePhD.sty b/sty/beamerthemeBluePhD.sty
@@ -46,7 +46,11 @@
 
 \useoutertheme[subsection=false]{miniframes}
 
-\setbeamertemplate{frametitle}[default][center]
+%\setbeamertemplate{frametitle}[default][center]
+\setbeamertemplate{frametitle}{\vskip-1pt\centering{\insertframetitle}\\
+\vskip-2pt\centerline{\usebeamerfont{framesubtitle}\insertframesubtitle}}
+\setbeamerfont{frametitle}{size=\Large}
+\setbeamerfont{framesubtitle}{size=\small}
 
 \AtBeginDocument{%
   {

diff --git a/sty/beamerthemeBluePub.sty b/sty/beamerthemeBluePub.sty
@@ -46,7 +46,11 @@
 
 \useoutertheme[subsection=false]{miniframes}
 
-\setbeamertemplate{frametitle}[default][center]
+%\setbeamertemplate{frametitle}[default][center]
+\setbeamertemplate{frametitle}{\vskip-1pt\centering{\insertframetitle}\\
+\vskip-2pt\centerline{\usebeamerfont{framesubtitle}\insertframesubtitle}}
+\setbeamerfont{frametitle}{size=\Large}
+\setbeamerfont{framesubtitle}{size=\small}
 
 \AtBeginDocument{%
   {

diff --git a/sty/beamerthemeRedLecture.sty b/sty/beamerthemeRedLecture.sty
@@ -73,7 +73,11 @@
 
 \useoutertheme[subsection=false]{miniframes}
 
-\setbeamertemplate{frametitle}[default][center]
+%\setbeamertemplate{frametitle}[default][center]
+\setbeamertemplate{frametitle}{\vskip-1pt\centering{\insertframetitle}\\
+\vskip-2pt\centerline{\usebeamerfont{framesubtitle}\insertframesubtitle}}
+\setbeamerfont{frametitle}{size=\Large}
+\setbeamerfont{framesubtitle}{size=\small}
 
 \AtBeginDocument{%
   {