From 7f00c0580f8fed85794a60b91f4181e1be2f276b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Jan 2015 23:06:01 +0000 Subject: disser (4jan15) git-svn-id: svn://tug.org/texlive/trunk@35960 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/disser/ChangeLog | 14 ++- Master/texmf-dist/doc/latex/disser/README | 66 +++++------ Master/texmf-dist/doc/latex/disser/README.ru | 41 +++---- Master/texmf-dist/doc/latex/disser/manual.tex | 2 +- .../texmf-dist/doc/latex/disser/templates/Makefile | 66 +++++------ .../doc/latex/disser/templates/bachelor/1.tex | 19 +-- .../doc/latex/disser/templates/bachelor/thesis.tex | 8 +- .../latex/disser/templates/candidate/autoref.tex | 4 +- .../latex/disser/templates/candidate/thesis.tex | 5 +- .../doc/latex/disser/templates/doctor/autoref.tex | 4 +- .../doc/latex/disser/templates/doctor/thesis.tex | 5 +- .../doc/latex/disser/templates/master/thesis.tex | 8 +- .../latex/disser/templates/specialist/thesis.tex | 8 +- Master/texmf-dist/source/latex/disser/autoref.dtx | 10 +- .../texmf-dist/source/latex/disser/candidate.dtx | 2 +- Master/texmf-dist/source/latex/disser/counters.dtx | 17 +-- Master/texmf-dist/source/latex/disser/custom.dtx | 110 +++++++++++------- Master/texmf-dist/source/latex/disser/disser.dtx | 22 ++-- Master/texmf-dist/source/latex/disser/floats.dtx | 4 +- Master/texmf-dist/source/latex/disser/footnote.dtx | 2 +- Master/texmf-dist/source/latex/disser/gost732.dtx | 4 +- Master/texmf-dist/source/latex/disser/lists.dtx | 4 +- .../texmf-dist/source/latex/disser/titledefs.dtx | 4 +- Master/texmf-dist/source/latex/disser/toc.dtx | 2 +- Master/texmf-dist/tex/latex/disser/autoref.rtx | 10 +- Master/texmf-dist/tex/latex/disser/candidate.rtx | 2 +- Master/texmf-dist/tex/latex/disser/disser.cls | 127 ++++++++++++--------- Master/texmf-dist/tex/latex/disser/gost732.cls | 4 +- Master/texmf-dist/tex/latex/disser/titledefs.rtx | 4 +- 29 files changed, 322 insertions(+), 256 deletions(-) diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index bcca04706eb..0997ef38cdd 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -1,7 +1,19 @@ disser changelog -Copyright (C) 2004-2014 Stanislav Kruchinin +Copyright (C) 2015 Stanislav Kruchinin ------------------------------------------- +Summary of changes in version 1.3.1 (2015-01-03): + +Classes and styles: +* Fix bug due to undefined \@Asbuk in recent 'babel' package. ++ Package 'natbib' is now optional. +* Use more recent package 'subcaption' for subfigure captions and + references instead of the obsolete 'subfig'. + +Templates: +* Updates for compatibility with 'subcaption' package. + + Summary of changes in version 1.3.0 (2013-12-30): Classes and styles: diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README index 48249322775..52a48bff675 100644 --- a/Master/texmf-dist/doc/latex/disser/README +++ b/Master/texmf-dist/doc/latex/disser/README @@ -2,18 +2,17 @@ --------------- This package provides LaTeX classes, bibliography styles and document -templates for typesetting dissertations and author's abstracts that would -satisfy the requirements of dissertation councils and High Certification -Commission of Russian Federation. +templates for typesetting dissertations and author's abstracts which satisfy +the requirements of dissertation councils and High Certification Commission of +Russian Federation. 2. Required packages and programs --------------------------------- - -For installation and working with documents you will need the following -third-party packages: +For installation from sources and compilation of the documents you will need +the following third-party packages: amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, natbib, -hyperref, hypernat, subfig, wrapfig, and packages for russian language support +hyperref, hypernat, subcaption, wrapfig, and packages for russian language support in LaTeX. For typesetting documents using Times font family you should install the @@ -26,53 +25,63 @@ Ghostscript, epstool and sam2p. 3. Downloads and updates ------------------------ - -Disser is available on CTAN: +Package 'disser' is available on CTAN: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ Project page at Sourceforge: http://sourceforge.net/projects/disser/ -ZIP file with sources can be downloaded at: +ZIP file with sources can be downloaded from http://www.ctan.org/get/macros/latex/contrib/disser.zip -ZIP file with compiled sources and documentation sorted in a -TDS (TeX Directory Structure) tree is available on Sourceforge -(look for disser-.tds.zip file in Downloads section): +ZIP file with compiled sources and documentation sorted in a TDS (TeX +Directory Structure) tree is available on Sourceforge (see +disser-.tds.zip file in Downloads section): http://sourceforge.net/projects/disser/ Public source code repositories of this project: - http://mercurial.intuxication.org/hg/disser/ http://bitbucket.org/sky/disser/ http://disser.hg.sourceforge.net/hgweb/disser/ The latest revision of package source code can be obtained by downloading autogenerated archive from one of these mirrors: - http://mercurial.intuxication.org/hg/disser/archive/tip.zip http://bitbucket.org/sky/disser/get/tip.zip 4. Installation --------------- -1. Installation from sources +4.1. Installation from ZIP archive in TDS format + +This is the easiest and recommended way to install the package. The ZIP file +disser-.tds.zip contains files sorted in a TDS tree, so you can +directly unpack this file to directory with your TeX installation. + +Example: + cd /path/to/texmf + unzip /download/path/disser-.tds.zip + mktexlsr + +4.2. Installation from sources Enter the following commands in the command prompt in a Unix-like environment: env DESTDIR=/path/to/texmf make install -in Windows: +in Windows command line prompt: set DESTDIR=disk:\path\to\texmf nomake install -Here /path/to/texmf and disk:\path\to\texmf are paths to TeX directory -tree. After installation you should update the filename database with the -command +Here /path/to/texmf and disk:\path\to\texmf are paths to your local TeX +directory tree. After installation you should update the filename database +with the command mktexlsr + if you install the package to user's directory "%APPDATA%\MiKTeX\2.9" or mktexlsr --admin + if you install the package to one of the common directories, like "%programfiles%\MiKTeX 2.9" or "%ALLUSERSPROFILE%\MiKTeX\2.9". @@ -88,23 +97,10 @@ Installation for current user only: nomake install mktexlsr - -2. Installation from ZIP archive in TDS format - -The ZIP file disser-.tds.zip contains files sorted in a TDS tree. -This means you can directly unpack this file inside directory with your TeX -installation. - -Example: - cd /path/to/texmf - unzip /download/path/disser-.tds.zip - mktexlsr - - 5. License ---------- -Copyright (c) 2004-2013 Stanislav Kruchinin +Copyright (c) 2004-2015 Stanislav Kruchinin It may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -116,4 +112,4 @@ version 2003/12/01 or later. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru index 1f40ba2c3c0..6c5d7fb6d7b 100644 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ b/Master/texmf-dist/doc/latex/disser/README.ru @@ -1,13 +1,11 @@ 1. Введение ----------- - Пакет disser предназначен для верстки дипломов, диссертаций и авторефератов в соответствии с требованиями диссертационных советов и ВАК РФ. 2. Рекомендуемые пакеты и программы ----------------------------------- - Для корректной сборки документов в вашем дистрибутиве LaTeX должны быть установлены следующие пакеты: amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, @@ -23,7 +21,6 @@ nomake.cmd 3. Получение последней версии ----------------------------- - Пакет disser доступен на CTAN: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ @@ -52,7 +49,23 @@ ZIP- 4. Установка ------------ -1. Из исходных текстов +4.1. Из ZIP-архива со скомпилированными файлами + +Этот способ установки наиболее прост и является рекомендуемым. +Файл disser-.tds.zip содержит собранные файлы классов и +документации, поэтому его можно просто распаковать в каталог TeX. + +Пример для Unix-подобных окружений: + cd /путь/к/texmf + unzip /путь/к/файлу/disser-.tds.zip + mktexlsr + +Пример для Windows: + cd диск:\путь\к\texmf + unzip диск:\путь\к\файлу\disser-.tds.zip + mktexlsr + +4.2. Из исходных текстов Для установки необходимо перейти в каталог с распакованными исходными текстами и выполнить следующие команды @@ -81,26 +94,10 @@ ZIP- mktexlsr -2. Из ZIP-архива со скомпилированными файлами - -Файл disser-.tds.zip содержит собранные файлы классов и -документации, поэтому его можно просто распаковать в каталог TeX. - -Пример для Unix-подобных окружений: - cd /путь/к/texmf - unzip /путь/к/файлу/disser-.tds.zip - mktexlsr - -Пример для Windows: - cd диск:\путь\к\texmf - unzip диск:\путь\к\файлу\disser-.tds.zip - mktexlsr - - 5. Лицензия ----------- -Цопыригхт (ц) 2004-2013 Станислав Кручинин +Цопыригхт (ц) 2004-2015 Станислав Кручинин Ит маы бе дистрибутед анд/ор модифиед ундер тхе цондитионс оф тхе ЛаТеХ Пройецт Публиц Лиценсе, еитхер версион 1.3 @@ -112,4 +109,4 @@ ZIP- Тхис програм ис дистрибутед ин тхе хопе тхат ит вилл бе усефул, бут ВИТХОУТ АНЫ ВАРРАНТЫ; витхоут евен тхе имплиед варранты оф -МЕРЧАНТАБИЛИТЫ ор ФИТНЕСС ФОР А ПАРТИЦУЛАР ПУРПОСЕ. +МЕРЧАНТАБИЛИТЫ ор ФИТНЕСС ФОР А ПАРТИЦУЛАР ПУРПОСЕ. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index b0e702ae05d..39422a0fa47 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -55,7 +55,7 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.3.0} +\def\fileversion{1.3.1} \sloppy \begin{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile index d2f0065d728..26d6545a84f 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile @@ -1,33 +1,33 @@ -# -# Makefile for documents and templates -# Author: Stanislav Kruchinin -# - -TARGET ?= thesis -TEXMF ?= /usr/share/texmf -DESTDIR ?= $(TEXMF) -DOCDIR ?= $(DESTDIR)/doc/latex/disser - -dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf: - @$(MAKE) -i -C bachelor $@ - @$(MAKE) -i -C specialist $@ - @$(MAKE) -i -C master $@ - @$(MAKE) -i -C candidate $@ - @$(MAKE) -i -C doctor $@ - -help: - @$(MAKE) -s -C candidate $@ ;\ - echo " install install templates" ;\ - echo " uninstall uninstall templates" ;\ - echo " reinstall reinstall templates" - -install: - cp -rf ../templates $(DOCDIR) ;\ - cp -rf ../include $(DOCDIR) - -uninstall: - -rm -rf $(DOCDIR)/templates - -rm -rf $(DOCDIR)/include - -rmdir $(DOCDIR) - -reinstall: uninstall install +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +TEXMF ?= /usr/share/texmf +DESTDIR ?= $(TEXMF) +DOCDIR ?= $(DESTDIR)/doc/latex/disser + +dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf: + @$(MAKE) -i -C bachelor $@ + @$(MAKE) -i -C specialist $@ + @$(MAKE) -i -C master $@ + @$(MAKE) -i -C candidate $@ + @$(MAKE) -i -C doctor $@ + +help: + @$(MAKE) -s -C candidate $@ ;\ + echo " install install templates" ;\ + echo " uninstall uninstall templates" ;\ + echo " reinstall reinstall templates" + +install: + cp -rf ../templates $(DOCDIR) ;\ + cp -rf ../include $(DOCDIR) + +uninstall: + -rm -rf $(DOCDIR)/templates + -rm -rf $(DOCDIR)/include + -rmdir $(DOCDIR) + +reinstall: uninstall install diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex index 8b595410219..3aeac8623ca 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -72,24 +72,27 @@ Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. \begin{figure}[!ht] \centering \begin{minipage}{5cm} - \centering \includegraphics[width=4cm]{fig} \end{minipage} - \quad \begin{minipage}{5cm} - \centering \includegraphics[width=4cm]{fig} \end{minipage} \caption{Рисунки с единым названием} \end{figure} -Ссылка на внутренний рисунок (рис.~\ref{f:sub1}) +Ссылка на внутренний рисунок (рис.~\ref{f:sub1}). \begin{figure}[!ht] - \centering - \subfloat[][]{\label{f:sub1}\includegraphics[width=4cm]{fig}}\quad - \subfloat[][]{\label{f:sub2}\includegraphics[width=4cm]{fig}}\quad - \subfloat[][]{\label{f:sub3}\includegraphics[width=4cm]{fig}} +\centering + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub1} + \end{minipage} + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub2} + \end{minipage} + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub3} + \end{minipage} \caption[]{% Рисунки с единым названием и подчиненной нумерацией: \subref{f:sub1} ссылка 1, diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex index ef95cb7daba..43ea6535bf4 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -1,10 +1,11 @@ \documentclass[% bachelor, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок colorlinks=true % цветные гиперссылки -%,times % шрифт Times как основной %,fixint=false % отключить прямые знаки интегралов +%,times % шрифт Times как основной ]{disser} \usepackage[ @@ -14,6 +15,7 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % Плавающие рисунки "в оборку". diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex index 0e5f6745cd1..2858f44bd73 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex @@ -1,7 +1,7 @@ \documentclass[% autoref, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +href, % использовать пакет hyperref для создания гиперссылок facsimile, % отображать факсимиле диссертанта и ученого секретаря colorlinks=true % цветные гиперссылки %,fixint=false % отключить прямые знаки интегралов diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex index d101052a4ae..2b52725c9f7 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -1,7 +1,8 @@ \documentclass[% candidate, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок colorlinks=true % цветные гиперссылки %,times % шрифт Times как основной %,fixint=false % отключить прямые знаки интегралов diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex index 7bf486ada35..28a0078f620 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex @@ -1,7 +1,7 @@ \documentclass[% autoref, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +href, % использовать пакет hyperref для создания гиперссылок facsimile, % отображать факсимиле диссертанта и ученого секретаря colorlinks=true % цветные гиперссылки %,fixint=false % отключить прямые знаки интегралов diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex index c63f3f3fb96..8d3804aa249 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -1,7 +1,8 @@ \documentclass[% doctor, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок colorlinks=true % цветные гиперссылки %,times % шрифт Times как основной %,fixint=false % отключить прямые знаки интегралов diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex index f92bc2fe566..9f31bf48d52 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -1,10 +1,11 @@ \documentclass[% master, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок colorlinks=true % цветные гиперссылки -%,times % шрифт Times как основной %,fixint=false % отключить прямые знаки интегралов +%,times % шрифт Times как основной ]{disser} \usepackage[ @@ -14,6 +15,7 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % Номера страниц снизу и по центру diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex index 718de3ac14d..3f7410090e3 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex @@ -1,10 +1,11 @@ \documentclass[% specialist, % тип документа -subf, % подключить и настроить пакет subfig для вложенной нумерации рисунков -href, % подключить и настроить пакет hyperref +natbib, % использовать пакет natbib для "сжатия" цитирований +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок colorlinks=true % цветные гиперссылки -%,times % шрифт Times как основной %,fixint=false % отключить прямые знаки интегралов +%,times % шрифт Times как основной ]{disser} \usepackage[ @@ -14,6 +15,7 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % Номера страниц снизу и по центру diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx index 39072240691..a643719f497 100644 --- a/Master/texmf-dist/source/latex/disser/autoref.dtx +++ b/Master/texmf-dist/source/latex/disser/autoref.dtx @@ -24,11 +24,11 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \begin{macrocode} -\deflength\firstskip{1cm} -\deflength\secondskip{2cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} +\disser@deflength\firstskip{1cm} +\disser@deflength\secondskip{2cm} +\disser@deflength\thirdskip{1cm} +\disser@deflength\fourthskip{1cm} +\disser@deflength\fifthskip{1cm} % \end{macrocode} % Шрифты элементов титульного листа. diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index 052b1df8693..7fd422c0ce0 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -84,7 +84,7 @@ % \end{macrocode} % На правах рукописи % \begin{macrocode} - \asmanuscript\\ + \asmanuscript%\\ %avoid no line to end error % \end{macrocode} % Факсимиле % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/counters.dtx b/Master/texmf-dist/source/latex/disser/counters.dtx index 738269e2200..a429c8aed1d 100644 --- a/Master/texmf-dist/source/latex/disser/counters.dtx +++ b/Master/texmf-dist/source/latex/disser/counters.dtx @@ -60,17 +60,18 @@ % \DescribeMacro{\theparagraph}\index{Макросы!\verb*+\theparagraph+} % \DescribeMacro{\thesubparagraph}\index{Макросы!\verb*+\thesubparagraph+} % \begin{macrocode} -\renewcommand\thepart{\@Roman\c@part} -\renewcommand\thechapter{\@arabic\c@chapter} + +\renewcommand\thepart{\Roman{part}} +\renewcommand\thechapter{\arabic{chapter}} \newcommand\theappendix{\Asbuk{chapter}} \renewcommand\thesection{% \ifnum\c@chapter > \z@ - \thechapter.\@arabic\c@section% -\else\@arabic\c@section\fi} -\renewcommand\thesubsection{\thesection.\@arabic\c@subsection} -\renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection} -\renewcommand\theparagraph{\@arabic\c@paragraph} -\renewcommand\thesubparagraph{\theparagraph.\@arabic\c@subparagraph} + \thechapter.\arabic{section}% +\else\arabic{section}\fi} +\renewcommand\thesubsection{\thesection.\arabic{subsection}} +\renewcommand\thesubsubsection{\thesubsection.\arabic{subsubsection}} +\renewcommand\theparagraph{\arabic{paragraph}} +\renewcommand\thesubparagraph{\theparagraph.\arabic{subparagraph}} % \end{macrocode} % Формат нумерации разделов документа в оглавлении. diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index 668e1e12b1f..6410d7762a4 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -122,29 +122,29 @@ % \subsubsection{Библиографические ссылки} % \DescribePackage{natbib}\index{Пакеты!\verb*+natbib+} % \begin{macrocode} -\usepackage[square,comma,sort&compress,numbers]{natbib} +\ifDis@natbib + \usepackage[square,comma,sort&compress,numbers]{natbib} +\else +% \end{macrocode} +% Пустые определения команд из пакета |natbib|. +% \DescribeMacro{\bibsection}\index{Макросы!\verb*+\bibsection+} +% \DescribeMacro{\bibpreamble}\index{Макросы!\verb*+\bibpreamble+} +% \DescribeMacro{\bibpostamble}\index{Макросы!\verb*+\bibpostamble+} +% \DescribeMacro{\bibfont}\index{Макросы!\verb*+\bibfont+} +% \DescribeMacro{\bibsep}\index{Макросы!\verb*+\bibsep+} +% \begin{macrocode} + \newcommand\bibsection{} + \newcommand\bibpreamble{} + \newcommand\bibpostamble{} + \newcommand\bibfont{\normalfont\selectfont} + \newlength\bibsep +\fi % \end{macrocode} -% Переопределение |\bibsection| для включения ссылки на список литературы в -% оглавление. +% Команда, создающая заголовок библиографии. % \DescribeMacro{\bibsection}\index{Макросы!\verb*+\bibsection+} % \begin{macrocode} \renewcommand\bibsection{\nchapter{\bibname}} -\@ifundefined{chapter}{% - \renewcommand\bibsection{% - \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% - }% -}{% - \@ifxundefined\NAT@sectionbib{% - \renewcommand\bibsection{% - \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% - }% - }{% - \renewcommand\bibsection{% - \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}% - }% - }% -}% % \end{macrocode} % Преамбула окружения |thebibliography|. @@ -156,50 +156,72 @@ % \DescribeMacro{\@biblabel}\index{Макросы!\verb*+"\"@biblabel+} % \begin{macrocode} \renewcommand\@biblabel[1]{##1.}% + \setlength\bibsep{0pt} } +\@ifpackageloaded{natbib}{ + \@ifundefined{chapter}{% + \renewcommand\bibsection{% + \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{% + \@ifxundefined\NAT@sectionbib{% + \renewcommand\bibsection{% + \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{% + \renewcommand\bibsection{% + \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}% + }% + }% + }% +}{% + \@ifundefined{chapter}{% + \renewcommand\bibsection{% + \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{} % \end{macrocode} -% Переопределение окружения |thebibliography| для создания корректной -% PDF-закладки (основано на варианте из \pkg{natbib}). % \DescribeEnv{thebibliography}\index{Окружения!\verb*+thebibliography+} % \begin{macrocode} -\renewenvironment{thebibliography}[1]{% - \setlength\bibsep{0pt} - \bibsection - \parindent \z@ - \bibpreamble\bibfont - \list{\@biblabel{\arabic{NAT@ctr}}}% - {\@bibsetup{#1}\setcounter{NAT@ctr}{0}}% - \ifNAT@openbib - \renewcommand\newblock{\par} - \else - \renewcommand\newblock{\hskip .11em \@plus.33em \@minus.07em}% - \fi - \sloppy\clubpenalty4000\widowpenalty4000 - \sfcode`\.=1000\relax - \let\citeN\cite - \let\shortcite\cite - \let\citeasnoun\cite -}{% - \def\@noitemerr{% - \PackageWarning{natbib}{Empty `thebibliography' environment}% + \renewenvironment{thebibliography}[1]{ + \bibsection + \parindent\z@ + \bibpreamble\bibfont + \list{\@biblabel{\@arabic\c@enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}% + \setlength{\itemsep}{\bibsep} + \setlength{\parsep}{\bibsep} + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy\clubpenalty4000\widowpenalty4000 + \sfcode`\.\@m + }{% + \bibpostamble + \def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist } - \endlist\vskip-\lastskip% } % \end{macrocode} % \subsubsection{Плавающие объекты} % -% Пакеты \pkg{caption} и \pkg{subfig} для вложенной нумерации плавающих +% Пакеты \pkg{caption} и \pkg{subcaption} для вложенной нумерации плавающих % объектов. % \DescribePackage{caption}\index{Пакеты!\verb*+caption+} -% \DescribePackage{subfig}\index{Пакеты!\verb*+subfig+} +% \DescribePackage{subcaption}\index{Пакеты!\verb*+subcaption+} % \begin{macrocode} \ifDis@subf - \usepackage[config,font=small,labelsep=period]{caption,subfig} + \usepackage[config,font=small,labelsep=period]{caption} + \usepackage[list=true,subrefformat=parens]{subcaption} % \end{macrocode} % Формат счетчика. % \begin{macrocode} + \DeclareCaptionSubType[asbuk]{figure} \def\thesubfigure{\textit{\asbuk{subfigure}}} % \end{macrocode} % Формат ссылки через |\ref|. diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index 4f01dfb9ab9..8f943be3a15 100644 --- a/Master/texmf-dist/source/latex/disser/disser.dtx +++ b/Master/texmf-dist/source/latex/disser/disser.dtx @@ -19,7 +19,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{disser.drv}[2013/12/30 1.3.0 % +\ProvidesFile{disser.drv}[2015/01/03 1.3.1 % Document class for dissertations] \documentclass{ltxdoc} @@ -65,6 +65,7 @@ \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} + \usepackage{microtype} \MakeShortVerb{\|} @@ -182,7 +183,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2013/12/30 1.3.0 % +\ProvidesClass{disser}[2015/01/03 1.3.1 % Document class for dissertations] % \end{macrocode} @@ -251,7 +252,7 @@ % \begin{macrocode} \newif\ifDis@href\Dis@hreffalse % \end{macrocode} -% \item Подключение \pkg{subfig} (отключено). +% \item Подключение \pkg{subcaption} (отключено). % \begin{macrocode} \newif\ifDis@subf\Dis@subffalse % \end{macrocode} @@ -262,7 +263,10 @@ % \item Поддержка математических шрифтов MathTime Pro (отключено). % \begin{macrocode} \newif\ifDis@mtpro\Dis@mtprofalse - +% \end{macrocode} +% \item Подключение \pkg{natbib} (отключено). +% \begin{macrocode} +\newif\ifDis@natbib\Dis@natbibfalse % \end{macrocode} % \end{itemize} % @@ -272,7 +276,7 @@ % \begin{macrocode} \DeclareOption{href}{\Dis@hreftrue} % \end{macrocode} -% Подключение пакета \pkg{subfig} и необходимых настроек. +% Подключение пакета \pkg{subcaption} и необходимых настроек. % \begin{macrocode} \DeclareOption{subf}{\Dis@subftrue} % \end{macrocode} @@ -292,6 +296,10 @@ % \begin{macrocode} \DeclareOption{noams}{\Dis@amsfalse} % \end{macrocode} +% Подключение пакета \pkg{natbib} и необходимых настроек. +% \begin{macrocode} +\DeclareOption{natbib}{\Dis@natbibtrue} +% \end{macrocode} % Размеры листов. % \begin{macrocode} \DeclareOption{a4paper}{% @@ -584,9 +592,9 @@ % \end{macrocode} % Команда, объединяющая |\newlength| и |\setlength|. -% \DescribeMacro{\deflength}\index{Макросы!\verb*+\deflength+} +% \DescribeMacro{\disser@deflength}\index{Макросы!\verb*+\disser@deflength+} % \begin{macrocode} -\providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}} +\providecommand\disser@deflength[2]{\newlength{#1}\setlength{#1}{#2}} \providecommand\ifundeflength[2]{% \ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi } diff --git a/Master/texmf-dist/source/latex/disser/floats.dtx b/Master/texmf-dist/source/latex/disser/floats.dtx index 73115b45b46..153bfbc25f4 100644 --- a/Master/texmf-dist/source/latex/disser/floats.dtx +++ b/Master/texmf-dist/source/latex/disser/floats.dtx @@ -86,12 +86,12 @@ % \DescribeMacro{\abovecaptionskip}\index{Расстояния!\verb*+\abovecaptionskip+} % Вертикальный интервал перед подписью. % \begin{macrocode} -\deflength\abovecaptionskip{10\p@} +\disser@deflength\abovecaptionskip{10\p@} % \end{macrocode} % \DescribeMacro{\belowcaptionskip}\index{Расстояния!\verb*+\belowcaptionskip+} % Вертикальный интервал за подписью. % \begin{macrocode} -\deflength\belowcaptionskip{0\p@} +\disser@deflength\belowcaptionskip{0\p@} % \end{macrocode} % \DescribeMacro{\captionlabeldelim}\index{Макросы!\verb*+\captionlabeldelim+} % Разделитель метки (постоянная часть + номер) и текста подписи. diff --git a/Master/texmf-dist/source/latex/disser/footnote.dtx b/Master/texmf-dist/source/latex/disser/footnote.dtx index 515e6e2dd03..97436ed7e37 100644 --- a/Master/texmf-dist/source/latex/disser/footnote.dtx +++ b/Master/texmf-dist/source/latex/disser/footnote.dtx @@ -42,7 +42,7 @@ % \end{macrocode} % \DescribeMacro{\footnoteindent}\index{Расстояния!\verb+\footnoteindent+} % \begin{macrocode} -\deflength{\footnoteindent}{\parindent} +\disser@deflength{\footnoteindent}{\parindent} % \end{macrocode} % \DescribeMacro{\@makefnmark}\index{Макросы!\verb+\@makefnmark+} diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index 50203ab3790..bb464e00888 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -288,10 +288,10 @@ and the derived files % % Формат счетчиков. % \begin{macrocode} -\renewcommand\theenumi {\@asbuk\c@enumi} +\renewcommand\theenumi {\disser@asbuk\c@enumi} \renewcommand\theenumii {\@arabic\c@enumii} \renewcommand\theenumiii{\@roman\c@enumiii} -\renewcommand\theenumiv {\@Asbuk\c@enumiv} +\renewcommand\theenumiv {\disser@Asbuk\c@enumiv} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/lists.dtx b/Master/texmf-dist/source/latex/disser/lists.dtx index 0ee1573ea02..d10293c9f96 100644 --- a/Master/texmf-dist/source/latex/disser/lists.dtx +++ b/Master/texmf-dist/source/latex/disser/lists.dtx @@ -69,9 +69,9 @@ % Формат счетчиков. % \begin{macrocode} \renewcommand\theenumi {\@arabic\c@enumi} -\renewcommand\theenumii {\@asbuk\c@enumii} +\renewcommand\theenumii {\disser@asbuk\c@enumii} \renewcommand\theenumiii{\@roman\c@enumiii} -\renewcommand\theenumiv {\@Asbuk\c@enumiv} +\renewcommand\theenumiv {\disser@Asbuk\c@enumiv} % \end{macrocode} % % \DescribeMacro{\labelenumi}\index{Макросы!\verb*+\labelenumi+} diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx index 72133c82021..0444b992a63 100644 --- a/Master/texmf-dist/source/latex/disser/titledefs.dtx +++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx @@ -411,7 +411,7 @@ \addto\captionsrussian{% \def\listfigurename{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % \cyri\cyrl\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrt\cyri\cyrv\cyrn\cyro% - \cyrg\cyro % + \cyrg\cyro\ % \cyrm\cyra\cyrt\cyre\cyrr\cyri\cyra\cyrl\cyra} } } @@ -422,7 +422,7 @@ % \subsubsection{Элементы титульного листа} % % \begin{macrocode} -\deflength\fieldhshift{8cm} +\disser@deflength\fieldhshift{8cm} % \end{macrocode} % \DescribeMacro{\namefield}\index{Макросы!\verb*+\namefield+} diff --git a/Master/texmf-dist/source/latex/disser/toc.dtx b/Master/texmf-dist/source/latex/disser/toc.dtx index 74f16a4a403..de8da6e517c 100644 --- a/Master/texmf-dist/source/latex/disser/toc.dtx +++ b/Master/texmf-dist/source/latex/disser/toc.dtx @@ -16,7 +16,7 @@ % Горизонтальный пробел между постоянной и переменной частями заголовков. % \DescribeMacro{\@postskip}\index{Макросы!\verb+"\"@postskip+} % \begin{macrocode} -\def\@postskip{\hskip1em} +\def\@postskip{\texorpdfstring{\hskip1em}{ }} % \end{macrocode} % Длина пробела между заполнителем строки и номером страницы. % \DescribeMacro{\@pnumwidth}\index{Макросы!\verb+"\"@pnumwidth+} diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx index f1df72acebe..9e3f11914b2 100644 --- a/Master/texmf-dist/tex/latex/disser/autoref.rtx +++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx @@ -18,11 +18,11 @@ \autoref@the \if@titlepage\renewcommand\maketitle{ -\deflength\firstskip{1cm} -\deflength\secondskip{2cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} +\disser@deflength\firstskip{1cm} +\disser@deflength\secondskip{2cm} +\disser@deflength\thirdskip{1cm} +\disser@deflength\fourthskip{1cm} +\disser@deflength\fifthskip{1cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index a3d2b64c3c7..9a6cffe1468 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -61,7 +61,7 @@ \vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript\\ + \asmanuscript%\\ %avoid no line to end error \ifDis@facsimile\facsimile\fi \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 3300d06518a..33b9aab64a3 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2013/12/30 1.3.0 % +\ProvidesClass{disser}[2015/01/03 1.3.1 % Document class for dissertations] \RequirePackage{kvoptions} @@ -71,13 +71,14 @@ \newif\ifDis@subf\Dis@subffalse \newif\ifDis@times\Dis@timesfalse \newif\ifDis@mtpro\Dis@mtprofalse - +\newif\ifDis@natbib\Dis@natbibfalse \DeclareOption{href}{\Dis@hreftrue} \DeclareOption{subf}{\Dis@subftrue} \DeclareOption{libcat}{\Dis@libcattrue} \DeclareOption{classified}{\Dis@classifiedtrue} \DeclareOption{facsimile}{\Dis@facsimiletrue} \DeclareOption{noams}{\Dis@amsfalse} +\DeclareOption{natbib}{\Dis@natbibtrue} \DeclareOption{a4paper}{% \setlength\paperheight{297mm} \setlength\paperwidth {210mm} @@ -286,7 +287,7 @@ \DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal} \DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal} -\providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}} +\providecommand\disser@deflength[2]{\newlength{#1}\setlength{#1}{#2}} \providecommand\ifundeflength[2]{% \ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi } @@ -335,17 +336,18 @@ \newcounter{figure}[chapter] \newcounter{table}[chapter] -\renewcommand\thepart{\@Roman\c@part} -\renewcommand\thechapter{\@arabic\c@chapter} + +\renewcommand\thepart{\Roman{part}} +\renewcommand\thechapter{\arabic{chapter}} \newcommand\theappendix{\Asbuk{chapter}} \renewcommand\thesection{% \ifnum\c@chapter > \z@ - \thechapter.\@arabic\c@section% -\else\@arabic\c@section\fi} -\renewcommand\thesubsection{\thesection.\@arabic\c@subsection} -\renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection} -\renewcommand\theparagraph{\@arabic\c@paragraph} -\renewcommand\thesubparagraph{\theparagraph.\@arabic\c@subparagraph} + \thechapter.\arabic{section}% +\else\arabic{section}\fi} +\renewcommand\thesubsection{\thesection.\arabic{subsection}} +\renewcommand\thesubsubsection{\thesubsection.\arabic{subsubsection}} +\renewcommand\theparagraph{\arabic{paragraph}} +\renewcommand\thesubparagraph{\theparagraph.\arabic{subparagraph}} \newcommand\tocthepart{\thepart} \newcommand\tocthechapter{\thechapter} @@ -898,9 +900,9 @@ \@itempenalty -\@lowpenalty \renewcommand\theenumi {\@arabic\c@enumi} -\renewcommand\theenumii {\@asbuk\c@enumii} +\renewcommand\theenumii {\disser@asbuk\c@enumii} \renewcommand\theenumiii{\@roman\c@enumiii} -\renewcommand\theenumiv {\@Asbuk\c@enumiv} +\renewcommand\theenumiv {\disser@Asbuk\c@enumiv} \newcommand\labelenumi {\theenumi.} \newcommand\labelenumii {\theenumii.} \newcommand\labelenumiii{\theenumiii.} @@ -925,8 +927,8 @@ \renewcommand\floatpagefraction{.5} \renewcommand\dbltopfraction{.7} \renewcommand\dblfloatpagefraction{.5} -\deflength\abovecaptionskip{10\p@} -\deflength\belowcaptionskip{0\p@} +\disser@deflength\abovecaptionskip{10\p@} +\disser@deflength\belowcaptionskip{0\p@} \newcommand\captionlabeldelim{.} \newcommand\captionfont{\small} \newcommand\captionlabelfont{\small\selectfont} @@ -979,7 +981,7 @@ \providecommand\prethefootnote{} \providecommand\postthefootnote{} \providecommand\prefootnote{\;} -\deflength{\footnoteindent}{\parindent} +\disser@deflength{\footnoteindent}{\parindent} \def\@makefnmark{\hbox{\prethefootnote% \@textsuperscript{\normalfont\@thefnmark}% @@ -1260,7 +1262,7 @@ %%% From File: toc.dtx -\def\@postskip{\hskip1em} +\def\@postskip{\texorpdfstring{\hskip1em}{ }} \newcommand\@pnumwidth{1.55em} \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} @@ -1410,55 +1412,72 @@ }{} \fi -\usepackage[square,comma,sort&compress,numbers]{natbib} +\ifDis@natbib + \usepackage[square,comma,sort&compress,numbers]{natbib} +\else + \newcommand\bibsection{} + \newcommand\bibpreamble{} + \newcommand\bibpostamble{} + \newcommand\bibfont{\normalfont\selectfont} + \newlength\bibsep +\fi \renewcommand\bibsection{\nchapter{\bibname}} -\@ifundefined{chapter}{% - \renewcommand\bibsection{% - \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% - }% -}{% - \@ifxundefined\NAT@sectionbib{% - \renewcommand\bibsection{% - \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% - }% - }{% - \renewcommand\bibsection{% - \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}% - }% - }% -}% \renewcommand\bibpreamble{% \renewcommand\@biblabel[1]{##1.}% + \setlength\bibsep{0pt} } -\renewenvironment{thebibliography}[1]{% - \setlength\bibsep{0pt} - \bibsection - \parindent \z@ - \bibpreamble\bibfont - \list{\@biblabel{\arabic{NAT@ctr}}}% - {\@bibsetup{#1}\setcounter{NAT@ctr}{0}}% - \ifNAT@openbib - \renewcommand\newblock{\par} - \else - \renewcommand\newblock{\hskip .11em \@plus.33em \@minus.07em}% - \fi - \sloppy\clubpenalty4000\widowpenalty4000 - \sfcode`\.=1000\relax - \let\citeN\cite - \let\shortcite\cite - \let\citeasnoun\cite +\@ifpackageloaded{natbib}{ + \@ifundefined{chapter}{% + \renewcommand\bibsection{% + \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{% + \@ifxundefined\NAT@sectionbib{% + \renewcommand\bibsection{% + \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{% + \renewcommand\bibsection{% + \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}% + }% + }% + }% }{% - \def\@noitemerr{% - \PackageWarning{natbib}{Empty `thebibliography' environment}% + \@ifundefined{chapter}{% + \renewcommand\bibsection{% + \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{} + \renewenvironment{thebibliography}[1]{ + \bibsection + \parindent\z@ + \bibpreamble\bibfont + \list{\@biblabel{\@arabic\c@enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}% + \setlength{\itemsep}{\bibsep} + \setlength{\parsep}{\bibsep} + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy\clubpenalty4000\widowpenalty4000 + \sfcode`\.\@m + }{% + \bibpostamble + \def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist } - \endlist\vskip-\lastskip% } \ifDis@subf - \usepackage[config,font=small,labelsep=period]{caption,subfig} + \usepackage[config,font=small,labelsep=period]{caption} + \usepackage[list=true,subrefformat=parens]{subcaption} + \DeclareCaptionSubType[asbuk]{figure} \def\thesubfigure{\textit{\asbuk{subfigure}}} \providecommand\thefigsubsep{,~} \def\p@subfigure{\@nameuse{thefigure}\thefigsubsep} diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 1c23feca17d..b42500ac88e 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -78,10 +78,10 @@ \renewcommand\conclusionname{% \cyr\CYRZ\CYRA\CYRK\CYRL\CYRYU\CYRCH\CYRE\CYRN\CYRI\CYRE } -\renewcommand\theenumi {\@asbuk\c@enumi} +\renewcommand\theenumi {\disser@asbuk\c@enumi} \renewcommand\theenumii {\@arabic\c@enumii} \renewcommand\theenumiii{\@roman\c@enumiii} -\renewcommand\theenumiv {\@Asbuk\c@enumiv} +\renewcommand\theenumiv {\disser@Asbuk\c@enumiv} \renewcommand\labelenumi {\theenumi)} \renewcommand\labelenumii {\theenumii)} diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index 1b20a952480..3508d169b20 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -155,12 +155,12 @@ \addto\captionsrussian{% \def\listfigurename{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % \cyri\cyrl\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrt\cyri\cyrv\cyrn\cyro% - \cyrg\cyro % + \cyrg\cyro\ % \cyrm\cyra\cyrt\cyre\cyrr\cyri\cyra\cyrl\cyra} } } -\deflength\fieldhshift{8cm} +\disser@deflength\fieldhshift{8cm} \providecommand\diplomafield[1]{% \csname #1label\endcsname,\\% -- cgit v1.2.3