From 76eb9c1d1aaa84b6d3edc7bd56d9f19ccd77371a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Mar 2017 21:37:27 +0000 Subject: disser (5mar17) git-svn-id: svn://tug.org/texlive/trunk@43400 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/disser/ChangeLog | 19 ++ Master/texmf-dist/doc/latex/disser/Makefile | 30 +-- Master/texmf-dist/doc/latex/disser/README | 115 --------- Master/texmf-dist/doc/latex/disser/README-ru.md | 97 ++++++++ Master/texmf-dist/doc/latex/disser/README.md | 79 ++++++ Master/texmf-dist/doc/latex/disser/README.ru | 112 --------- Master/texmf-dist/doc/latex/disser/cp1251.csf | 275 --------------------- .../texmf-dist/doc/latex/disser/include/latex.mk | 13 +- .../doc/latex/disser/include/latex.nmk.cmd | 33 ++- Master/texmf-dist/doc/latex/disser/manual.tex | 68 ++--- Master/texmf-dist/doc/latex/disser/nomake.cmd | 18 +- .../doc/latex/disser/templates-utf8/Makefile | 2 + .../doc/latex/disser/templates-utf8/bachelor/a.tex | 1 + .../latex/disser/templates-utf8/bachelor/app-a.tex | 2 - .../disser/templates-utf8/bachelor/thesis.bib | 82 +++--- .../disser/templates-utf8/bachelor/thesis.tex | 46 +++- .../latex/disser/templates-utf8/candidate/1.tex | 16 ++ .../latex/disser/templates-utf8/candidate/a.tex | 1 + .../disser/templates-utf8/candidate/app-a.tex | 1 - .../disser/templates-utf8/candidate/autoref.tex | 35 +-- .../latex/disser/templates-utf8/candidate/defs.tex | 9 - .../disser/templates-utf8/candidate/intro.tex | 8 +- .../disser/templates-utf8/candidate/thesis.bib | 82 +++--- .../disser/templates-utf8/candidate/thesis.tex | 34 ++- .../doc/latex/disser/templates-utf8/doctor/1.tex | 16 ++ .../doc/latex/disser/templates-utf8/doctor/a.tex | 1 + .../latex/disser/templates-utf8/doctor/app-a.tex | 1 - .../latex/disser/templates-utf8/doctor/autoref.tex | 10 +- .../latex/disser/templates-utf8/doctor/defs.tex | 9 - .../latex/disser/templates-utf8/doctor/intro.tex | 2 +- .../latex/disser/templates-utf8/doctor/nomake.cmd | 17 +- .../latex/disser/templates-utf8/doctor/thesis.bib | 82 +++--- .../latex/disser/templates-utf8/doctor/thesis.tex | 31 ++- .../doc/latex/disser/templates-utf8/master/1.tex | 16 ++ .../doc/latex/disser/templates-utf8/master/a.tex | 1 + .../latex/disser/templates-utf8/master/app-a.tex | 1 - .../latex/disser/templates-utf8/master/intro.tex | 4 - .../latex/disser/templates-utf8/master/thesis.bib | 82 +++--- .../latex/disser/templates-utf8/master/thesis.tex | 35 ++- .../latex/disser/templates-utf8/specialist/1.tex | 14 ++ .../latex/disser/templates-utf8/specialist/a.tex | 1 + .../disser/templates-utf8/specialist/app-a.tex | 1 - .../disser/templates-utf8/specialist/intro.tex | 4 - .../disser/templates-utf8/specialist/thesis.bib | 82 +++--- .../disser/templates-utf8/specialist/thesis.tex | 41 ++- .../texmf-dist/doc/latex/disser/templates/Makefile | 2 + .../doc/latex/disser/templates/bachelor/1.tex | 3 +- .../doc/latex/disser/templates/bachelor/a.tex | 1 + .../doc/latex/disser/templates/bachelor/app-a.tex | 2 - .../doc/latex/disser/templates/bachelor/thesis.bib | 85 ++++--- .../doc/latex/disser/templates/bachelor/thesis.tex | 48 +++- .../doc/latex/disser/templates/candidate/1.tex | 16 ++ .../doc/latex/disser/templates/candidate/a.tex | 1 + .../doc/latex/disser/templates/candidate/app-a.tex | 1 - .../latex/disser/templates/candidate/autoref.tex | 66 ++--- .../latex/disser/templates/candidate/common.tex | 2 +- .../doc/latex/disser/templates/candidate/defs.tex | 9 - .../doc/latex/disser/templates/candidate/intro.tex | 8 +- .../latex/disser/templates/candidate/thesis.bib | 85 ++++--- .../latex/disser/templates/candidate/thesis.tex | 39 ++- .../doc/latex/disser/templates/doctor/1.tex | 16 ++ .../doc/latex/disser/templates/doctor/Makefile | 2 +- .../doc/latex/disser/templates/doctor/a.tex | 1 + .../doc/latex/disser/templates/doctor/app-a.tex | 1 - .../doc/latex/disser/templates/doctor/autoref.tex | 37 +-- .../doc/latex/disser/templates/doctor/common.tex | 2 +- .../doc/latex/disser/templates/doctor/defs.tex | 9 - .../doc/latex/disser/templates/doctor/intro.tex | 2 +- .../doc/latex/disser/templates/doctor/nomake.cmd | 17 +- .../doc/latex/disser/templates/doctor/thesis.bib | 85 ++++--- .../doc/latex/disser/templates/doctor/thesis.tex | 36 ++- .../doc/latex/disser/templates/master/1.tex | 16 ++ .../doc/latex/disser/templates/master/a.tex | 1 + .../doc/latex/disser/templates/master/app-a.tex | 1 - .../doc/latex/disser/templates/master/thesis.bib | 85 ++++--- .../doc/latex/disser/templates/master/thesis.tex | 71 ++++-- .../doc/latex/disser/templates/specialist/1.tex | 14 ++ .../doc/latex/disser/templates/specialist/a.tex | 1 + .../latex/disser/templates/specialist/app-a.tex | 1 - .../latex/disser/templates/specialist/thesis.bib | 85 ++++--- .../latex/disser/templates/specialist/thesis.tex | 46 +++- 81 files changed, 1280 insertions(+), 1246 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/disser/README create mode 100644 Master/texmf-dist/doc/latex/disser/README-ru.md create mode 100644 Master/texmf-dist/doc/latex/disser/README.md delete mode 100644 Master/texmf-dist/doc/latex/disser/README.ru delete mode 100644 Master/texmf-dist/doc/latex/disser/cp1251.csf create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/master/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex delete mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index c9b2433b2c8..1b419314376 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -2,6 +2,25 @@ disser changelog Copyright (C) Stanislav Kruchinin ------------------------------------------- +Summary of changes in version 1.5.0 (2017-03-03): + +Classes and styles: ++ Add compatibility with nomencl package. +- Remove gost705 from package. +- Remove obsolete class options: noams, times, mtpro. + +Templates: ++ Use AMS packages by default. ++ Packages for Times font (disabled by default). ++ Automated generation of nomenclature with nomencl package. +* Use gost2008 bibliography style instead of gost705. +* Update bibliography examples. + +Makefiles: ++ Add compatibility with nomencl package. +- Remove installation of gost705 and csf-files. + + Summary of changes in version 1.4.0 (2016-07-03): Classes and styles: diff --git a/Master/texmf-dist/doc/latex/disser/Makefile b/Master/texmf-dist/doc/latex/disser/Makefile index be7b7eee0e8..92bab2d9434 100644 --- a/Master/texmf-dist/doc/latex/disser/Makefile +++ b/Master/texmf-dist/doc/latex/disser/Makefile @@ -4,14 +4,11 @@ # TARGET := disser -BST := gost705 -MAINDTX := $(TARGET) $(BST) gost732 +DTXFILES := $(TARGET) gost732 MANUAL := manual CLSFILES := *.cls *.rtx -BSTFILES := gost705.bst gost705s.bst -CSFFILES := *.csf -DOCFILES := $(addsuffix .pdf, $(MAINDTX) $(MANUAL)) +DOCFILES := $(addsuffix .pdf, $(DTXFILES) $(MANUAL)) TEXTFILES := ../README ../README.ru ../ChangeLog SRCFILES := *.dtx $(TARGET).ins dtx.ist $(MANUAL).tex Makefile \ nomake.cmd @@ -20,8 +17,6 @@ TEXMF ?= /usr/share/texmf DESTDIR ?= $(TEXMF) CLSDIR ?= $(DESTDIR)/tex/latex/$(TARGET) DOCDIR ?= $(DESTDIR)/doc/latex/$(TARGET) -BSTDIR ?= $(DESTDIR)/bibtex/bst/$(TARGET) -CSFDIR ?= $(DESTDIR)/bibtex/csf/$(TARGET) SRCDIR ?= $(DESTDIR)/source/latex/$(TARGET) CLEXT ?= *.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \ @@ -36,6 +31,7 @@ LATEXFLAGS ?= --src-specials PDFLATEXFLAGS ?= --shell-escape --synctex=1 MIFLAGS ?= -r -s dtx.ist +.PHONY: all package doc dvi pdf clean install uninstall reinstall help all: package doc @@ -43,7 +39,7 @@ package: $(TARGET).cls doc: pdf -dvi: $(addsuffix .dvi, $(MAINDTX) $(MANUAL)) +dvi: $(addsuffix .dvi, $(DTXFILES) $(MANUAL)) pdf: $(DOCFILES) @@ -57,22 +53,16 @@ install: all mkdir -p $(DOCDIR) ;\ mkdir -p $(SRCDIR) ;\ cp $(CLSFILES) $(CLSDIR) ;\ - cp $(BSTFILES) $(BSTDIR) ;\ - cp $(CSFFILES) $(CSFDIR) ;\ cp $(DOCFILES) $(DOCDIR) ;\ cp $(TEXTFILES) $(DOCDIR) ;\ cp $(SRCFILES) $(SRCDIR) uninstall: -rm $(addprefix $(CLSDIR)/, $(CLSFILES)) - -rm $(addprefix $(BSTDIR)/, $(BSTFILES)) - -rm $(addprefix $(CSFDIR)/, $(CSFFILES)) -rm $(addprefix $(DOCDIR)/, $(DOCFILES)) -rm $(addprefix $(DOCDIR)/, $(notdir $(TEXTFILES))) -rm $(addprefix $(SRCDIR)/, $(SRCFILES)) -rmdir $(CLSDIR) - -rmdir $(BSTDIR) - -rmdir $(CSFDIR) -rmdir $(DOCDIR) -rmdir $(SRCDIR) @@ -90,18 +80,6 @@ $(TARGET).pdf: $(TARGET).dtx $(PDFLATEX) $(PDFLATEXFLAGS) $< $(PDFLATEX) $(PDFLATEXFLAGS) $< -$(BST).dvi: $(BST).dtx - $(LATEX) $(LATEXFLAGS) $< - $(MI) $(MIFLAGS) $(BST) - $(LATEX) $(LATEXFLAGS) $< - $(LATEX) $(LATEXFLAGS) $< - -$(BST).pdf: $(BST).dtx - $(PDFLATEX) $(PDFLATEXFLAGS) $< - $(MI) $(MIFLAGS) $(BST) - $(PDFLATEX) $(PDFLATEXFLAGS) $< - $(PDFLATEX) $(PDFLATEXFLAGS) $< - %.cls: %.ins $(LATEX) $^ diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README deleted file mode 100644 index 7f119e7ccef..00000000000 --- a/Master/texmf-dist/doc/latex/disser/README +++ /dev/null @@ -1,115 +0,0 @@ -1. Introduction ---------------- - -This package provides LaTeX classes, bibliography styles and document -templates for typesetting dissertations and author's abstracts that satisfy -the requirements of dissertation councils and High Certification Commission of -Russian Federation. - - -2. Required packages and programs ---------------------------------- -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, subcaption, wrapfig, and packages for russian language support -in LaTeX. - -For typesetting documents using Times font family you should install the -following packages: pscyr or cyrtimes (text fonts), txfonts or mtpro (math -fonts). - -For automated processing of figures you should install the following programs: -Ghostscript, epstool and sam2p. - - -3. Downloads and updates ------------------------- -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 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 (see -disser-.tds.zip file in Downloads section): - http://sourceforge.net/projects/disser/ - -Public source code repositories of this project: - 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://bitbucket.org/sky/disser/get/tip.zip - - -4. Installation ---------------- - -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 command line prompt: - set DESTDIR=disk:\path\to\texmf - nomake install - -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". - -Examples of commands for MiKTeX 2.9. - -Installation for all users: - set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9 - nomake install - mktexlsr --admin - -Installation for current user only: - set DESTDIR=%APPDATA%\MiKTeX\2.9 - nomake install - mktexlsr - -5. License ----------- - -Copyright (c) Stanislav Kruchinin - -It may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.3 -of this license or (at your option) any later version. -The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX -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. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/README-ru.md b/Master/texmf-dist/doc/latex/disser/README-ru.md new file mode 100644 index 00000000000..3a0933ee3e5 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/README-ru.md @@ -0,0 +1,97 @@ +# 1. + + disser , + . + +# 2. + + LaTeX + : +amsfonts, amsmath, amssymb, caption, cmap, gost, graphicx, ifpdf, kvoptions, +natbib, hyperref, subcaption, wrapfig, + . + + Times + tempora cyrtimes, --- newtxmath mtpro. + + Makefile +nomake.cmd Ghostscript, epstool sam2p. + +# 3. + +- disser CTAN: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ +- Sourceforge: http://sourceforge.net/projects/disser/ +- : + - https://github.org/polariton/disser/ + - https://bitbucket.org/sky/disser/ + - https://sourceforge.net/p/disser/disser.git + +ZIP- : http://www.ctan.org/get/macros/latex/contrib/disser.zip +ZIP- , TeX (. disser-.tds.zip Download). + +# 4. +## 4.1. ZIP- + + . + disser-.tds.zip +, TeX. + + Unix- : +```sh +$ cd ///texmf +$ unzip ////disser-.tds.zip +$ mktexlsr +``` + + Windows: +```sh +$ cd :\\\texmf +$ unzip :\\\\disser-.tds.zip +$ mktexlsr +``` + +## 4.2. + + + + +- Unix- : +```sh +$ env DESTDIR=///texmf make install +``` + +- Windows: +```sh +$ set DESTDIR=:\\\texmf +$ nomake install +``` + + ///texmf :\\\texmf -- TeX. + +```sh +$ mktexlsr +``` + + MiKTeX 2.9 Windows 7. + +- : +```sh +$ set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9 +$ nomake install +$ mktexlsr --admin +``` + +- : +```sh +$ set DESTDIR=%APPDATA%\MiKTeX\2.9 +$ nomake install +$ mktexlsr +``` + +# 5. + + () + + / , 1.3 ( ) . ://.-./. 1.3 2003/12/01 . + + , ; . diff --git a/Master/texmf-dist/doc/latex/disser/README.md b/Master/texmf-dist/doc/latex/disser/README.md new file mode 100644 index 00000000000..e50c984b5bf --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/README.md @@ -0,0 +1,79 @@ +# 1. Introduction + +This package provides LaTeX classes, bibliography styles and document templates for typesetting dissertations and author's abstracts that satisfy the requirements of dissertation councils and High Certification Commission of Russian Federation. + +# 2. Required packages and programs + +For installation from sources and compilation of the documents you will need the following third-party packages: `amsfonts`, `amsmath`, `amssymb`, `caption`, `cmap`, `graphicx`, `ifpdf`, `natbib`, `hyperref`, `hypernat`, `subcaption`, `wrapfig`, and packages for russian language support in LaTeX. + +For typesetting documents using Times font family you should install the following packages: `pscyr` or `cyrtimes` (text fonts), `newtxmath` or `mtpro2` (math fonts). + +For automated processing of figures you should install the following programs: `Ghostscript`, `epstool` and `sam2p`. + +# 3. Downloads and updates + +- CTAN directory: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ +- Project at Sourceforge: http://sourceforge.net/projects/disser/ +- Public source code repositories of this project: + - https://github.org/polariton/disser/ + - https://bitbucket.org/sky/disser/ + - https://sourceforge.net/p/disser/disser.git + +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 (see `disser-.tds.zip` file in Downloads section). + +# 4. Installation +## 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: +```sh +$ 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: +```sh +$ env DESTDIR=/path/to/texmf make install +``` +- in Windows command line prompt: +```sh +$ set DESTDIR=disk:\path\to\texmf +$ nomake install +``` +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 +```sh +$ mktexlsr +``` +if you install the package to user's directory `"%APPDATA%\MiKTeX\2.9"` or +```sh +$ mktexlsr --admin +``` +if you install the package to one of the common directories, like `"%programfiles%\MiKTeX 2.9"` or `"%ALLUSERSPROFILE%\MiKTeX\2.9"`. + +Examples of commands for MiKTeX 2.9. + +- Installation for all users: +```sh +$ set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9 +$ nomake install +$ mktexlsr --admin +``` +- Installation for current user only: +```sh +$ set DESTDIR=%APPDATA%\MiKTeX\2.9 +$ nomake install +$ mktexlsr +``` + +# 5. License + +Copyright (c) Stanislav Kruchinin + +It may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX 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. \ 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 deleted file mode 100644 index c8d73556690..00000000000 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ /dev/null @@ -1,112 +0,0 @@ -1. ------------ - disser , - . - - -2. ------------------------------------ - LaTeX - : -amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, -natbib, hyperref, subcaption, wrapfig, - . - - Times - pscyr cyrtimes, --- txfonts mtpro. - - Makefile -nomake.cmd Ghostscript, epstool sam2p. - - -3. ------------------------------ - disser CTAN: - http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ - - Sourceforge: - http://sourceforge.net/projects/disser/ - -ZIP- : - http://www.ctan.org/get/macros/latex/contrib/disser.zip - -ZIP- , - TeX -(. disser-.tds.zip Download): - http://sourceforge.net/projects/disser/ - - : - http://mercurial.intuxication.org/hg/disser/ - http://bitbucket.org/sky/disser/ - http://disser.hg.sourceforge.net/hgweb/disser/ - - , - : - http://mercurial.intuxication.org/hg/disser/archive/tip.zip - http://bitbucket.org/sky/disser/get/tip.zip - - -4. ------------- - -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. - - - - - Unix- : - env DESTDIR=///texmf make install - - Windows: - set DESTDIR=:\\\texmf - nomake install - - ///texmf :\\\texmf -- TeX. - - mktexlsr - - MiKTeX 2.9 Windows 7. - - : - set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9 - nomake install - mktexlsr --admin - - : - set DESTDIR=%APPDATA%\MiKTeX\2.9 - nomake install - mktexlsr - - -5. ------------ - - () 2004-2015 - - / - , 1.3 - ( ) . - - ://.-./. - 1.3 - 2003/12/01 . - - , - ; - . \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/cp1251.csf b/Master/texmf-dist/doc/latex/disser/cp1251.csf deleted file mode 100644 index 6e6e360a34d..00000000000 --- a/Master/texmf-dist/doc/latex/disser/cp1251.csf +++ /dev/null @@ -1,275 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% CHARACTER SET: Cyrillic (CP 1251) -%% -%% SORTING ORDER: First Cyrillic then Latin -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% FILE FORMAT -%% -%% The codepage and sorting order (CS) file defines how BibTeX will treat an -%% 8-bit character set, specifically which characters are to be treated as -%% letters, the upper/lower case relationships between characters, and the -%% sorting order of characters. -%% -%% The CS file may contain a number of sections, each presented in the -%% form of a TeX macro: -%% -%% \section-name{ -%%
-%% } -%% -%% Four sections are currently supported: \lowupcase, \lowercase, \uppercase -%% and \order. The syntax of the four supported sections is summarised below. -%% -%% 8-bit characters may be entered naturally, but to avoid problems with -%% character set translation or corruption, they can also be entered using -%% the TeX-style portable notation for character codes, i.e. ^^XX, where XX -%% is the hexadecimal value ofthe character code. -%% -%% Reading of the sections ends when the first '}' character is reached, so -%% '}' can't be included in a section. You can't use ^^7d either. -%% -%% The percent sign ('%') is used to introduce a trailing comment - it and -%% all remaining characters on a line are ignored. ^^25 has the same effect. -%% -%% -%% \lowupcase section -%% -%% The \lowupcase section of the CS file is used to define the lower -%% /upper and upper/lower case relationship of pairs of specified -%% characters. It is only used if the relationship is symmetrical - use -%% \lowercase or \upcase if it isn't. -%% -%% The syntax of the \lowupcase section is: -%% -%% \lowupcase{ -%% % Comment begins with a percent sign -%% -%% ... -%% -%% } -%% -%% Each pair of characters defines that the upper case -%% equivalent of is *and* the lower case equivalent of -%% is . -%% -%% You cannot redefine the lower or upper case equivalent of an ASCII -%% character (code < 128), so all instances of and -%% (i.e. both sides of the relationship) must have codes > 127. -%% -%% -%% \lowercase section -%% -%% The \lowercase section of the CS file is used to define the lower case -%% equivalent of specified characters. It should normally only be used -%% if the relationship isn't symmetrical - use \lowupcase if it is. -%% -%% The syntax of the \lowercase section is: -%% -%% \lowercase{ -%% % Comment begins with a percent sign -%% -%% ... -%% -%% } -%% -%% Each pair of characters defines that the lower case -%% equivalent of is . -%% -%% You cannot redefine the lower case equivalent of an ASCII character -%% (code < 128), so all instances of (i.e. the left hand side -%% of the relationship) must have codes > 127. -%% -%% -%% \uppercase section -%% -%% The \uppercase section of the CS file is used to define the upper case -%% equivalent of specified characters. It should normally only be used -%% if the relationship isn't symmetrical - use \lowupcase if it is. -%% -%% The syntax of the \uppercase section is: -%% -%% \uppercase{ -%% % Comment begins with a percent sign -%% -%% ... -%% -%% } -%% -%% Each pair of characters defines that the upper case -%% case equivalent of is . -%% -%% You cannot redefine the upper case equivalent of an ASCII character -%% (code < 128), so all instances of (i.e. the left hand side -%% of the relationship) must have codes > 127. -%% -%% -%% \order section -%% -%% The \order section of the CS file is used to define the order in which -%% characters are sorted. -%% -%% The syntax of the \order section is: -%% -%% \order{ -%% % Comment begins with a percent sign -%% % whitespace between the chars -%% - % a hyphen between the chars -%% _ % an underscore between the chars -%% ... -%% -%% } -%% -%% All characters on the same line are given the same sorting weight. -%% -%% The construct is used to denote that -%% all characters in the range to should be given the -%% same sorting weight. For example, "A _ Z" would cause all ASCII -%% upper case alphabetical characters to have the same sorting weight -%% and would be equivalent to placing all 26 characters on the same line. -%% -%% The construct is used to denote that all -%% characters in the range to should be given an -%% ascending set of sorting weights, starting with and ending -%% with . For example, "A - Z" would cause all upper case ASCII -%% alphabetical characters to be sorted in ascending order and would be -%% equivalent to placing 'A' on the first line, 'B' on the second, -%% through to 'Z' on the 26th line. -%% -%% The characters at the beginning of the order section are given a lower -%% sorting weight than characters occuring later. When sorting -%% alphabetically, characters with the lowest weight come first. -%% -%% All characters not in the \order section (including ASCII characters) -%% are given the same very high sorting weight to ensure that they come -%% last when sorting alphabetically. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - -%% -%% CHARACTER SET -%% -\lowupcase{ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} - - - -%% -%% SORTING ORDER -%% -%% -\order{ - 0-9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A a - B b - C c - D d - E e - F f - G g - H h - I i - J j - K k - L l - M m - N n - O o - P p - Q q - R r - S s - T t - U u - V v - W w - X x - Y y - Z z -} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% END OF FILE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk index feaf55e67a7..0a84d8f7c26 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.mk +++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk @@ -16,6 +16,7 @@ PDFLATEX ?= pdflatex PS2PDF ?= gs PSBOOK ?= psbook PSNUP ?= psnup +MAKEINDEX ?= makeindex ARCHEXT ?= zip ARCHFLAGS ?= a -t$(ARCHEXT) @@ -32,7 +33,7 @@ PSNUPFLAGS ?= -2 -pA4 PDFLATEXFLAGS ?= --shell-escape --synctex=1 CLEXT ?= *.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \ - *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf + *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf *.nlo *.nls CLFILES ?= $(CLEXT) $(ARCHIVE) SRCFILES ?= * @@ -83,6 +84,9 @@ $(TARGET).dvi: *.tex *.bib else \ echo Warning: Bibliography file does not exist ;\ fi ;\ + if [ -f $(TARGET).nlo ] ; then \ + $(MAKEINDEX) $(TARGET).nlo -s nomencl.ist -o $(TARGET).nls + fi ;\ $(LATEX) $(TEXFLAGS) $(TARGET).tex ;\ $(LATEX) $(TEXFLAGS) $(TARGET).tex @@ -103,6 +107,9 @@ $(TARGET).pdf: *.tex *.bib else \ echo "Warning: Bibliography file does not exist" ;\ fi ;\ + if [ -f $(TARGET).nlo ] ; then \ + $(MAKEINDEX) $(TARGET).nlo -s nomencl.ist -o $(TARGET).nls ;\ + fi ;\ $(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\ $(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex @@ -115,9 +122,11 @@ $(TARGET)_book.pdf: $(TARGET)_book.ps $(TARGET).rtf: $(TARGET).dvi $(L2RTF) $(L2RTFFLAGS) -a $(TARGET).aux -b $(TARGET).bbl $(TARGET).tex +%.nls: %.nlo + $(MAKEINDEX) $< -s nomencl.ist -o $@ + bmtoeps epstoeps epstopdf fixbb optimize pdftopng256 pdftotiffg4: @$(MAKE) -C fig $@ figclean: @$(MAKE) -C fig clean - diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd index d19bcc767c4..bcff42548bc 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd +++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd @@ -13,17 +13,18 @@ setlocal enabledelayedexpansion if "%target%"=="" set target=thesis if "%bibfile%"=="" set bibfile=thesis.bib -if "%arch%"=="" set arch=7z -if "%bibtex%"=="" set bibtex=bibtex8 -if "%dvips%"=="" set dvips=dvips -if "%l2h%"=="" set l2h=latex2html -if "%l2rtf%"=="" set l2rtf=latex2rtf -if "%latex%"=="" set latex=latex -if "%mktexlsr%"=="" set mktexlsr=mktexlsr -if "%pdflatex%"=="" set pdflatex=pdflatex -if "%ps2pdf%"=="" set ps2pdf=gswin32c -if "%psbook%"=="" set psbook=psbook -if "%psnup%"=="" set psnup=psnup +if "%arch%"=="" set arch=7z +if "%bibtex%"=="" set bibtex=bibtex8 +if "%dvips%"=="" set dvips=dvips +if "%l2h%"=="" set l2h=latex2html +if "%l2rtf%"=="" set l2rtf=latex2rtf +if "%latex%"=="" set latex=latex +if "%mktexlsr%"=="" set mktexlsr=mktexlsr +if "%pdflatex%"=="" set pdflatex=pdflatex +if "%ps2pdf%"=="" set ps2pdf=gswin32c +if "%psbook%"=="" set psbook=psbook +if "%psnup%"=="" set psnup=psnup +if "%makeindex%"=="" set makeindex=makeindex if "%archext%"=="" set archext=zip if "%archflags%"=="" set archflags=a -t%archext% @@ -43,8 +44,8 @@ if "%ps2pdfflags%"=="" ( if "%psnupflags%"=="" set psnupflags=-2 -pA4 if "%pdflatexflags%"=="" set pdflatexflags=--shell-escape --synctex=1 -if "%clext%"=="" set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log ^ - *.dvi *.tmp *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf +if "%clext%"=="" set clext=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol ^ + *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf *.nlo *.nls if "%clfiles%"=="" set clfiles=!clext! %archive% if "%srcfiles%"=="" set srcfiles=* if "%prereq%"=="" set prereq=*.tex *.bib @@ -75,6 +76,9 @@ goto :eof ) else ( echo Warning: Bibliography file does not exist ) + if exist %target%.nlo ( + %makeindex% %target%.nlo -s nomencl.ist -o %target%.nls + ) %latex% %latexflags% %target%.tex %latex% %latexflags% %target%.tex goto :eof @@ -116,6 +120,9 @@ goto :eof ) else ( echo Warning: Bibliography file does not exist ) + if exist %target%.nlo ( + %makeindex% %target%.nlo -s nomencl.ist -o %target%.nls + ) %pdflatex% %pdflatexflags% %target%.tex %pdflatex% %pdflatexflags% %target%.tex goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index e1f6a63f8b0..4ec792172b7 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -44,12 +44,11 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.4.0} +\def\fileversion{1.5.0} \sloppy \begin{document} -\title{ \pkg{disser}: -} +\title{ \pkg{disser}: } \date{ \fileversion} \author{ \\[6pt] \normalsize E-mail: @@ -61,8 +60,7 @@ \begin{abstract}\noindent \pkg{disser}. \file{README} \file{README.ru}. - \href{file:disser.pdf}{\file{disser.pdf}}, \href{file:gost732.pdf}{\file{gost732.pdf}} -\href{file:gost705.pdf}{\file{gost705.pdf}}. + \href{file:disser.pdf}{\file{disser.pdf}}, \href{file:gost732.pdf}{\file{gost732.pdf}}. \end{abstract} \tableofcontents @@ -70,7 +68,7 @@ \section{} \pkg{disser} ~7.0.11--2011 . - \file{disser.cls} \file{gost732.cls}, \file{gost705.bst}, \file{gost705s.bst}, (\file{Makefile}, \file{nomake.cmd}, \file{mk} \file{cmd} \file{include}). + \file{disser.cls} \file{gost732.cls}, (\file{Makefile}, \file{nomake.cmd}, \file{mk} \file{cmd} \file{include}). , ( \file{templates}), . ~\pkg{disser} : , . @@ -161,32 +159,21 @@ \\\hline href & \pkg{hyperref} . -\\\hline - noams & - \pkg{amsmath}, \pkg{amssymb} \pkg{amsfonts} . \\\hline subf & \pkg{subcaption} . -\\\hline - times & - Times . - \pkg{pscyr} \pkg{cyrtimes} ( ), \pkg{txfonts} \pkg{mtpro} ( ). -\\\hline - mtpro & - MathTime Pro. - \cmd{times} \pkg{txfonts} \pkg{mtpro}. \\\hline\hline \end{longtable} \section{ } . - \file{templates} CP-1251, \BibTeX{}8 \pkg{gost705}, \pkg{natbib} \pkg{multibib}. + \file{templates} CP-1251, \BibTeX{}8 \pkg{gost2008}, \pkg{natbib} \pkg{multibib}. \file{templates-utf8} UTF-8, Biber Bib\LaTeX{} \pkg{biblatex-gost}. \section{ } - : \file{Makefile}, GNU Make, \file{nomake.cmd}, \file{cmd.exe} Windows 2000 . + : \file{Makefile}, GNU Make, \file{nomake.cmd}, \file{cmd.exe} (Windows 2000 ). (targets). Unix- : \begin{verbatim} @@ -385,19 +372,7 @@ nomake ... \section{ } - 7.0.5-2008 \file{gost705.bst} \file{gost705s.bst}. - \file{gost71u.bst} \file{gost71s.bst} \pkg{gost}, . - : \pkg{gost} , , , . - \file{gost705s.bst} \file{gost705.bst}, . - - \file{gost705.bst} \file{gost71u.bst}: -\begin{enumerate} -\item . -\item , , . -\item . -\item . -\item . -\end{enumerate} + 7.0.5-2008 \file{gost2008.bst} \file{gost2008s.bst}. |language| |russian|. : @@ -426,19 +401,25 @@ nomake ... \end{verbatim} \cmd{bibtex8}, 8- . - bib-, csf- , , \file{cp1251.csf}. - \file{cp1251.csf}, , ~7.0.5: , , , . - ( , ) , \file{cp1251lc.csf}. + bib-, csf- , , \file{cp1251.csf} \pkg{gost}. - , , : + , CP-1251, : \begin{verbatim} -latex +pdflatex bibtex8 -H -c -latex -latex +pdflatex +pdflatex \end{verbatim} || "--- , || "--- aux-, ( tex-), || "--- . + UTF-8: +\begin{verbatim} +pdflatex +biber +pdflatex +pdflatex +\end{verbatim} + \section{ } \subsection{ } @@ -457,18 +438,19 @@ latex \subsection{ } . - \pkg{multibib}, UTF-8 --- Bib\LaTeX{}. + \pkg{multibib}, UTF-8 "--- Bib\LaTeX{}. \file{thesis.bib} . UTF-8 . \pkg{multibib} |aux|- , CP-1251 : \begin{verbatim} -latex autoref +pdflatex autoref bibtex8 -H -c cp1251 autoref bibtex8 -H -c cp1251 my -latex autoref -latex autoref +pdflatex autoref +pdflatex autoref \end{verbatim} + UTF-8 . : \begin{verbatim} diff --git a/Master/texmf-dist/doc/latex/disser/nomake.cmd b/Master/texmf-dist/doc/latex/disser/nomake.cmd index 385bf5169a4..23a7baf0eec 100644 --- a/Master/texmf-dist/doc/latex/disser/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/nomake.cmd @@ -12,12 +12,9 @@ setlocal enabledelayedexpansion set target=disser set subclass=gost732 -set bst=gost705 set manual=manual set clsfiles=*.cls *.rtx -set bstfiles=gost705.bst gost705s.bst -set csffiles=*.csf set docfiles=%target%.pdf %subclass%.pdf %bst%.pdf %manual%.pdf set textfiles=..\README ..\README.ru ..\ChangeLog set srcfiles=*.dtx %target%.ins dtx.ist %manual%.tex Makefile nomake.cmd @@ -25,14 +22,12 @@ set srcfiles=*.dtx %target%.ins dtx.ist %manual%.tex Makefile nomake.cmd if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.9 if "!destdir!"=="" set destdir=!texmf! if "!clsdir!"=="" set clsdir=!destdir!\tex\latex\%target% -if "!bstdir!"=="" set bstdir=!destdir!\bibtex\bst\%target% -if "!csfdir!"=="" set csfdir=!destdir!\bibtex\csf\%target% if "!docdir!"=="" set docdir=!destdir!\doc\latex\%target% if "!srcdir!"=="" set srcdir=!destdir!\source\latex\%target% if "!clext!"=="" set clext=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof ^ *.lot *.lol *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz -if "!clfiles!"=="" set clfiles=!clext! %clsfiles% %bstfiles% +if "!clfiles!"=="" set clfiles=!clext! %clsfiles% if "!latex!"=="" set latex=latex if "!pdflatex!"=="" set pdflatex=pdflatex @@ -98,13 +93,9 @@ goto :eof :install if not exist %target%.cls call :all if not exist "!clsdir!" mkdir "!clsdir!" - if not exist "!bstdir!" mkdir "!bstdir!" - if not exist "!csfdir!" mkdir "!csfdir!" if not exist "!docdir!" mkdir "!docdir!" if not exist "!srcdir!" mkdir "!srcdir!" for %%f in (%clsfiles%) do xcopy /y /i /f %%f "!clsdir!" - for %%f in (%bstfiles%) do xcopy /y /i /f %%f "!bstdir!" - for %%f in (%csffiles%) do xcopy /y /i /f %%f "!csfdir!" for %%f in (%docfiles%) do xcopy /y /i /f %%f "!docdir!" for %%f in (%textfiles%) do xcopy /y /i /f %%f "!docdir!" for %%f in (%srcfiles%) do xcopy /y /i /f %%f "!srcdir!" @@ -123,11 +114,6 @@ goto :eof !pdflatex! !pdflatexflags! %subclass%.dtx !pdflatex! !pdflatexflags! %subclass%.dtx - !pdflatex! !pdflatexflags! %bst%.dtx - !mi! !miflags! %bst% - !pdflatex! !pdflatexflags! %bst%.dtx - !pdflatex! !pdflatexflags! %bst%.dtx - !pdflatex! !pdflatexflags! %manual%.tex !pdflatex! !pdflatexflags! %manual%.tex goto :eof @@ -139,8 +125,6 @@ goto :eof :uninstall rmdir /s /q "!clsdir!" - rmdir /s /q "!bstdir!" - rmdir /s /q "!csfdir!" rmdir /s /q "!docdir!" rmdir /s /q "!srcdir!" goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile index 733d70078f5..849cb3da680 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile @@ -8,6 +8,8 @@ TEXMF ?= /usr/share/texmf DESTDIR ?= $(TEXMF) DOCDIR ?= $(DESTDIR)/doc/latex/disser +.PHONY: help install uninstall reinstall + 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 $@ diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex deleted file mode 100644 index 791bc0e8453..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex +++ /dev/null @@ -1,2 +0,0 @@ -\appendix -\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib index ea2e0c361fe..cbb799db326 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib @@ -106,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {М. А. Скворцов}, title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, school = {ИТФ им. Л.~Д.~Ландау}, @@ -124,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {Э. В. Тернер}, - authortype = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + author = {Э. В. Тернер}, + authorcountry= {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, - authortype = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + author = {В. И. Чугаева}, + authorcountry= {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex index b8f40840826..a78335a4f00 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex @@ -1,9 +1,9 @@ \documentclass[% bachelor, % тип документа +%natbib, % использовать пакет natbib для "сжатия" цитирований subf, % использовать пакет subcaption для вложенной нумерации рисунков href, % использовать пакет hyperref для создания гиперссылок colorlinks, % цветные гиперссылки -%times, % шрифт Times как основной %fixint, % включить прямые знаки интегралов ]{disser} @@ -11,12 +11,28 @@ colorlinks, % цветные гиперссылки a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Шрифт Times в тексте как основной +%\usepackage{tempora} +% альтернативный пакет из дистрибутива TeX Live +%\usepackage{cyrtimes} -\usepackage[style=gost-numeric, +% Шрифт Times в формулах как основной +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% альтернативный пакет +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} + +\usepackage[% + style=gost-numeric, backend=biber, language=auto, hyperref=auto, @@ -51,6 +67,10 @@ colorlinks, % цветные гиперссылки %\def\conclusionname{Выводы} %\def\bibname{Литература} +% +% Титульный лист на русском языке +% + \institution{Название организации} % Имя лица, допускающего к защите (зав. кафедрой) @@ -61,10 +81,13 @@ colorlinks, % цветные гиперссылки \topic{Тема работы} % Автор -\author{ФИО студента} % ФИО -\group{1111/1} % Группа -\coursenum{111111} % Номер специальности -\course{Физика} % Название специальности +\author{ФИО автора} +% Группа +\group{1111/1} +% Номер специальности +\coursenum{111111} +% Название специальности +\course{Физика} % Научный руководитель \sa {ФИО руководителя} @@ -92,7 +115,7 @@ colorlinks, % цветные гиперссылки % %% Author %\author{Author's Name} % Full Name -%\course{Physics} % Название специальности +%\course{Physics} % Specialization % %\group{} % Study Group % @@ -104,6 +127,11 @@ colorlinks, % цветные гиперссылки %\rev {P.\,P.~Petrov} %\revstatus{Associate Professor} % +%% Consultant +%\con{} +%\conspec{} +%\constatus{} +% %% City & Year %\city{Saint Petersburg} %\date{\number\year} @@ -127,4 +155,8 @@ colorlinks, % цветные гиперссылки % Список литературы \printbibliography[heading=bibintoc] +% Приложения +\appendix +\input{a} + \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex index a7f621e9c69..ec899d01a17 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex @@ -1,3 +1,19 @@ \chapter{Название главы} \section{Название секции} + +Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +\nomenclature{$\epsilon_\infty$}{высокочастотная диэлектрическая проницаемость} +\nomenclature{$\epsilon_0$}{статическая диэлектрическая проницаемость} +Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. +Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. +Ссылка на формулу~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}, +\end{equation} +где \nomencl{$\vec r_i$}{координата $i$-й частицы}. + \section{Выводы к первой главе} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex deleted file mode 100644 index 362b35263b7..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex index a5213b86373..ce35cf487f9 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex @@ -1,17 +1,23 @@ \documentclass[% autoref, % тип документа +%natbib, % использовать пакет natbib для "сжатия" цитирований href, % использовать пакет hyperref для создания гиперссылок -facsimile, % отображать факсимиле диссертанта и ученого секретаря colorlinks, % цветные гиперссылки -%fixint, % отключить прямые знаки интегралов %times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов %classified, % гриф секретности +facsimile, % отображать факсимиле диссертанта и ученого секретаря ]{disser} \usepackage[ a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} +\usepackage[autostyle]{csquotes} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} @@ -62,20 +68,17 @@ colorlinks, % цветные гиперссылки \begin{center} Работа выполнена в \emph{название организации}. \end{center} -\vskip1ex -\begin{tabularx}{\linewidth}{lp{1cm}X} -Научный руководитель: & & \emph{ученая степень}, \\ - & & \emph{ученое звание}, \\ - & & \emph{фамилия имя отчество} -\\ -Официальные оппоненты: & & \emph{ученая степень}, \\ - & & \emph{ученое звание}, \\ - & & \emph{фамилия имя отчество}\\ - & & \emph{ученая степень}, \\ - & & \emph{ученое звание}, \\ - & & \emph{фамилия имя отчество} -\\ -Ведущая организация: & & \emph{название организации}\\ +\vskip1ex\noindent +\begin{tabularx}{\linewidth}{@{}lX@{}} + \textbf{Научный руководитель:} & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + \textbf{Официальные оппоненты:} & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + \textbf{Ведущая организация:} & название организации \end{tabularx} \vskip2ex\noindent diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex deleted file mode 100644 index 827832111b1..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex +++ /dev/null @@ -1,9 +0,0 @@ -% Список сокращений и условных обозначений -\defs - -\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}} -$\vec A$ & --- & векторный потенциал\\ -$I$ & --- & интенсивность света\\ -$j_l$ & --- & сферическая функция Бесселя первого рода\\ -$Y_{lm}$ & --- & сферическая гармоника\\ -\end{longtable} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex index 4829b7adf64..f0a930a1e7c 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex @@ -8,7 +8,7 @@ \actualitysection \actualitytext -% Цель диссертационной работы +% Цели и задачи диссертационной работы \objectivesection \objectivetext @@ -16,7 +16,7 @@ \noveltysection \noveltytext -% Практическая ценность +% Теоретическая и практическая значимость \valuesection \valuetext @@ -24,7 +24,7 @@ \resultssection \resultstext -% Апробация работы +% Степень достоверности и апробация результатов \approbationsection \approbationtext @@ -38,4 +38,4 @@ % Структура и объем диссертации \structsection -\structtext \ No newline at end of file +\structtext diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib index ea2e0c361fe..cbb799db326 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib @@ -106,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {М. А. Скворцов}, title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, school = {ИТФ им. Л.~Д.~Ландау}, @@ -124,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {Э. В. Тернер}, - authortype = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + author = {Э. В. Тернер}, + authorcountry= {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, - authortype = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + author = {В. И. Чугаева}, + authorcountry= {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex index 7b10e3716e3..d47a5854b80 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex @@ -1,9 +1,9 @@ \documentclass[% candidate, % тип документа +%natbib, % использовать пакет natbib для "сжатия" цитирований subf, % использовать пакет subcaption для вложенной нумерации рисунков href, % использовать пакет hyperref для создания гиперссылок colorlinks, % цветные гиперссылки -%times, % шрифт Times как основной %fixint, % включить прямые знаки интегралов %classified, % гриф секретности %facsimile, % отображать факсимиле диссертанта @@ -13,10 +13,36 @@ colorlinks, % цветные гиперссылки a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Список сокращений и условных обозначений +\usepackage[intoc,nocfg,russian]{nomencl} +\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}} +\setlength{\nomlabelwidth}{3em} +\setlength{\nomitemsep}{-\parsep} +\renewcommand{\nomlabel}[1]{#1 ---} +\makenomenclature + +% Шрифт Times в тексте как основной +%\usepackage{tempora} +% альтернативный пакет из дистрибутива TeX Live +%\usepackage{cyrtimes} + +% Шрифт Times в формулах как основной +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% альтернативный пакет +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} + +% Плавающие рисунки "в оборку". +\usepackage{wrapfig} \usepackage[style=gost-numeric, backend=biber, @@ -36,7 +62,7 @@ colorlinks, % цветные гиперссылки %\setcitestyle{semicolon} % Ссылки на работы соискателя включаются в общий список литературы -\let\citemy=\cite +\let\citeown=\cite % Использовать полужирное начертание для векторов \let\vec=\mathbf @@ -123,7 +149,7 @@ colorlinks, % цветные гиперссылки \input{concl} % Список сокращений и условных обозначений -%\input{defs} +\printnomenclature % Словарь терминов %\input{dict} @@ -136,6 +162,6 @@ colorlinks, % цветные гиперссылки % Приложения %\appendix -%\input{app-a} +%\input{a} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex index a7f621e9c69..ec899d01a17 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex @@ -1,3 +1,19 @@ \chapter{Название главы} \section{Название секции} + +Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +\nomenclature{$\epsilon_\infty$}{высокочастотная диэлектрическая проницаемость} +\nomenclature{$\epsilon_0$}{статическая диэлектрическая проницаемость} +Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. +Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. +Ссылка на формулу~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}, +\end{equation} +где \nomencl{$\vec r_i$}{координата $i$-й частицы}. + \section{Выводы к первой главе} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex deleted file mode 100644 index 362b35263b7..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex index 22230031108..8f077fe574e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex @@ -1,17 +1,23 @@ \documentclass[% autoref, % тип документа +%natbib, % использовать пакет natbib для "сжатия" цитирований href, % использовать пакет hyperref для создания гиперссылок -facsimile, % отображать факсимиле диссертанта и ученого секретаря colorlinks, % цветные гиперссылки -%fixint, % отключить прямые знаки интегралов %times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов %classified, % гриф секретности +facsimile, % отображать факсимиле диссертанта и ученого секретаря ]{disser} \usepackage[ a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} +\usepackage[autostyle]{csquotes} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex deleted file mode 100644 index 827832111b1..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex +++ /dev/null @@ -1,9 +0,0 @@ -% Список сокращений и условных обозначений -\defs - -\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}} -$\vec A$ & --- & векторный потенциал\\ -$I$ & --- & интенсивность света\\ -$j_l$ & --- & сферическая функция Бесселя первого рода\\ -$Y_{lm}$ & --- & сферическая гармоника\\ -\end{longtable} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex index 7d6448ef196..c4c96991fa1 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex @@ -28,7 +28,7 @@ \methodssection \methodstext -% Положения, выносимые на защиту +% Результаты и положения, выносимые на защиту \resultssection \resultstext diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd index 5e5e05f3520..a426734c237 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd @@ -27,19 +27,20 @@ if "%1"=="" ( exit /b :help - echo all build DVI of autoref and thesis - echo allpdf build PDF of autoref and thesis + echo all build PDF of autoref and thesis + echo allpdf build PDF of autoref and thesis + echo alldvi build DVI of autoref and thesis %latexnmk% help goto :eof -:alldvi - set target=thesis & %latexnmk% dvi - set target=autoref & %latexnmk% dvi - set target= -goto :eof - :allpdf set target=thesis & %latexnmk% pdf set target=autoref & %latexnmk% pdf set target= goto :eof + +:alldvi + set target=thesis & %latexnmk% dvi + set target=autoref & %latexnmk% dvi + set target= +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib index ea2e0c361fe..cbb799db326 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib @@ -106,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {М. А. Скворцов}, title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, school = {ИТФ им. Л.~Д.~Ландау}, @@ -124,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {Э. В. Тернер}, - authortype = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + author = {Э. В. Тернер}, + authorcountry= {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, - authortype = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + author = {В. И. Чугаева}, + authorcountry= {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex index b6dac9d7cdb..f0271e9809f 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex @@ -1,9 +1,9 @@ \documentclass[% doctor, % тип документа +%natbib, % использовать пакет natbib для "сжатия" цитирований subf, % использовать пакет subcaption для вложенной нумерации рисунков href, % использовать пакет hyperref для создания гиперссылок colorlinks, % цветные гиперссылки -%times, % шрифт Times как основной %fixint, % включить прямые знаки интегралов %classified, % гриф секретности %facsimile, % отображать факсимиле диссертанта @@ -13,10 +13,33 @@ colorlinks, % цветные гиперссылки a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Список сокращений и условных обозначений +\usepackage[intoc,nocfg,russian]{nomencl} +\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}} +\setlength{\nomlabelwidth}{3em} +\setlength{\nomitemsep}{-\parsep} +\renewcommand{\nomlabel}[1]{#1 ---} +\makenomenclature + +% Шрифт Times в тексте как основной +%\usepackage{tempora} +% альтернативный пакет из дистрибутива TeX Live +%\usepackage{cyrtimes} + +% Шрифт Times в формулах как основной +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% альтернативный пакет +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} \usepackage[style=gost-numeric, backend=biber, @@ -36,7 +59,7 @@ colorlinks, % цветные гиперссылки %\setcitestyle{semicolon} % Ссылки на работы соискателя включаются в общий список литературы -\let\citemy=\cite +\let\citeown=\cite % Использовать полужирное начертание для векторов \let\vec=\mathbf @@ -120,7 +143,7 @@ colorlinks, % цветные гиперссылки \input{concl} % Список сокращений и условных обозначений -%\input{defs} +\printnomenclature % Словарь терминов %\input{dict} @@ -133,6 +156,6 @@ colorlinks, % цветные гиперссылки % Приложения %\appendix -%\input{app-a} +%\input{a} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex index d2d7f251b17..436eb05edee 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex @@ -1 +1,17 @@ \chapter{Название главы} +\section{Название секции} + +Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +\nomenclature{$\epsilon_\infty$}{высокочастотная диэлектрическая проницаемость} +\nomenclature{$\epsilon_0$}{статическая диэлектрическая проницаемость} +Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. +Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. +Ссылка на формулу~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}, +\end{equation} +где \nomencl{$\vec r_i$}{координата $i$-й частицы}. diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex deleted file mode 100644 index 7e35d8529e6..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{Заголовок приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex index 9266d88ac1a..8b7194aafe7 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex @@ -1,5 +1 @@ \intro - -Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% -Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% -Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib index ea2e0c361fe..cbb799db326 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib @@ -106,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {М. А. Скворцов}, title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, school = {ИТФ им. Л.~Д.~Ландау}, @@ -124,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {Э. В. Тернер}, - authortype = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + author = {Э. В. Тернер}, + authorcountry= {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, - authortype = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + author = {В. И. Чугаева}, + authorcountry= {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex index aafac7072ec..8148016b360 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex @@ -3,7 +3,6 @@ master, % тип документа subf, % использовать пакет subcaption для вложенной нумерации рисунков href, % использовать пакет hyperref для создания гиперссылок colorlinks, % цветные гиперссылки -%times, % шрифт Times как основной %fixint, % включить прямые знаки интегралов ]{disser} @@ -11,10 +10,25 @@ colorlinks, % цветные гиперссылки a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Шрифт Times в тексте как основной +%\usepackage{tempora} +% альтернативный пакет из дистрибутива TeX Live +%\usepackage{cyrtimes} + +% Шрифт Times в формулах как основной +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% альтернативный пакет +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} \usepackage[style=gost-numeric, backend=biber, @@ -58,11 +72,14 @@ colorlinks, % цветные гиперссылки \topic{Тема диссертации} % Автор -\author {ФИО автора} % ФИО -\group {1111/1} % Группа -\coursenum {111111} % Номер направления -\course {Название направления} -\masterprognum{111111} % Номер магистерской программы +\author{ФИО автора} +% Группа +\group{1111/1} +% Номер направления +\coursenum{111111} +\course{Название направления} +% Номер магистерской программы +\masterprognum{111111} \masterprog {Название программы} % Научный руководитель @@ -110,7 +127,7 @@ colorlinks, % цветные гиперссылки % %% Author %\author{Author's Name} % Full Name -%\course{Physics} % Название специальности +%\course{Physics} % Specialization % %\group{} % Study Group %\masterprog {Title of program} @@ -136,8 +153,10 @@ colorlinks, % цветные гиперссылки % Содержание \tableofcontents + % Введение \input{intro} + % Глава 1 \input{1} % Глава 2 @@ -151,6 +170,6 @@ colorlinks, % цветные гиперссылки % Приложения \appendix -\input{app-a} +\input{a} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex index d2d7f251b17..a60395144a9 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex @@ -1 +1,15 @@ \chapter{Название главы} +\section{Название секции} + +Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. +Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. +Ссылка на формулу~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}. +\end{equation} + diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex deleted file mode 100644 index 7e35d8529e6..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{Заголовок приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex index 9266d88ac1a..8b7194aafe7 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex @@ -1,5 +1 @@ \intro - -Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% -Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% -Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib index ea2e0c361fe..cbb799db326 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib @@ -106,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {М. А. Скворцов}, title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, school = {ИТФ им. Л.~Д.~Ландау}, @@ -124,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {Э. В. Тернер}, - authortype = {США}, - title = {Одноразовая ракета-носитель}, - media = {Текст}, - type = {заявка}, - number = {1095735}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} B 64 G 1/00}, - holder = {заявитель Спейс Системз/Лорал, инк.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {Бюл. № 7 (I ч.)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {США}, - pagetotal = {5 с.~: ил.}, - language = {russian}, + author = {Э. В. Тернер}, + authorcountry= {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, } @PATENT{patent2, - author = {В. И. Чугаева}, - authortype = {РФ}, - title = {Приемопередающее устройство}, - media = {Текст}, - type = {пат.}, - number = {2000131736/09}, - location = {Рос. Федерация}, - ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, - holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, - credits = {патент. поверенный Егорова Г. Б.}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {Бюл. № 23 (II ч.)}, - pagetotal = {2 с.~: ил.}, - language = {russian}, + author = {В. И. Чугаева}, + authorcountry= {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, } diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex index f32df4d6a45..2564252f916 100644 --- a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex @@ -1,9 +1,9 @@ \documentclass[% specialist, % тип документа +%natbib, % использовать пакет natbib для "сжатия" цитирований subf, % использовать пакет subcaption для вложенной нумерации рисунков href, % использовать пакет hyperref для создания гиперссылок colorlinks, % цветные гиперссылки -%times, % шрифт Times как основной %fixint, % включить прямые знаки интегралов ]{disser} @@ -11,10 +11,28 @@ colorlinks, % цветные гиперссылки a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Шрифт Times в тексте как основной +%\usepackage{tempora} +% альтернативный пакет из дистрибутива TeX Live +%\usepackage{cyrtimes} + +% Шрифт Times в формулах как основной +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% альтернативный пакет +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} + +% Плавающие рисунки "в оборку". +\usepackage{wrapfig} \usepackage[style=gost-numeric, backend=biber, @@ -52,25 +70,23 @@ colorlinks, % цветные гиперссылки % Титульный лист на русском языке % -% Название организации \institution{Название организации} % Имя лица, допускающего к защите (зав. кафедрой) -\apname{д.\,ф.-м.\,н., профессор С.\,C.~Сидоров} +\apname{ФИО зав. кафедрой} \title{Дипломная работа} -% Тема \topic{<<Тема работы>>} -% Группа -\group{Студента группы} % Автор \author{ФИО автора} +% Группа +\group{Студента группы} % Научный руководитель -\sa {И.\,И.~Иванов} -\sastatus {д.\,ф.-м.\,н., профессор} +\sa {ФИО руководителя} +\sastatus{д.~ф.-м.~н., ст.~н.~с.} % Рецензент \rev {П.\,П.~Петров} @@ -110,6 +126,11 @@ colorlinks, % цветные гиперссылки %\rev {P.\,P.~Petrov} %\revstatus{Associate Professor} % +%% Consultant +%\con{} +%\conspec{} +%\constatus{} +% %% City & Year %\city{Saint Petersburg} %\date{\number\year} @@ -133,4 +154,8 @@ colorlinks, % цветные гиперссылки % Список литературы \printbibliography[heading=bibintoc] +% Приложения +%\appendix +%\input{a} + \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile index 61f1434bfff..91acf101e18 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile @@ -8,6 +8,8 @@ TEXMF ?= /usr/share/texmf DESTDIR ?= $(TEXMF) DOCDIR ?= $(DESTDIR)/doc/latex/disser +.PHONY: help install uninstall reinstall + 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 $@ 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 94b664a9e05..9c1cc0fe169 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -5,7 +5,8 @@ $\dfrac{1}{\epsilon_\infty}$. ~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% -Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. ~\eqref{e:Coulomb} +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. + ~\eqref{e:Coulomb} \begin{equation}\label{e:Coulomb} \frac{1}{|\vec r_1 - \vec r_2|} = 4\pi \int \frac{d^3 q}{(2\pi)^3}\, diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex new file mode 100644 index 00000000000..fee423fcec4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex @@ -0,0 +1 @@ +\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex deleted file mode 100644 index 2e8037f4542..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex +++ /dev/null @@ -1,2 +0,0 @@ -\appendix -\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib index 268d9e817b8..01a40aeb870 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib @@ -6,6 +6,7 @@ pages = {173--180}, year = {1999}, language = {russian}, + keywords = {own}, } @ARTICLE{Petrov_2001_Journal_23_12321, @@ -16,6 +17,7 @@ pages = {12321--12328}, year = {2001}, language = {russian}, + keywords = {own}, } @ARTICLE{Sidorov_2002_Journal_32_1531, @@ -25,6 +27,7 @@ volume = {32}, pages = {1531--1540}, year = {2002}, + keywords = {own}, } @ARTICLE{Yoffe_1993_AP_42_173, @@ -103,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {. . }, title = { }, school = { . .~.~}, @@ -121,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {. . }, - authortype = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {. 7 (I .)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {. 7 (I .)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, - authortype = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } 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 f21cd3a0a57..1ce686c1b8c 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -4,7 +4,6 @@ natbib, % subf, % subcaption href, % hyperref colorlinks, % -%times, % Times %fixint, % ]{disser} @@ -12,10 +11,25 @@ colorlinks, % a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Times +%\usepackage{tempora} +% TeX Live +%\usepackage{cyrtimes} + +% Times +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} % " ". \usepackage{wrapfig} @@ -42,6 +56,10 @@ colorlinks, % %\def\conclusionname{} %\def\bibname{} +% +% +% + \institution{ } % , (. ) @@ -52,10 +70,13 @@ colorlinks, % \topic{ } % -\author{ } % -\group{1111/1} % -\coursenum{111111} % -\course{} % +\author{ } +% +\group{1111/1} +% +\coursenum{111111} +% +\course{} % \sa { } @@ -83,7 +104,7 @@ colorlinks, % % %% Author %\author{Author's Name} % Full Name -%\course{Physics} % +%\course{Physics} % Specialization % %\group{} % Study Group % @@ -95,6 +116,11 @@ colorlinks, % %\rev {P.\,P.~Petrov} %\revstatus{Associate Professor} % +%% Consultant +%\con{} +%\conspec{} +%\constatus{} +% %% City & Year %\city{Saint Petersburg} %\date{\number\year} @@ -115,13 +141,17 @@ colorlinks, % % \input{concl} -% -\newcommand\BibDash{"---} +% +%\newcommand\BibDash{} % \let\BibEmph=\emph -\bibliographystyle{gost705} +\bibliographystyle{gost2008} % \bibliography{thesis} +% +%\appendix +%\input{a} + \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex index 545adfaafc0..3a748098e27 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex @@ -1,3 +1,19 @@ \chapter{ } \section{ } + + $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +\nomenclature{$\epsilon_\infty$}{ } +\nomenclature{$\epsilon_0$}{ } + $\dfrac{1}{\epsilon_\infty}$. + ~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. + ~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}, +\end{equation} + \nomencl{$\vec r_i$}{ $i$- }. + \section{ } \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex new file mode 100644 index 00000000000..fee423fcec4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex @@ -0,0 +1 @@ +\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex deleted file mode 100644 index fee423fcec4..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{ } 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 93822f189ce..2b2624458c6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex @@ -1,18 +1,23 @@ \documentclass[% -autoref, % -natbib, % natbib "" -href, % hyperref -facsimile, % -colorlinks=true % -%,fixint=false % -%,times % Times -%,classified % +autoref, % +natbib, % natbib "" +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % +%classified, % +facsimile, % ]{disser} \usepackage[ a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} +\usepackage[autostyle]{csquotes} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} @@ -29,8 +34,8 @@ colorlinks=true % % \usepackage{multibib} % -% . \citemy{...}. -\newcites{my}{ } +% . \citeown{...}. +\newcites{own}{ } % \graphicspath{{fig/}} @@ -58,20 +63,17 @@ colorlinks=true % \begin{center} \emph{ }. \end{center} -\vskip1ex -\begin{tabularx}{\linewidth}{lp{1cm}X} - : & & \emph{ }, \\ - & & \emph{ }, \\ - & & \emph{ } -\\ - : & & \emph{ }, \\ - & & \emph{ }, \\ - & & \emph{ }\\ - & & \emph{ }, \\ - & & \emph{ }, \\ - & & \emph{ } -\\ - : & & \emph{ }\\ +\vskip1ex\noindent +\begin{tabularx}{\linewidth}{@{}lX@{}} + \textbf{ :} & \textbf{ }\\ + & , \\[6pt] + \textbf{ :} & \textbf{ }\\ + & , \\[6pt] + & \textbf{ }\\ + & , \\[6pt] + & \textbf{ }\\ + & , \\[6pt] + \textbf{ :} & \end{tabularx} \vskip2ex\noindent @@ -163,31 +165,29 @@ colorlinks=true % . - ~\citemy{Ivanov_1999_Journal_17_173}. + ~\citeown{Ivanov_1999_Journal_17_173}. \textbf{ } ... . - ~\citemy{Petrov_2001_Journal_23_12321}. + ~\citeown{Petrov_2001_Journal_23_12321}. \textbf{ } ... . - ~\citemy{Sidorov_2002_Journal_32_1531}. + ~\citeown{Sidorov_2002_Journal_32_1531}. \textbf{ } % ---------------------------------------------------------------- \renewcommand\bibsection{\nsection{ }} -% . -%\newcommand\BibDash{--- } -% . -%\newcommand\BibEmph[1]{\emph{#1}} -\bibliographystylemy{gost705} -\bibliographymy{thesis} +% . +%\newcommand\BibDash{} +\bibliographystyleown{gost2008} +\bibliographyown{thesis} \renewcommand\bibsection{\nsection{ }} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex index 8fd2edfaf02..a9f7001b5fc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex @@ -60,7 +60,7 @@ \mkcommonsect{pub}{.}{% $N$ , $n_1$ - ~\citemy{Ivanov_1999_Journal_17_173, + ~\citeown{Ivanov_1999_Journal_17_173, Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ $n_3$ . } diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex deleted file mode 100644 index 95f86c23593..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex +++ /dev/null @@ -1,9 +0,0 @@ -% -\defs - -\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}} -$\vec A$ & --- & \\ -$I$ & --- & \\ -$j_l$ & --- & \\ -$Y_{lm}$ & --- & \\ -\end{longtable} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex index fe56c241018..1495c31c326 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex @@ -8,7 +8,7 @@ \actualitysection \actualitytext -% +% \objectivesection \objectivetext @@ -16,7 +16,7 @@ \noveltysection \noveltytext -% +% \valuesection \valuetext @@ -24,7 +24,7 @@ \resultssection \resultstext -% +% \approbationsection \approbationtext @@ -38,4 +38,4 @@ % \structsection -\structtext \ No newline at end of file +\structtext diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib index 268d9e817b8..01a40aeb870 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib @@ -6,6 +6,7 @@ pages = {173--180}, year = {1999}, language = {russian}, + keywords = {own}, } @ARTICLE{Petrov_2001_Journal_23_12321, @@ -16,6 +17,7 @@ pages = {12321--12328}, year = {2001}, language = {russian}, + keywords = {own}, } @ARTICLE{Sidorov_2002_Journal_32_1531, @@ -25,6 +27,7 @@ volume = {32}, pages = {1531--1540}, year = {2002}, + keywords = {own}, } @ARTICLE{Yoffe_1993_AP_42_173, @@ -103,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {. . }, title = { }, school = { . .~.~}, @@ -121,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {. . }, - authortype = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {. 7 (I .)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {. 7 (I .)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, - authortype = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } 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 2be40465ced..12ea9f37676 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -4,7 +4,6 @@ natbib, % subf, % subcaption href, % hyperref colorlinks, % -%times, % Times %fixint, % %classified, % %facsimile, % @@ -14,10 +13,36 @@ colorlinks, % a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% +\usepackage[intoc,nocfg,russian]{nomencl} +\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}} +\setlength{\nomlabelwidth}{3em} +\setlength{\nomitemsep}{-\parsep} +\renewcommand{\nomlabel}[1]{#1 ---} +\makenomenclature + +% Times +%\usepackage{tempora} +% TeX Live +%\usepackage{cyrtimes} + +% Times +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} + +% " ". +\usepackage{wrapfig} % %\pagestyle{footcenter} @@ -27,7 +52,7 @@ colorlinks, % %\setcitestyle{semicolon} % -\let\citemy=\cite +\let\citeown=\cite % \let\vec=\mathbf @@ -114,16 +139,16 @@ colorlinks, % \input{concl} % -%\input{defs} +\printnomenclature % %\input{dict} -% -\newcommand\BibDash{"---} +% +%\newcommand\BibDash{} % \let\BibEmph=\emph -\bibliographystyle{gost705} +\bibliographystyle{gost2008} % \bibliography{thesis} @@ -133,6 +158,6 @@ colorlinks, % % %\appendix -%\input{app-a} +%\input{a} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex index 545adfaafc0..3a748098e27 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex @@ -1,3 +1,19 @@ \chapter{ } \section{ } + + $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +\nomenclature{$\epsilon_\infty$}{ } +\nomenclature{$\epsilon_0$}{ } + $\dfrac{1}{\epsilon_\infty}$. + ~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. + ~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}, +\end{equation} + \nomencl{$\vec r_i$}{ $i$- }. + \section{ } \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile index 04887a49c6e..578ab2bec3e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile @@ -19,7 +19,7 @@ allpdf: env TARGET=autoref $(MAKE) pdf ;\ eval unset TARGET -alldvi +alldvi: @env TARGET=thesis $(MAKE) dvi ;\ env TARGET=autoref $(MAKE) dvi ;\ eval unset TARGET diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex new file mode 100644 index 00000000000..fee423fcec4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex @@ -0,0 +1 @@ +\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex deleted file mode 100644 index fee423fcec4..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{ } 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 76dc6b15f3f..85cbfe7c8a5 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex @@ -1,18 +1,23 @@ \documentclass[% -autoref, % -natbib, % natbib "" -href, % hyperref -facsimile, % -colorlinks=true % -%,fixint=false % -%,times % Times -%,classified % +autoref, % +natbib, % natbib "" +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % +%classified, % +facsimile, % ]{disser} \usepackage[ a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} +\usepackage[autostyle]{csquotes} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} @@ -29,8 +34,8 @@ colorlinks=true % % \usepackage{multibib} % -% . \citemy{...}. -\newcites{my}{ } +% . \citeown{...}. +\newcites{own}{ } % \graphicspath{{fig/}} @@ -54,6 +59,7 @@ colorlinks=true % % \thispagestyle{empty} \vspace*{-2cm} +\noindent \begin{center} \emph{ }. \end{center} @@ -69,6 +75,7 @@ colorlinks=true % & , \\[6pt] \textbf{ :} & \end{tabularx} + \vskip2ex\noindent \datefield{} \rule[0pt]{1cm}{0.5pt} \emph{ } \emph{ @@ -158,19 +165,19 @@ colorlinks=true % . - ~\citemy{Ivanov_1999_Journal_17_173}. + ~\citeown{Ivanov_1999_Journal_17_173}. \textbf{ } ... . - ~\citemy{Petrov_2001_Journal_23_12321}. + ~\citeown{Petrov_2001_Journal_23_12321}. \textbf{ } ... . - ~\citemy{Sidorov_2002_Journal_32_1531}. + ~\citeown{Sidorov_2002_Journal_32_1531}. \textbf{ } @@ -179,8 +186,8 @@ colorlinks=true % % . %\newcommand\BibDash{} -\bibliographystylemy{gost2008} -\bibliographymy{thesis} +\bibliographystyleown{gost2008} +\bibliographyown{thesis} \renewcommand\bibsection{\nsection{ }} diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex index 33385d067d2..be51d56d371 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex @@ -55,7 +55,7 @@ \mkcommonsect{pub}{.}{% $N$ , $n_1$ - ~\citemy{Ivanov_1999_Journal_17_173, + ~\citeown{Ivanov_1999_Journal_17_173, Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ $n_3$ . } diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex deleted file mode 100644 index 95f86c23593..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex +++ /dev/null @@ -1,9 +0,0 @@ -% -\defs - -\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}} -$\vec A$ & --- & \\ -$I$ & --- & \\ -$j_l$ & --- & \\ -$Y_{lm}$ & --- & \\ -\end{longtable} diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex index 6476724e47c..71d6748f3b2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex @@ -28,7 +28,7 @@ \methodssection \methodstext -% , +% , \resultssection \resultstext diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd index 30d8351c6ed..9e522a8ae92 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd @@ -26,19 +26,20 @@ if "%1"=="" ( exit /b :help - echo all build DVI of autoref and thesis - echo allpdf build PDF of autoref and thesis + echo all build PDF of autoref and thesis + echo allpdf build PDF of autoref and thesis + echo alldvi build DVI of autoref and thesis %latexnmk% help goto :eof -:alldvi - set target=thesis & %latexnmk% dvi - set target=autoref & %latexnmk% dvi - set target= -goto :eof - :allpdf set target=thesis & %latexnmk% pdf set target=autoref & %latexnmk% pdf set target= goto :eof + +:alldvi + set target=thesis & %latexnmk% dvi + set target=autoref & %latexnmk% dvi + set target= +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib index 268d9e817b8..01a40aeb870 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib @@ -6,6 +6,7 @@ pages = {173--180}, year = {1999}, language = {russian}, + keywords = {own}, } @ARTICLE{Petrov_2001_Journal_23_12321, @@ -16,6 +17,7 @@ pages = {12321--12328}, year = {2001}, language = {russian}, + keywords = {own}, } @ARTICLE{Sidorov_2002_Journal_32_1531, @@ -25,6 +27,7 @@ volume = {32}, pages = {1531--1540}, year = {2002}, + keywords = {own}, } @ARTICLE{Yoffe_1993_AP_42_173, @@ -103,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {. . }, title = { }, school = { . .~.~}, @@ -121,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {. . }, - authortype = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {. 7 (I .)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {. 7 (I .)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, - authortype = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } 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 1696b123c35..cf3da3076ee 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -4,7 +4,6 @@ natbib, % subf, % subcaption href, % hyperref colorlinks, % -%times, % Times %fixint, % %classified, % %facsimile, % @@ -14,10 +13,33 @@ colorlinks, % a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% +\usepackage[intoc,nocfg,russian]{nomencl} +\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}} +\setlength{\nomlabelwidth}{3em} +\setlength{\nomitemsep}{-\parsep} +\renewcommand{\nomlabel}[1]{#1 ---} +\makenomenclature + +% Times +%\usepackage{tempora} +% TeX Live +%\usepackage{cyrtimes} + +% Times +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} % %\pagestyle{footcenter} @@ -27,7 +49,7 @@ colorlinks, % %\setcitestyle{semicolon} % -\let\citemy=\cite +\let\citeown=\cite % \let\vec=\mathbf @@ -111,16 +133,16 @@ colorlinks, % \input{concl} % -%\input{defs} +\printnomenclature % %\input{dict} -% -\newcommand\BibDash{"---} +% +%\newcommand\BibDash{} % \let\BibEmph=\emph -\bibliographystyle{gost705} +\bibliographystyle{gost2008} % \bibliography{thesis} @@ -130,6 +152,6 @@ colorlinks, % % %\appendix -%\input{app-a} +%\input{a} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/1.tex b/Master/texmf-dist/doc/latex/disser/templates/master/1.tex index 4a5e5418401..837215a0e92 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/1.tex @@ -1 +1,17 @@ \chapter{ } +\section{ } + + $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +\nomenclature{$\epsilon_\infty$}{ } +\nomenclature{$\epsilon_0$}{ } + $\dfrac{1}{\epsilon_\infty}$. + ~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. + ~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}, +\end{equation} + \nomencl{$\vec r_i$}{ $i$- }. diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/a.tex b/Master/texmf-dist/doc/latex/disser/templates/master/a.tex new file mode 100644 index 00000000000..fee423fcec4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/master/a.tex @@ -0,0 +1 @@ +\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex deleted file mode 100644 index a7aba9c235e..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib index 268d9e817b8..01a40aeb870 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib @@ -6,6 +6,7 @@ pages = {173--180}, year = {1999}, language = {russian}, + keywords = {own}, } @ARTICLE{Petrov_2001_Journal_23_12321, @@ -16,6 +17,7 @@ pages = {12321--12328}, year = {2001}, language = {russian}, + keywords = {own}, } @ARTICLE{Sidorov_2002_Journal_32_1531, @@ -25,6 +27,7 @@ volume = {32}, pages = {1531--1540}, year = {2002}, + keywords = {own}, } @ARTICLE{Yoffe_1993_AP_42_173, @@ -103,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {. . }, title = { }, school = { . .~.~}, @@ -121,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {. . }, - authortype = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {. 7 (I .)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {. 7 (I .)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, - authortype = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } 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 1460e6ca401..e7529f39b35 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -4,7 +4,6 @@ natbib, % subf, % subcaption href, % hyperref colorlinks, % -%times, % Times %fixint, % ]{disser} @@ -12,10 +11,36 @@ colorlinks, % a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% +\usepackage[intoc,nocfg,russian]{nomencl} +\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}} +\setlength{\nomlabelwidth}{3em} +\setlength{\nomitemsep}{-\parsep} +\renewcommand{\nomlabel}[1]{#1 ---} +\makenomenclature + +% Times +%\usepackage{tempora} +% TeX Live +%\usepackage{cyrtimes} + +% Times +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} + +% " ". +\usepackage{wrapfig} % %\pagestyle{footcenter} @@ -27,11 +52,12 @@ colorlinks, % % \let\vec=\mathbf +% +\graphicspath{{fig/}} + % \setcounter{tocdepth}{2} -\graphicspath{{fig/}} - \begin{document} % @@ -39,6 +65,10 @@ colorlinks, % %\def\conclusionname{} %\def\bibname{} +% +% +% + \institution{ } % , (. ) @@ -49,11 +79,14 @@ colorlinks, % \topic{ } % -\author { } % -\group {1111/1} % -\coursenum {111111} % -\course { } -\masterprognum{111111} % +\author{ } +% +\group{1111/1} +% +\coursenum{111111} +\course{ } +% +\masterprognum{111111} \masterprog { } % @@ -101,7 +134,7 @@ colorlinks, % % %% Author %\author{Author's Name} % Full Name -%\course{Physics} % +%\course{Physics} % Specialization % %\group{} % Study Group %\masterprog {Title of program} @@ -127,27 +160,33 @@ colorlinks, % % \tableofcontents + % \input{intro} -% 1 + +% +%% 1 \input{1} -% 2 +%% 2 %\input{2} % \input{concl} -% -\newcommand\BibDash{"---} +% +\printnomenclature + +% +%\newcommand\BibDash{} % \let\BibEmph=\emph -\bibliographystyle{gost705} +\bibliographystyle{gost2008} % \bibliography{thesis} % -\appendix -\input{app-a} +%\appendix +%\input{a} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex index 4a5e5418401..91a3da47814 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex @@ -1 +1,15 @@ \chapter{ } +\section{ } + + $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. + $\dfrac{1}{\epsilon_\infty}$. + ~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. + ~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}. +\end{equation} + diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex new file mode 100644 index 00000000000..fee423fcec4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex @@ -0,0 +1 @@ +\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex deleted file mode 100644 index a7aba9c235e..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex +++ /dev/null @@ -1 +0,0 @@ -\chapter{ } diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib index 268d9e817b8..01a40aeb870 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib @@ -6,6 +6,7 @@ pages = {173--180}, year = {1999}, language = {russian}, + keywords = {own}, } @ARTICLE{Petrov_2001_Journal_23_12321, @@ -16,6 +17,7 @@ pages = {12321--12328}, year = {2001}, language = {russian}, + keywords = {own}, } @ARTICLE{Sidorov_2002_Journal_32_1531, @@ -25,6 +27,7 @@ volume = {32}, pages = {1531--1540}, year = {2002}, + keywords = {own}, } @ARTICLE{Yoffe_1993_AP_42_173, @@ -103,7 +106,7 @@ language = {russian}, } -@DSCITHESIS{Skvortsov_2008, +@DOCTHESIS{Skvortsov_2008, author = {. . }, title = { }, school = { . .~.~}, @@ -121,50 +124,50 @@ % new-style arXiv reference @ARTICLE{Nielsen_2010_1006.2735, - title = {A configuration interaction analysis of exchange in double quantum dots}, - author = {Erik Nielsen and Richard P. Muller}, - archivePrefix = {arXiv}, - eprint = {1006.2735}, - primaryClass = {cond-mat}, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archiveprefix= {arXiv}, + eprint = {1006.2735}, + primaryclass = {cond-mat}, } @PATENT{patent1, - author = {. . }, - authortype = {}, - title = { -}, - media = {}, - type = {}, - number = {1095735}, - location = {. }, - ipc = {\ensuremath{^7} B 64 G 1/00}, - holder = { /, .}, - credits = {. . .}, - reqnumber = {000108705/28}, - reqdate = {07.04.2000}, - pubdate = {10.03.2001}, - publication = {. 7 (I .)}, - prdate = {09.04.1999}, - prnumber = {09/289, 037}, - prcountry = {}, - pagetotal = {5 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + requestnumber= {000108705/28}, + requestdate = {07.04.2000}, + publicationdate = {10.03.2001}, + publication = {. 7 (I .)}, + prioritydate = {09.04.1999}, + prioritynumber = {09/289, 037}, + prioritycountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, } @PATENT{patent2, - author = {. . }, - authortype = {}, - title = { }, - media = {}, - type = {.}, - number = {2000131736/09}, - location = {. }, - ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, - holder = { . .-. - .}, - credits = {. . .}, - reqnumber = {000108705/28}, - date = {18.12.2000}, - publdate = {20.08.2002}, - publication = {. 23 (II .)}, - pagetotal = {2 .~: .}, - language = {russian}, + author = {. . }, + authorcountry= {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + requestnumber= {000108705/28}, + date = {18.12.2000}, + publicationdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } 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 72d90bae195..508bde75adb 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex @@ -4,7 +4,6 @@ natbib, % subf, % subcaption href, % hyperref colorlinks, % -%times, % Times %fixint, % ]{disser} @@ -12,10 +11,28 @@ colorlinks, % a4paper, mag=1000, left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm ]{geometry} + +\usepackage[intlimits]{amsmath} +\usepackage{amssymb,amsfonts} + \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +\usepackage[autostyle]{csquotes} + +% Times +%\usepackage{tempora} +% TeX Live +%\usepackage{cyrtimes} + +% Times +%\usepackage[varg,cmbraces,cmintegrals]{newtxmath} +% +%\usepackage[subscriptcorrection,nofontinfo]{mtpro2} + +% " ". +\usepackage{wrapfig} % %\pagestyle{footcenter} @@ -43,25 +60,23 @@ colorlinks, % % % -% \institution{ } % , (. ) -\apname{.\,.-.\,., .\,C.~} +\apname{ . } \title{ } -% \topic{<< >>} -% -\group{ } % \author{ } +% +\group{ } % -\sa {.\,.~} -\sastatus {.\,.-.\,., } +\sa { } +\sastatus{.~.-.~., .~.~.} % \rev {.\,.~} @@ -101,6 +116,11 @@ colorlinks, % %\rev {P.\,P.~Petrov} %\revstatus{Associate Professor} % +%% Consultant +%\con{} +%\conspec{} +%\constatus{} +% %% City & Year %\city{Saint Petersburg} %\date{\number\year} @@ -121,13 +141,17 @@ colorlinks, % % \input{concl} -% -\newcommand\BibDash{"---} +% +%\newcommand\BibDash{} % \let\BibEmph=\emph -\bibliographystyle{gost705} +\bibliographystyle{gost2008} % \bibliography{thesis} +% +%\appendix +%\input{a} + \end{document} -- cgit v1.2.3