From 06534c36300f38855a895cb5f3b2d53bfe4e482d Mon Sep 17 00:00:00 2001 From: Fe-Ti Date: Sun, 17 May 2026 19:02:40 +0300 Subject: [PATCH 1/6] Fixup list indentation for references list and text in general --- .../styles/IU8-04-section-numbering.sty | 27 ++++++++++++++----- .../bmstu-iu8/styles/IU8-16-references.sty | 6 ++--- tex/latex/bmstu-iu8/styles/IU8-18-extra.sty | 15 ----------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty b/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty index 7070c5c..71cd221 100644 --- a/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty +++ b/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty @@ -33,20 +33,33 @@ \AddEnumerateCounter{\Asbuk}{\@Asbuk}{А} \AddEnumerateCounter{\asbuk}{\@asbuk}{а} + \setlist[enumerate]{ - leftmargin=\parindent+\labelwidth+\labelsep, labelindent=\parindent, + itemindent=\parindent+\labelwidth+\labelsep, + leftmargin=0cm, align=left, nosep, } +% Отступ для элементов равен 0, поэтому вручную добавляем отступ для сторки с маркером +\setlist[enumerate,2]{itemindent=\labelwidth+\labelsep+2\parindent} +\setlist[enumerate,3]{itemindent=\labelwidth+\labelsep+3\parindent} +\setlist[enumerate,4]{itemindent=\labelwidth+\labelsep+4\parindent} + +\setlist[enumerate, 1]{label=\asbuk*)} +\setlist[enumerate, 2]{label=\arabic*)} +\setlist[enumerate, 3]{label=\alph*)} +\setlist[enumerate, 4]{label=\roman*)} + \setlist[itemize]{ - label=\textendash, - leftmargin=\parindent+\labelwidth+\labelsep, + label=\textendash, labelindent=\parindent, + itemindent=\parindent+\labelwidth+\labelsep, + leftmargin=0cm, align=left, nosep, } -\setlist[enumerate, 1]{label=\asbuk*)} -\setlist[enumerate, 2]{label=\arabic*)} -\setlist[enumerate, 3]{label=\alph*)} -\setlist[enumerate, 4]{label=\roman*)} \ No newline at end of file +\setlist[itemize,2]{itemindent=\labelwidth+\labelsep+2\parindent} +\setlist[itemize,3]{itemindent=\labelwidth+\labelsep+3\parindent} +\setlist[itemize,4]{itemindent=\labelwidth+\labelsep+4\parindent} + diff --git a/tex/latex/bmstu-iu8/styles/IU8-16-references.sty b/tex/latex/bmstu-iu8/styles/IU8-16-references.sty index 1300c7c..35d7681 100644 --- a/tex/latex/bmstu-iu8/styles/IU8-16-references.sty +++ b/tex/latex/bmstu-iu8/styles/IU8-16-references.sty @@ -16,8 +16,8 @@ \defbibenvironment{bibliography} {\list {} - {\setlength{\leftmargin}{1.25cm} - \setlength{\itemindent}{0em} + {\setlength{\leftmargin}{0em} + \setlength{\itemindent}{1.25cm} \setlength{\itemsep}{\bibitemsep} \setlength{\parsep}{\bibparsep}}} {\endlist} @@ -36,4 +36,4 @@ \renewcommand{\UrlFont}{\normalfont} % Изменяем шрифт для авторов в списке литературы на обычный -\renewcommand{\mkgostheading}[1]{\normalfont{#1}} \ No newline at end of file +\renewcommand{\mkgostheading}[1]{\normalfont{#1}} diff --git a/tex/latex/bmstu-iu8/styles/IU8-18-extra.sty b/tex/latex/bmstu-iu8/styles/IU8-18-extra.sty index 3e5297c..9706bf3 100644 --- a/tex/latex/bmstu-iu8/styles/IU8-18-extra.sty +++ b/tex/latex/bmstu-iu8/styles/IU8-18-extra.sty @@ -23,18 +23,3 @@ } % Кликабельные ссылки в pdf \hbadness=10000 - -\setlist[enumerate]{ - leftmargin=\parindent, - labelindent=\parindent, - align=left, - nosep, -} - -\setlist[itemize]{ - label=\textendash, - leftmargin=\parindent, - labelindent=\parindent, - align=left, - nosep, -} From 0f4818ac401f71a4315bc6703ac6c472b1bd440f Mon Sep 17 00:00:00 2001 From: Fe-Ti Date: Sat, 23 May 2026 15:27:21 +0300 Subject: [PATCH 2/6] Added xkeyval to DEPENDS.txt, may be failing CI will be fixed --- tex/latex/bmstu-iu8/DEPENDS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tex/latex/bmstu-iu8/DEPENDS.txt b/tex/latex/bmstu-iu8/DEPENDS.txt index 8176df3..9485bbd 100644 --- a/tex/latex/bmstu-iu8/DEPENDS.txt +++ b/tex/latex/bmstu-iu8/DEPENDS.txt @@ -36,3 +36,4 @@ ltablex # Here (and below) go some dependencies of dependencies biblatex ifoddpage relsize +xkeyval # glossaries dependency From c91af259912c4c4772253d8cc3ca59d1ecd628ea Mon Sep 17 00:00:00 2001 From: Fe-Ti Date: Sat, 23 May 2026 16:09:54 +0300 Subject: [PATCH 3/6] Trying to fix MikTex PM in CI according to https://github.com/MiKTeX/miktex/discussions/1346 --- actions/miktex/action.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/actions/miktex/action.yaml b/actions/miktex/action.yaml index ee8ee91..aff3887 100644 --- a/actions/miktex/action.yaml +++ b/actions/miktex/action.yaml @@ -22,11 +22,12 @@ runs: - name: Update MikTeX (admin) shell: bash run: | - sudo mpm --admin --find-updates - sudo mpm --admin --update + sudo miktex --admin packages update-package-database + sudo miktex --admin packages update + sudo miktex packages update - name: Update MikTeX (user) shell: bash run: | - mpm --find-updates - mpm --update + miktex packages update-package-database + miktex packages update From 03c3625236e25a462f32967e23b2904217b13354 Mon Sep 17 00:00:00 2001 From: Fe-Ti Date: Sun, 24 May 2026 10:42:37 +0300 Subject: [PATCH 4/6] Add manual installation of xkeyval in CI (required dep of glossaries) --- actions/miktex/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actions/miktex/action.yaml b/actions/miktex/action.yaml index aff3887..391ce6d 100644 --- a/actions/miktex/action.yaml +++ b/actions/miktex/action.yaml @@ -25,9 +25,11 @@ runs: sudo miktex --admin packages update-package-database sudo miktex --admin packages update sudo miktex packages update + sudo miktex packages install xkeyval - name: Update MikTeX (user) shell: bash run: | miktex packages update-package-database miktex packages update + miktex packages install xkeyval From b133a0d245f4742ceb84ef69aa978d979f42871f Mon Sep 17 00:00:00 2001 From: Fe-Ti Date: Sun, 24 May 2026 10:49:22 +0300 Subject: [PATCH 5/6] Remove implicit redeclaration of enumerate indentation --- .../styles/IU8-04-section-numbering.sty | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty b/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty index 71cd221..1e2a6ae 100644 --- a/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty +++ b/tex/latex/bmstu-iu8/styles/IU8-04-section-numbering.sty @@ -33,7 +33,7 @@ \AddEnumerateCounter{\Asbuk}{\@Asbuk}{А} \AddEnumerateCounter{\asbuk}{\@asbuk}{а} - +% Настройка нумерованных списков \setlist[enumerate]{ labelindent=\parindent, itemindent=\parindent+\labelwidth+\labelsep, @@ -41,16 +41,13 @@ align=left, nosep, } -% Отступ для элементов равен 0, поэтому вручную добавляем отступ для сторки с маркером -\setlist[enumerate,2]{itemindent=\labelwidth+\labelsep+2\parindent} -\setlist[enumerate,3]{itemindent=\labelwidth+\labelsep+3\parindent} -\setlist[enumerate,4]{itemindent=\labelwidth+\labelsep+4\parindent} - \setlist[enumerate, 1]{label=\asbuk*)} -\setlist[enumerate, 2]{label=\arabic*)} -\setlist[enumerate, 3]{label=\alph*)} -\setlist[enumerate, 4]{label=\roman*)} +% Отступ для элементов равен 0, поэтому вручную добавляем отступ для сторки с маркером +\setlist[enumerate,2]{itemindent=\labelwidth+\labelsep+2\parindent, label=\arabic*)} +\setlist[enumerate,3]{itemindent=\labelwidth+\labelsep+3\parindent, label=\alph*)} +\setlist[enumerate,4]{itemindent=\labelwidth+\labelsep+4\parindent, label=\roman*)} +% Настройка маркированных списков \setlist[itemize]{ label=\textendash, labelindent=\parindent, @@ -62,4 +59,3 @@ \setlist[itemize,2]{itemindent=\labelwidth+\labelsep+2\parindent} \setlist[itemize,3]{itemindent=\labelwidth+\labelsep+3\parindent} \setlist[itemize,4]{itemindent=\labelwidth+\labelsep+4\parindent} - From 9f8b206a8e605aec7c57c79d1cf821fa3b891aef Mon Sep 17 00:00:00 2001 From: Fe-Ti Date: Sun, 24 May 2026 12:07:31 +0300 Subject: [PATCH 6/6] Bump versions of github checkout and upload actions --- .github/workflows/main.yml | 4 ++-- .github/workflows/tags.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16c6c08..61a665f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - uses: CatInCosmicSpace/latex-template/actions/miktex@master @@ -29,7 +29,7 @@ jobs: latexmk -c ./main.tex - name: "Git artifact: PDF" - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: PDF path: | diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml index 1ab37a2..f252868 100644 --- a/.github/workflows/tags.yml +++ b/.github/workflows/tags.yml @@ -12,7 +12,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: 'Get tag' run: | @@ -43,7 +43,7 @@ jobs: zip -r bmstu-iu8.zip ./bmstu-iu8/ - name: "Git artifact: CTAN zip" - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: CTAN zip path: |