Теперь тема собирается

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamercolorthemePgPro.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamercolorthemePgPro.sty
deleted file mode 100644 (file)
index a0bb186..0000000
--- a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamercolorthemePgPro.sty
+++ /dev/null
@@ -1,21 +0,0 @@
-\mode<presentation>
-
-% Settings
-\AtBeginDocument{\setromanfont{Times New Roman}}
-\AtBeginDocument{\setsansfont{Gilroy}}
-\AtBeginDocument{\setmonofont{Consolas}}
-\setbeamercolor*{title page header}{fg=white}
-\setbeamerfont*{title}{size*={32pt}{1},family=\sffamily}
-\setbeamercolor*{author}{fg=white}
-\setbeamerfont*{author}{size*={18pt}{1},family=\sffamily}
-\setbeamercolor*{frametitle}{fg=cyan}
-\setbeamerfont*{frametitle}{size*={22pt}{1},family=\sffamily,series=\bfseries}
-%\definecolor{text}{HTML}{595959}
-\definecolor{text}{HTML}{000000}
-\setbeamercolor{normal text}{fg=text}
-\setbeamerfont{normal text}{size*={12pt}{18},family=\sffamily}
-\AtBeginDocument{\usebeamerfont{normal text}}
-\setbeamertemplate{itemize items}{\textbullet}% отключает кошмарные синие треугольники
-\setbeamercolor{itemize/enumerate body}{fg=text}
-\mode
-<all>

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamercolorthemePgPro2025bis.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamercolorthemePgPro2025bis.sty
new file mode 100644 (file)
index 0000000..a0bb186
--- /dev/null
+++ b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamercolorthemePgPro2025bis.sty
@@ -0,0 +1,21 @@
+\mode<presentation>
+
+% Settings
+\AtBeginDocument{\setromanfont{Times New Roman}}
+\AtBeginDocument{\setsansfont{Gilroy}}
+\AtBeginDocument{\setmonofont{Consolas}}
+\setbeamercolor*{title page header}{fg=white}
+\setbeamerfont*{title}{size*={32pt}{1},family=\sffamily}
+\setbeamercolor*{author}{fg=white}
+\setbeamerfont*{author}{size*={18pt}{1},family=\sffamily}
+\setbeamercolor*{frametitle}{fg=cyan}
+\setbeamerfont*{frametitle}{size*={22pt}{1},family=\sffamily,series=\bfseries}
+%\definecolor{text}{HTML}{595959}
+\definecolor{text}{HTML}{000000}
+\setbeamercolor{normal text}{fg=text}
+\setbeamerfont{normal text}{size*={12pt}{18},family=\sffamily}
+\AtBeginDocument{\usebeamerfont{normal text}}
+\setbeamertemplate{itemize items}{\textbullet}% отключает кошмарные синие треугольники
+\setbeamercolor{itemize/enumerate body}{fg=text}
+\mode
+<all>

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerinnerthemePgPro.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerinnerthemePgPro.sty
deleted file mode 100644 (file)
index 1a36ba0..0000000
--- a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerinnerthemePgPro.sty
+++ /dev/null
@@ -1,30 +0,0 @@
-\mode<presentation>
-
-\setbeamertemplate{background}{
-  \begin{tikzpicture}
-  \ifnum\thepage=1\relax%
-   \node[anchor=south west,inner sep=0] at (0,0) {\includegraphics[width=\the\paperwidth, height=\the\paperheight]{theme.nonfree/bgpics/pgpro_title_bg.png}};
-   \fi
-  \ifnum\thepage>1\relax%
-   \node[anchor=south west, inner sep=0] at (0,0) {\includegraphics[width=\the\paperwidth, height=\the\paperheight]{theme.nonfree/bgpics/pgpro_page_bg.png}};
-   \node[anchor=east] at(\textwidth+1cm,0.5cm) {\color{text}\tiny\insertframenumber};
-   \fi
-  \end{tikzpicture}
-}
-
-% Title page
-\defbeamertemplate*{title page}{gcr2019}[1][]
-{
-    \vskip3cm%
-    \begin{beamercolorbox}[leftskip=0.7cm,left,#1]{title page header}
-      \usebeamerfont{title}\inserttitle\par%
-    \end{beamercolorbox}%
-    \vskip0.75cm%
-    \begin{beamercolorbox}[leftskip=0.7cm,left,#1]{author}
-      \usebeamerfont{author}\insertauthor%
-    \end{beamercolorbox}
-    \vspace{9cm}
-}
-
-\mode
-<all>

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerinnerthemePgPro2025bis.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerinnerthemePgPro2025bis.sty
new file mode 100644 (file)
index 0000000..1a36ba0
--- /dev/null
+++ b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerinnerthemePgPro2025bis.sty
@@ -0,0 +1,30 @@
+\mode<presentation>
+
+\setbeamertemplate{background}{
+  \begin{tikzpicture}
+  \ifnum\thepage=1\relax%
+   \node[anchor=south west,inner sep=0] at (0,0) {\includegraphics[width=\the\paperwidth, height=\the\paperheight]{theme.nonfree/bgpics/pgpro_title_bg.png}};
+   \fi
+  \ifnum\thepage>1\relax%
+   \node[anchor=south west, inner sep=0] at (0,0) {\includegraphics[width=\the\paperwidth, height=\the\paperheight]{theme.nonfree/bgpics/pgpro_page_bg.png}};
+   \node[anchor=east] at(\textwidth+1cm,0.5cm) {\color{text}\tiny\insertframenumber};
+   \fi
+  \end{tikzpicture}
+}
+
+% Title page
+\defbeamertemplate*{title page}{gcr2019}[1][]
+{
+    \vskip3cm%
+    \begin{beamercolorbox}[leftskip=0.7cm,left,#1]{title page header}
+      \usebeamerfont{title}\inserttitle\par%
+    \end{beamercolorbox}%
+    \vskip0.75cm%
+    \begin{beamercolorbox}[leftskip=0.7cm,left,#1]{author}
+      \usebeamerfont{author}\insertauthor%
+    \end{beamercolorbox}
+    \vspace{9cm}
+}
+
+\mode
+<all>

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerouterthemePgPro.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerouterthemePgPro.sty
deleted file mode 100644 (file)
index a03dd07..0000000
--- a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerouterthemePgPro.sty
+++ /dev/null
@@ -1,13 +0,0 @@
-\mode<presentation>
-
-% Frame title
-\defbeamertemplate*{frametitle}{gcr2019}[1][]
-{
-  \vskip1cm
-  \begin{beamercolorbox}[wd=\paperwidth,leftskip=0.7cm]{frametitle}
-    \usebeamerfont{frametitle}%
-    \insertframetitle
-  \end{beamercolorbox}
-}
-
-\mode<all>
\ No newline at end of file

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerouterthemePgPro2025bis.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerouterthemePgPro2025bis.sty
new file mode 100644 (file)
index 0000000..a03dd07
--- /dev/null
+++ b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerouterthemePgPro2025bis.sty
@@ -0,0 +1,13 @@
+\mode<presentation>
+
+% Frame title
+\defbeamertemplate*{frametitle}{gcr2019}[1][]
+{
+  \vskip1cm
+  \begin{beamercolorbox}[wd=\paperwidth,leftskip=0.7cm]{frametitle}
+    \usebeamerfont{frametitle}%
+    \insertframetitle
+  \end{beamercolorbox}
+}
+
+\mode<all>
\ No newline at end of file

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerthemePgPro.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerthemePgPro.sty
deleted file mode 100644 (file)
index 3af4da9..0000000
--- a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerthemePgPro.sty
+++ /dev/null
@@ -1,19 +0,0 @@
-% Based on gcr2019 theme (https://github.com/schors/gcr2019theme)
-% Used backghround pictures from template https://confluence.postgrespro.ru/download/attachments/169509420/_PostgresPro_ШАБЛОН.odp?version=1&modificationDate=1675418955114&api=v2
-% and Gilroy font from https://oc.postgrespro.ru/index.php/s/oXFIYT9dLwLCle6
-\mode<presentation>
-
-% Requirement
-\RequirePackage{tikz}
-
-% Settings
-\useinnertheme{PgPro}
-\useoutertheme{PgPro}
-\usecolortheme{PgPro}
-
-\setbeamertemplate{navigation symbols}{}
-\setbeamertemplate{blocks}[rounded][shadow=true]
-\setbeamertemplate{footline}{\vspace{1cm}}
-\setbeamersize{text margin left=0.7cm,text margin right=0.7cm}
-
-\mode<all>

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerthemePgPro2025bis.sty b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerthemePgPro2025bis.sty
new file mode 100644 (file)
index 0000000..903e2a6
--- /dev/null
+++ b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/beamerthemePgPro2025bis.sty
@@ -0,0 +1,19 @@
+% Based on gcr2019 theme (https://github.com/schors/gcr2019theme)
+% Used backghround pictures from template https://confluence.postgrespro.ru/download/attachments/169509420/_PostgresPro_ШАБЛОН.odp?version=1&modificationDate=1675418955114&api=v2
+% and Gilroy font from https://oc.postgrespro.ru/index.php/s/oXFIYT9dLwLCle6
+\mode<presentation>
+
+% Requirement
+\RequirePackage{tikz}
+
+% Settings
+\useinnertheme{PgPro2025bis}
+\useoutertheme{PgPro2025bis}
+\usecolortheme{PgPro2025bis}
+
+\setbeamertemplate{navigation symbols}{}
+\setbeamertemplate{blocks}[rounded][shadow=true]
+\setbeamertemplate{footline}{\vspace{1cm}}
+\setbeamersize{text margin left=0.7cm,text margin right=0.7cm}
+
+\mode<all>

diff --git a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/theme_setup.tex b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/theme_setup.tex
index 20bf30ef61be4a9e3d05662081a77e7fe4e37480..537eb81b434d06984767c142745947f65949d4e7 100644 (file)
--- a/slides/0000 - LaTeX Stub/pgpro2025bis.theme/theme_setup.tex
+++ b/slides/0000 - LaTeX Stub/pgpro2025bis.theme/theme_setup.tex
@@ -1,5 +1,5 @@
 \makeatletter
-\def\input@path{{./theme.nonfree}}
+\def\input@path{{./pgpro2025bis.theme}}
 \makeatother
-\usetheme{PgPro}
+\usetheme{PgPro2025bis}