texlive[41635] Master/texmf-dist: disser (5jul16)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 5 23:39:31 CEST 2016
Revision: 41635
http://tug.org/svn/texlive?view=revision&revision=41635
Author: karl
Date: 2016-07-05 23:39:30 +0200 (Tue, 05 Jul 2016)
Log Message:
-----------
disser (5jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/disser/gost705.bst
trunk/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
trunk/Master/texmf-dist/doc/latex/disser/ChangeLog
trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk
trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
trunk/Master/texmf-dist/doc/latex/disser/manual.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/master/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex
trunk/Master/texmf-dist/source/latex/disser/autoref.dtx
trunk/Master/texmf-dist/source/latex/disser/bachelor.dtx
trunk/Master/texmf-dist/source/latex/disser/candidate.dtx
trunk/Master/texmf-dist/source/latex/disser/counters.dtx
trunk/Master/texmf-dist/source/latex/disser/custom.dtx
trunk/Master/texmf-dist/source/latex/disser/disser.dtx
trunk/Master/texmf-dist/source/latex/disser/doctor.dtx
trunk/Master/texmf-dist/source/latex/disser/floats.dtx
trunk/Master/texmf-dist/source/latex/disser/gost705.dtx
trunk/Master/texmf-dist/source/latex/disser/gost732.dtx
trunk/Master/texmf-dist/source/latex/disser/lists.dtx
trunk/Master/texmf-dist/source/latex/disser/master.dtx
trunk/Master/texmf-dist/source/latex/disser/specialist.dtx
trunk/Master/texmf-dist/tex/latex/disser/bachelor.rtx
trunk/Master/texmf-dist/tex/latex/disser/candidate.rtx
trunk/Master/texmf-dist/tex/latex/disser/disser.cls
trunk/Master/texmf-dist/tex/latex/disser/doctor.rtx
trunk/Master/texmf-dist/tex/latex/disser/gost732.cls
trunk/Master/texmf-dist/tex/latex/disser/master.rtx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex
Modified: trunk/Master/texmf-dist/bibtex/bst/disser/gost705.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/disser/gost705.bst 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/bibtex/bst/disser/gost705.bst 2016-07-05 21:39:30 UTC (rev 41635)
@@ -69,7 +69,7 @@
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.colon after.semicolon after.dash }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{
@@ -81,7 +81,6 @@
#5 'after.slash :=
#6 'after.colon :=
#7 'after.semicolon :=
- #8 'after.dash :=
}
STRINGS { s t }
@@ -106,7 +105,8 @@
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
- { add.period$ " " * write$
+ { add.period$ write$
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,11 +120,7 @@
{ ": " * write$ }
{ output.state after.semicolon =
{ "; " * write$ }
- { output.state after.dash =
- { "~--- " * write$ }
- { add.period$ " " * write$ }
- if$
- }
+ { add.period$ " " * write$ }
if$
}
if$
@@ -205,14 +201,6 @@
if$
}
-FUNCTION {new.dash}
-{
- output.state before.all =
- 'skip$
- { after.dash 'output.state := }
- if$
-}
-
FUNCTION {new.sentence}
{
output.state after.block =
@@ -664,7 +652,7 @@
if$
}
-FUNCTION {bbl.docdisser}
+FUNCTION {bbl.dscithesis}
{
curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
@@ -1633,7 +1621,7 @@
fin.entry
}
-FUNCTION {docdisser}
+FUNCTION {dscithesis}
{
output.bibitem
format.authors "author" output.check
@@ -1640,7 +1628,7 @@
new.sentence
format.btitle add.doi.url "title" output.check
new.colon
- bbl.docdisser format.thesis.type output.nonnull
+ bbl.dscithesis format.thesis.type output.nonnull
new.slash
school "school" output.check
new.block
@@ -1729,7 +1717,7 @@
holder output.nonnull
new.semicolon
credits output.nonnull
- new.dash
+ new.block
reqnumber add.number output
new.semicolon
format.reqdate output
@@ -1943,32 +1931,20 @@
'skip$
{ preamble$ write$ newline$ }
if$
- "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi"
- write$ newline$
- "\ifx\undefined\href\def\href#1#2{#2}\else\fi"
- write$ newline$
- "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi"
- write$ newline$
- "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi"
- write$ newline$
- "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi"
- write$ newline$
- "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%"
- write$ newline$
- "\cyr\cyrd\cyra\cyrt\cyra\ %"
- write$ newline$
- "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi"
- write$ newline$
- "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi"
- write$ newline$
- "\begin{thebibliography}{" longest.label * "}" *
- write$ newline$
- "\def\selectlanguageifdefined#1{"
- write$ newline$
- "\expandafter\ifx\csname date#1\endcsname\relax"
- write$ newline$
- "\else\language\csname l@#1\endcsname\fi}"
- write$ newline$
+ "\providecommand*\BibEmph[1]{#1}" write$ newline$
+ "\providecommand*\BibDash{}" write$ newline$
+ "\providecommand*\href[2]{#2}" write$ newline$
+ "\providecommand*\url[1]{\texttt{#1}}" write$ newline$
+ "\providecommand*\urlprefix{URL: }" write$ newline$
+ "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$
+ "\providecommand*\BibUrlDate[1]{({%" write$ newline$
+ "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$
+ "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$
+ "\providecommand*\BibAnnote[1]{#1}" write$ newline$
+ "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+ "\def\selectlanguageifdefined#1{" write$ newline$
+ "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
+ "\else\language\csname l@#1\endcsname\fi}" write$ newline$
}
EXECUTE {begin.bib}
Modified: trunk/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/disser/gost705s.bst 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/bibtex/bst/disser/gost705s.bst 2016-07-05 21:39:30 UTC (rev 41635)
@@ -69,7 +69,7 @@
{ label }
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.colon after.semicolon after.dash }
+after.dblslash after.slash after.colon after.semicolon }
FUNCTION {init.state.consts}
{
@@ -81,7 +81,6 @@
#5 'after.slash :=
#6 'after.colon :=
#7 'after.semicolon :=
- #8 'after.dash :=
}
STRINGS { s t }
@@ -106,7 +105,8 @@
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
- { add.period$ " " * write$
+ { add.period$ write$
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -120,11 +120,7 @@
{ ": " * write$ }
{ output.state after.semicolon =
{ "; " * write$ }
- { output.state after.dash =
- { "~--- " * write$ }
- { add.period$ " " * write$ }
- if$
- }
+ { add.period$ " " * write$ }
if$
}
if$
@@ -205,14 +201,6 @@
if$
}
-FUNCTION {new.dash}
-{
- output.state before.all =
- 'skip$
- { after.dash 'output.state := }
- if$
-}
-
FUNCTION {new.sentence}
{
output.state after.block =
@@ -664,7 +652,7 @@
if$
}
-FUNCTION {bbl.docdisser}
+FUNCTION {bbl.dscithesis}
{
curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
@@ -1633,7 +1621,7 @@
fin.entry
}
-FUNCTION {docdisser}
+FUNCTION {dscithesis}
{
output.bibitem
format.authors "author" output.check
@@ -1640,7 +1628,7 @@
new.sentence
format.btitle add.doi.url "title" output.check
new.colon
- bbl.docdisser format.thesis.type output.nonnull
+ bbl.dscithesis format.thesis.type output.nonnull
new.slash
school "school" output.check
new.block
@@ -1729,7 +1717,7 @@
holder output.nonnull
new.semicolon
credits output.nonnull
- new.dash
+ new.block
reqnumber add.number output
new.semicolon
format.reqdate output
@@ -2046,32 +2034,20 @@
'skip$
{ preamble$ write$ newline$ }
if$
- "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi"
- write$ newline$
- "\ifx\undefined\href\def\href#1#2{#2}\else\fi"
- write$ newline$
- "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi"
- write$ newline$
- "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi"
- write$ newline$
- "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi"
- write$ newline$
- "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%"
- write$ newline$
- "\cyr\cyrd\cyra\cyrt\cyra\ %"
- write$ newline$
- "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi"
- write$ newline$
- "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi"
- write$ newline$
- "\begin{thebibliography}{" longest.label * "}" *
- write$ newline$
- "\def\selectlanguageifdefined#1{"
- write$ newline$
- "\expandafter\ifx\csname date#1\endcsname\relax"
- write$ newline$
- "\else\language\csname l@#1\endcsname\fi}"
- write$ newline$
+ "\providecommand*\BibEmph[1]{#1}" write$ newline$
+ "\providecommand*\BibDash{}" write$ newline$
+ "\providecommand*\href[2]{#2}" write$ newline$
+ "\providecommand*\url[1]{\texttt{#1}}" write$ newline$
+ "\providecommand*\urlprefix{URL: }" write$ newline$
+ "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$
+ "\providecommand*\BibUrlDate[1]{({%" write$ newline$
+ "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$
+ "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$
+ "\providecommand*\BibAnnote[1]{#1}" write$ newline$
+ "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+ "\def\selectlanguageifdefined#1{" write$ newline$
+ "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
+ "\else\language\csname l@#1\endcsname\fi}" write$ newline$
}
EXECUTE {begin.bib}
Modified: trunk/Master/texmf-dist/doc/latex/disser/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/ChangeLog 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/ChangeLog 2016-07-05 21:39:30 UTC (rev 41635)
@@ -2,6 +2,26 @@
Copyright (C) Stanislav Kruchinin
-------------------------------------------
+Summary of changes in version 1.4.0 (2016-07-03):
+
+Classes and styles:
+* Fix compatibility issues with biblatex.
+* Fix index entries in documentation.
+* Improve compatibility with 'gost' styles.
++ Add check of non-empty \libcatnum.
+- Remove the deprecated 'libcat' option.
+
+Templates:
++ Add new templates with UTF-8 encoding and biblatex support.
++ Add citations to master and specialist templates.
+* Use 'biblatex-gost' style in UTF-8 templates.
+* Synchronize the bib-files in all templates.
+* Enable \libcatnum by default.
+
+Makefiles:
++ Add Biber support.
+
+
Summary of changes in version 1.3.4 (2016-01-27):
Classes and styles:
@@ -10,8 +30,8 @@
Templates:
+ bachelor: add test for nested enumerated lists.
* doctor: update the opponents list.
-
+
Summary of changes in version 1.3.3 (2015-10-18):
Classes and styles:
@@ -33,7 +53,7 @@
Classes and styles:
* Fix bug due to undefined \@Asbuk in recent 'babel' package.
+ Package 'natbib' is now optional.
-* Use more recent package 'subcaption' for subfigure captions and
+* Use more recent package 'subcaption' for subfigure captions and
references instead of the obsolete 'subfig'.
Templates:
Modified: trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk 2016-07-05 21:39:30 UTC (rev 41635)
@@ -32,11 +32,17 @@
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
+ *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf
CLFILES ?= $(CLEXT) $(ARCHIVE)
SRCFILES ?= *
+pdf: $(TARGET).pdf
+
+pdf_2on1: $(TARGET)_2on1.pdf
+
+pdf_book: $(TARGET)_book.pdf
+
dvi: $(TARGET).dvi
clean:
@@ -43,10 +49,10 @@
-rm -f $(CLFILES)
.help:
- @echo " dvi (default) build DVI" ;\
+ @echo " dvi build DVI" ;\
echo " figclean clean output files in figures directory" ;\
echo " html convert DVI to HTML" ;\
- echo " pdf build PDF" ;\
+ echo " pdf (default) build PDF" ;\
echo " pdf_2on1 build PDF with two A5 pages on one A4 ordered by number" ;\
echo " pdf_book build PDF booklet (two A5 on A4)" ;\
echo " ps build PS" ;\
@@ -59,12 +65,6 @@
html: $(TARGET).dvi
$(L2H) $(L2HFLAGS) $(TARGET).tex
-pdf: $(TARGET).pdf
-
-pdf_2on1: $(TARGET)_2on1.pdf
-
-pdf_book: $(TARGET)_book.pdf
-
ps: $(TARGET).ps
ps_2on1: $(TARGET)_2on1.ps
@@ -79,7 +79,7 @@
$(TARGET).dvi: *.tex *.bib
@$(LATEX) $(TEXFLAGS) $(TARGET).tex ;\
if [ -f $(BIBFILE) ] ; then \
- for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $$f; done ;\
+ for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $${f%.*} ; done ;\
else \
echo Warning: Bibliography file does not exist ;\
fi ;\
@@ -99,7 +99,7 @@
$(TARGET).pdf: *.tex *.bib
@$(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\
if [ -f $(BIBFILE) ] ; then \
- for f in *.aux ; do $(BIBTEX) $(BIBTEXFLAGS) $$f ; done ;\
+ for f in *.aux ; do $(BIBTEX) $(BIBTEXFLAGS) $${f%.*} ; done ;\
else \
echo "Warning: Bibliography file does not exist" ;\
fi ;\
Modified: trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -44,7 +44,7 @@
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
+ *.dvi *.tmp *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf
if "%clfiles%"=="" set clfiles=!clext! %archive%
if "%srcfiles%"=="" set srcfiles=*
if "%prereq%"=="" set prereq=*.tex *.bib
@@ -51,7 +51,7 @@
if "%1"=="" (
- call :dvi
+ call :pdf
) else (
for %%f in (%*) do call :%%f
)
@@ -71,7 +71,7 @@
)
%latex% %latexflags% %target%.tex
if exist %bibfile% (
- for %%f in (*.aux) do %bibtex% %bibtexflags% %%f
+ for %%f in (*.aux) do %bibtex% %bibtexflags% %%~nf
) else (
echo Warning: Bibliography file does not exist
)
@@ -80,10 +80,10 @@
goto :eof
:help
- echo dvi ^(default^) build DVI
+ echo dvi build DVI
echo figclean clean output files in figures directory
echo html convert DVI to HTML
- echo pdf build PDF
+ echo pdf ^(default^) build PDF
echo pdf_2on1 build PDF with two A5 pages on one A4 ordered by number
echo pdf_book build PDF booklet ^(two A5 on A4^)
echo ps build PS
@@ -112,7 +112,7 @@
)
%pdflatex% %pdflatexflags% %target%.tex
if exist %bibfile% (
- for %%f in (*.aux) do %bibtex% %bibtexflags% %%f
+ for %%f in (*.aux) do %bibtex% %bibtexflags% %%~nf
) else (
echo Warning: Bibliography file does not exist
)
Modified: trunk/Master/texmf-dist/doc/latex/disser/manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/manual.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/manual.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -25,17 +25,6 @@
menucolor = darkblue, urlcolor = darkblue
}
-\IfFileExists{pscyr.sty}{%
- \usepackage{pscyr}
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
-}{
- \IfFileExists{cyrtimes.sty}{%
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
- }{}
-}
-
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
@@ -55,7 +44,7 @@
\let\makelabel\deflabel}
}{\end{list}}
-\def\fileversion{1.3.4}
+\def\fileversion{1.4.0}
\sloppy
\begin{document}
@@ -94,7 +83,7 @@
\xCF\xE0\xEA\xE5\xF2 \xEF\xEE\xE7\xE2\xEE\xEB\xFF\xE5\xF2 \xF1\xEE\xE7\xE4\xE0\xE2\xE0\xF2\xFC \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xFB, \xF3\xE4\xEE\xE2\xEB\xE5\xF2\xE2\xEE\xF0\xFF\xFE\xF9\xE8\xE5 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xEC \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xE0\xEC:
\begin{itemize}
\item \href{http://protect.gost.ru/document.aspx?control=8&id=171831}{\xC3\xCE\xD1\xD2 \xD0 7.0.11--2011 <<\xC4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xE8 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8. \xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF>>};
-\item \href{http://protect.gost.ru/document.aspx?control=7&id=130946}{\xC3\xCE\xD1\xD2~7.32--2001 <<\xCE\xF2\xF7\xE5\xF2 \xEE \xED\xE0\xF3\xF7\xED\xEE-\xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xF1\xEA\xEE\xE9 \xF0\xE0\xE1\xEE\xF2\xE5. \xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF>>};
+\item \href{http://protect.gost.ru/document.aspx?control=7&id=130946}{\xC3\xCE\xD1\xD2 7.32--2001 <<\xCE\xF2\xF7\xE5\xF2 \xEE \xED\xE0\xF3\xF7\xED\xEE-\xE8\xF1\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xF1\xEA\xEE\xE9 \xF0\xE0\xE1\xEE\xF2\xE5. \xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF>>};
\item \href{http://protect.gost.ru/document.aspx?control=7&id=128845}{\xC3\xCE\xD1\xD2 \xD0 7.0.4--2006 <<\xC8\xE7\xE4\xE0\xED\xE8\xFF. \xC2\xFB\xF5\xEE\xE4\xED\xFB\xE5 \xF1\xE2\xE5\xE4\xE5\xED\xE8\xFF. \xCE\xE1\xF9\xE8\xE5 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF>>};
\item \href{http://protect.gost.ru/document.aspx?control=7&id=173511}{\xC3\xCE\xD1\xD2 \xD0 7.0.5--2008 <<\xC1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF1\xF1\xFB\xEB\xEA\xE0. \xCE\xE1\xF9\xE8\xE5 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF \xE8 \xEF\xF0\xE0\xE2\xE8\xEB\xE0 \xF1\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xE8\xFF>>}.
\end{itemize}
@@ -152,21 +141,16 @@
classified &
\xC2\xEA\xEB\xFE\xF7\xE0\xE5\xF2 \xE2\xFB\xE2\xEE\xE4 \xE3\xF0\xE8\xF4\xE0 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8 \xED\xE0 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xEC \xEB\xE8\xF1\xF2\xE5.
\\\hline
- colorlinks = \{true$\,\vert\,$\textbf{false}\} &
- \xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xF6\xE2\xE5\xF2\xED\xFB\xF5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA.
- \xD6\xE2\xE5\xF2\xE0 \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xFF\xFE\xF2\xF1\xFF \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xEC\xE8 \xEF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xE0\xEC\xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{hyperref}.
+ colorlinks &
+ \xC2\xEA\xEB\xFE\xF7\xE0\xE5\xF2 \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8. \xD6\xE2\xE5\xF2\xE0 \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xFF\xFE\xF2\xF1\xFF \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xEC\xE8 \xEF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xE0\xEC\xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{hyperref}.
\\\hline
facsimile &
\xC2\xEA\xEB\xFE\xF7\xE0\xE5\xF2 \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE5\xED\xE8\xE5 \xEF\xEE\xE4\xEF\xE8\xF1\xE5\xE9 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE8 \xF3\xF7\xE5\xED\xEE\xE3\xEE \xF1\xE5\xEA\xF0\xE5\xF2\xE0\xF0\xFF \xED\xE0 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xFB\xF5 \xEB\xE8\xF1\xF2\xE0\xF5 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0 \xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8 (\xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xEA\xE0\xED\xE4\xE8\xE4\xE0\xF2\xF1\xEA\xE8\xF5 \xE8 \xE4\xEE\xEA\xF2\xEE\xF0\xF1\xEA\xE8\xF5).
\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE \xE2\xEA\xEB\xFE\xF7\xE5\xED\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE2 \xF8\xE0\xE1\xEB\xEE\xED\xE5 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0.
\\\hline
- fixint = \{\textbf{true}$\,\vert\,$false\} &
- \xC7\xE0\xEC\xE5\xED\xE0 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xF5 \xE7\xED\xE0\xEA\xEE\xE2 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xED\xE0 \xEF\xF0\xFF\xEC\xFB\xE5 (\xE8\xE7 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xEE\xE3\xEE \xF8\xF0\xE8\xF4\xF2\xE0
- \pkg{euler}).
+ fixint &
+ \xC2\xEA\xEB\xFE\xF7\xE0\xE5\xF2 \xE7\xE0\xEC\xE5\xED\xF3 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xF5 \xE7\xED\xE0\xEA\xEE\xE2 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xED\xE0 \xEF\xF0\xFF\xEC\xFB\xE5 (\xE8\xE7 \xF8\xF0\xE8\xF4\xF2\xE0 \pkg{euler}).
\\\hline
- libcat &
- \xC2\xEA\xEB\xFE\xF7\xE0\xE5\xF2 \xE2\xFB\xE2\xEE\xE4 \xED\xEE\xEC\xE5\xF0\xE0 \xD3\xC4\xCA \xED\xE0 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xEC \xEB\xE8\xF1\xF2\xE5.
-\\\hline
substylefile = filename.rtx &
\xC8\xEC\xFF \xF4\xE0\xE9\xEB\xE0 \xF1 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5\xEC \xF1\xF2\xE8\xEB\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 (\xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xE5 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xE3\xEE \xEB\xE8\xF1\xF2\xE0, \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xFF \xF4\xEE\xF0\xEC\xF3\xEB, \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2 \xF1\xEF\xE8\xF1\xEA\xEE\xE2 \xE8 \xF2.\,\xE4.).
\xCE\xEF\xF6\xE8\xFF \xEF\xF0\xE5\xE4\xED\xE0\xE7\xED\xE0\xF7\xE5\xED\xE0 \xE4\xEB\xFF \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xFF \xF1\xEE\xE1\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xF1\xF2\xE8\xEB\xE5\xE9 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2, \xEE\xF2\xEB\xE8\xF7\xE0\xFE\xF9\xE8\xF5\xF1\xFF \xEE\xF2 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xF5: \file{autoref.rtx},
@@ -194,9 +178,15 @@
\\\hline\hline
\end{longtable}
+\section{\xD8\xE0\xE1\xEB\xEE\xED\xFB \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2}
+
+\xC2\xEE\xE7\xEC\xEE\xE6\xED\xEE\xF1\xF2\xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \xE4\xE5\xEC\xEE\xED\xF1\xF2\xF0\xE8\xF0\xF3\xFE\xF2\xF1\xFF \xED\xE0 \xEF\xF0\xE8\xEC\xE5\xF0\xE5 \xF8\xE0\xE1\xEB\xEE\xED\xEE\xE2 \xE4\xE8\xEF\xEB\xEE\xEC\xEE\xE2 \xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE9.
+\xC2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{templates} \xF1\xEE\xE4\xE5\xF0\xE6\xE0\xF2\xF1\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xFB \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 CP-1251, \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF \BibTeX{}8 \xF1\xEE \xF1\xF2\xE8\xEB\xE5\xEC \pkg{gost705}, \xEF\xE0\xEA\xE5\xF2\xFB \pkg{natbib} \xE8 \pkg{multibib}.
+\xC2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{templates-utf8} \xF1\xEE\xE4\xE5\xF0\xE6\xE0\xF2\xF1\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xFB \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8, \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF Biber \xE8 \xEF\xE0\xEA\xE5\xF2 Bib\LaTeX{} \xF1\xEE \xF1\xF2\xE8\xEB\xE5\xEC \pkg{biblatex-gost}.
+
\section{\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2}
-\xC2 \xF1\xEE\xF1\xF2\xE0\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xE2\xF5\xEE\xE4\xFF\xF2 \xE4\xE2\xE5 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2 \xE4\xEB\xFF \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xE8 \xF1\xE1\xEE\xF0\xEA\xE8 \xE8 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8: \xF4\xE0\xE9\xEB\xFB \file{Makefile}, \xF1\xEE\xE2\xEC\xE5\xF1\xF2\xE8\xEC\xFB\xE5 \xF1 GNU Make, \xE8 \xF4\xE0\xE9\xEB\xFB \file{nomake.cmd}, \xED\xE0\xEF\xE8\xF1\xE0\xED\xED\xFB\xE5 \xED\xE0 \xFF\xE7\xFB\xEA\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xE3\xEE \xE8\xED\xF2\xE5\xF0\xEF\xF0\xE5\xF2\xE0\xF2\xEE\xF0\xE0 \file{cmd.exe} \xCE\xD1 Windows 2000 \xE8 \xE2\xFB\xF8\xE5.
+\xC4\xEB\xFF \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xE8 \xF1\xE1\xEE\xF0\xEA\xE8 \xE8 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xE2 \xF1\xEE\xF1\xF2\xE0\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xE2\xF5\xEE\xE4\xFF\xF2 \xE4\xE2\xE5 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2: \xF4\xE0\xE9\xEB\xFB \file{Makefile}, \xF1\xEE\xE2\xEC\xE5\xF1\xF2\xE8\xEC\xFB\xE5 \xF1 GNU Make, \xE8 \xF4\xE0\xE9\xEB\xFB \file{nomake.cmd}, \xED\xE0\xEF\xE8\xF1\xE0\xED\xED\xFB\xE5 \xED\xE0 \xFF\xE7\xFB\xEA\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xE3\xEE \xE8\xED\xF2\xE5\xF0\xEF\xF0\xE5\xF2\xE0\xF2\xEE\xF0\xE0 \file{cmd.exe} \xCE\xD1 Windows 2000 \xE8 \xE2\xFB\xF8\xE5.
\xD1\xEA\xF0\xE8\xEF\xF2\xFB \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xFE\xF2 \xEE\xE4\xE8\xED\xE0\xEA\xEE\xE2\xFB\xE9 \xED\xE0\xE1\xEE\xF0 \xF6\xE5\xEB\xE5\xE9 (targets).
\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xE5 \xE2 Unix-\xEF\xEE\xE4\xEE\xE1\xED\xFB\xF5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF\xF5:
\begin{verbatim}
@@ -274,11 +264,11 @@
\file{templates/<\xF2\xE8\xEF-\xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8>}}
\begin{deflist}{\longestlabel}
-\item[dvi]
- \xD1\xE1\xEE\xF0\xEA\xE0 DVI-\xF4\xE0\xE9\xEB\xE0. \xD6\xE5\xEB\xFC \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE.
\item[clean]
\xD3\xE4\xE0\xEB\xE5\xED\xE8\xE5 \xF4\xE0\xE9\xEB\xEE\xE2, \xEF\xEE\xEB\xF3\xF7\xE5\xED\xED\xFB\xF5 \xEF\xF0\xE8 \xF1\xE1\xEE\xF0\xEA\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0.
\xD1\xEF\xE8\xF1\xEE\xEA \xF4\xE0\xE9\xEB\xEE\xE2 \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xFF\xE5\xF2\xF1\xFF \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xEE\xE9 |CLFILES|.
+\item[dvi]
+ \xD1\xE1\xEE\xF0\xEA\xE0 DVI-\xF4\xE0\xE9\xEB\xE0.
\item[figclean]
\xDD\xEA\xE2\xE8\xE2\xE0\xEB\xE5\xED\xF2\xED\xEE \xF6\xE5\xEB\xE8 \cmd{clean} \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{fig}.
\item[help]
@@ -287,7 +277,7 @@
\xCA\xEE\xED\xE2\xE5\xF0\xF2\xE0\xF6\xE8\xFF DVI \xE2 HTML-\xF4\xE0\xE9\xEB \xF1 \xF0\xE8\xF1\xF3\xED\xEA\xE0\xEC\xE8.
\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xEC\xE0\xFF \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE0: \href{http://www.latex2html.org/}{\cmd{latex2html}}.
\item[pdf]
- \xD1\xE1\xEE\xF0\xEA\xE0 PDF-\xF4\xE0\xE9\xEB\xE0.
+ \xD1\xE1\xEE\xF0\xEA\xE0 PDF-\xF4\xE0\xE9\xEB\xE0. \xD6\xE5\xEB\xFC \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE.
\item[pdf\_2on1]
\xD1\xE1\xEE\xF0\xEA\xE0 PDF-\xF4\xE0\xE9\xEB\xE0 \xF1 \xE4\xE2\xF3\xEC\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xEC\xE8 \xED\xE0 \xEE\xE4\xE8\xED \xEB\xE8\xF1\xF2 A4 \xE8 \xF1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE5\xEC \xEF\xEE\xF0\xFF\xE4\xEA\xE0 \xF1\xEB\xE5\xE4\xEE\xE2\xE0\xED\xE8\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6.
\item[pdf\_book]
@@ -299,7 +289,7 @@
\item[ps\_book]
\xD1\xE1\xEE\xF0\xEA\xE0 PostScript-\xF4\xE0\xE9\xEB\xE0 \xF1 \xE4\xE2\xF3\xEC\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xEC\xE8 \xED\xE0 \xEE\xE4\xE8\xED \xEB\xE8\xF1\xF2 A4 \xE4\xEB\xFF \xE1\xF0\xEE\xF8\xFE\xF0\xEE\xE2\xE0\xED\xE8\xFF.
\item[rtf]
- \xCA\xEE\xED\xE2\xE5\xF0\xF2\xE0\xF6\xE8\xFF DVI \xE2 RTF.
+ \xCA\xEE\xED\xE2\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xE8\xE7 DVI \xE2 RTF.
\item[srcdist]
\xD1\xE1\xEE\xF0\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xE0 \xE8\xE7 \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xEC\xEE\xE3\xEE \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE0.
\end{deflist}
@@ -409,16 +399,6 @@
\item \xCD\xE0\xF1\xF2\xF0\xE0\xE8\xE2\xE0\xE5\xEC\xFB\xE5 \xEF\xF0\xE5\xF4\xE8\xEA\xF1 \xE8 \xEF\xEE\xF1\xF2\xF4\xE8\xEA\xF1 \xED\xEE\xEC\xE5\xF0\xE0 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE9 \xF1\xF1\xFB\xEB\xEA\xE8 \xE4\xEB\xFF \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE2 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE5.
\end{enumerate}
-\xC4\xEB\xFF \xE2\xFB\xE4\xE5\xEB\xE5\xED\xE8\xFF \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC \xED\xE5\xEA\xEE\xF2\xEE\xF0\xFB\xF5 \xEF\xEE\xEB\xE5\xE9 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE9 \xE7\xE0\xEF\xE8\xF1\xE8, \xE2 \xF4\xE0\xE9\xEB\xE5 \file{thesis.tex} \xED\xF3\xE6\xED\xEE \xE4\xEE\xE1\xE0\xE2\xE8\xF2\xFC \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xE5
-\begin{verbatim}
-\def\BibEmph#1{\emph{#1}}
-\end{verbatim}
-\xEF\xE5\xF0\xE5\xE4 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xEC \xF2\xE5\xEA\xF1\xF2\xEE\xEC
-\begin{verbatim}
-\bibliography{thesis}
-\bibliographystyle{gost705}
-\end{verbatim}
-
\xCF\xF0\xE8 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE8 \xF0\xF3\xF1\xF1\xEA\xEE\xFF\xE7\xFB\xF7\xED\xFB\xF5 \xE8\xF1\xF2\xEE\xF7\xED\xE8\xEA\xEE\xE2 \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xFF\xE2\xED\xFB\xEC \xEE\xE1\xF0\xE0\xE7\xEE\xEC \xEF\xF0\xE8\xF1\xE2\xE0\xE8\xE2\xE0\xF2\xFC \xEF\xEE\xEB\xFE |language| \xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 |russian|.
\xCF\xF0\xE8\xEC\xE5\xF0:
\begin{verbatim}
@@ -476,12 +456,12 @@
\subsection{\xD1\xEF\xE8\xF1\xEE\xEA \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0}
-\xC2 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE5 \xF1\xEF\xE8\xF1\xEE\xEA \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE4\xEE\xEB\xE6\xE5\xED \xE1\xFB\xF2\xFC \xEE\xF2\xE4\xE5\xEB\xE5\xED \xEE\xF2 \xF1\xEF\xE8\xF1\xEA\xE0 \xF6\xE8\xF2\xE8\xF0\xF3\xE5\xEC\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB, \xE0 \xF1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xED\xE8\xF5 \xE4\xEE\xEB\xE6\xED\xFB \xEE\xF2\xEB\xE8\xF7\xE0\xF2\xFC\xF1\xFF \xE4\xF0\xF3\xE3 \xEE\xF2 \xE4\xF0\xF3\xE3\xE0.
-\xC4\xEB\xFF \xF0\xE0\xE7\xEC\xE5\xF9\xE5\xED\xE8\xFF \xE2 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE5 \xE4\xE2\xF3\xF5 \xF1\xEF\xE8\xF1\xEA\xEE\xE2 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF1 \xED\xE5\xE7\xE0\xE2\xE8\xF1\xE8\xEC\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE5\xE9 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xF2\xF1\xFF \xEF\xE0\xEA\xE5\xF2 \pkg{multibib}.
-
+\xC2 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE5 \xF1\xEF\xE8\xF1\xEE\xEA \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE4\xEE\xEB\xE6\xE5\xED \xE1\xFB\xF2\xFC \xEE\xF2\xE4\xE5\xEB\xE5\xED \xEE\xF2 \xF1\xEF\xE8\xF1\xEA\xE0 \xF6\xE8\xF2\xE8\xF0\xF3\xE5\xEC\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB.
+\xC4\xEB\xFF \xFD\xF2\xEE\xE3\xEE \xE2 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF5 \xF1 \xEE\xE4\xED\xEE\xE1\xE0\xE9\xF2\xEE\xE2\xEE\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xEE\xE9 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xF2\xF1\xFF \xEF\xE0\xEA\xE5\xF2 \pkg{multibib}, \xE0 \xE4\xEB\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8 --- \xEF\xE0\xEA\xE5\xF2 Bib\LaTeX{}.
\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA \xED\xE0 \xF0\xE0\xE1\xEE\xF2\xFB \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE4\xEE\xEB\xE6\xED\xEE \xED\xE0\xF5\xEE\xE4\xE8\xF2\xFC\xF1\xFF \xE2 \xF4\xE0\xE9\xEB\xE5 \file{thesis.bib} \xE2\xEC\xE5\xF1\xF2\xE5 \xF1 \xEE\xF1\xF2\xE0\xEB\xFC\xED\xFB\xEC\xE8 \xF1\xF1\xFB\xEB\xEA\xE0\xEC\xE8.
-\xCF\xEE\xEB\xED\xE0\xFF \xF1\xE1\xEE\xF0\xEA\xE0 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0 \xF1 \xE4\xE2\xF3\xEC\xFF \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xFF\xEC\xE8 \xE2\xFB\xEF\xEE\xEB\xED\xFF\xE5\xF2\xF1\xFF \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE9 \xEF\xEE\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xFC\xFE \xEA\xEE\xEC\xE0\xED\xE4.
+\xD1\xE1\xEE\xF0\xEA\xE0 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8 \xEE\xF1\xF3\xF9\xE5\xF1\xF2\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xEC \xF1\xEF\xEE\xF1\xEE\xE1\xEE\xEC.
+\xCF\xEE\xF1\xEA\xEE\xEB\xFC\xEA\xF3 \xEF\xE0\xEA\xE5\xF2 \pkg{multibib} \xF1\xEE\xE7\xE4\xE0\xE5\xF2 \xEE\xF2\xE4\xE5\xEB\xFC\xED\xFB\xE5 |aux|-\xF4\xE0\xE9\xEB\xFB \xE4\xEB\xFF \xEA\xE0\xE6\xE4\xEE\xE9 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8, \xEF\xEE\xEB\xED\xE0\xFF \xF1\xE1\xEE\xF0\xEA\xE0 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 CP-1251 \xE2\xFB\xEF\xEE\xEB\xED\xFF\xE5\xF2\xF1\xFF \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE9 \xEF\xEE\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xFC\xFE \xEA\xEE\xEC\xE0\xED\xE4:
\begin{verbatim}
latex autoref
bibtex8 -H -c cp1251 autoref
@@ -490,7 +470,7 @@
latex autoref
\end{verbatim}
-\xCE\xEF\xE5\xF0\xE0\xF6\xE8\xFF \xEF\xEE\xEB\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xEE\xF1\xF3\xF9\xE5\xF1\xF2\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xEA\xEE\xEC\xE0\xED\xE4\xE0\xEC\xE8 \xE2\xE8\xE4\xE0:
+\xCE\xEF\xE5\xF0\xE0\xF6\xE8\xFF \xEF\xEE\xEB\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xEE\xF1\xF3\xF9\xE5\xF1\xF2\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xEA\xEE\xEC\xE0\xED\xE4\xEE\xE9:
\begin{verbatim}
nomake all
\end{verbatim}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -23,11 +23,10 @@
install:
cp -rf ../templates $(DOCDIR) ;\
+ cp -rf ../templates-utf8 $(DOCDIR) ;\
cp -rf ../include $(DOCDIR)
uninstall:
- -rm -rf $(DOCDIR)/templates
- -rm -rf $(DOCDIR)/include
- -rmdir $(DOCDIR)
+ -rm -rf $(DOCDIR)
reinstall: uninstall install
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,16 +3,19 @@
# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
#
-TARGET?=thesis
+TARGET ?= thesis
+BIBTEX ?= bibtex8
+BIBTEXFLAGS ?= -H -c cp1251
-
include ../../include/latex.mk
-all: dvi
+all: pdf
allpdf: pdf
+alldvi: dvi
+
help: .help
- @echo " all alias for dvi target" ;\
+ @echo " all alias for pdf target" ;\
echo " allpdf alias for pdf target" ;\
-
+ echo " alldvi alias for dvi target" ;\
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,6 +3,8 @@
rem Makefile for documents and templates
rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+set bibtex=bibtex8
+set bibtexflags=-H -c cp1251
set latexnmk=call ..\..\include\latex.nmk.cmd
if "%1"=="" (
@@ -11,9 +13,11 @@
for %%f in (%*) do if "%%f"=="help" (
call :%%f
) else if "%%f"=="all" (
- %latexnmk% dvi
+ %latexnmk% pdf
) else if "%%f"=="allpdf" (
%latexnmk% pdf
+ ) else if "%%f"=="alldvi" (
+ %latexnmk% dvi
) else (
%latexnmk% %%f
)
@@ -22,8 +26,9 @@
exit /b
:help
- echo all alias for dvi target
+ echo all alias for pdf target
echo allpdf alias for pdf target
+ echo alldvi alias for dvi target
%latexnmk% help
goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,3 +1,32 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {\xC8. \xC8. \xC8\xE2\xE0\xED\xEE\xE2 and \xCF. \xCF. \xCF\xE5\xF2\xF0\xEE\xE2 and \xD1. \xD1. \xD1\xE8\xE4\xEE\xF0\xEE\xE2},
+ title = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xFC\xE8},
+ journal = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE6\xF3\xF0\xED\xE0\xEB\xE0},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {\xCF. \xCF. \xCF\xE5\xF2\xF0\xEE\xE2 and \xC8. \xC8. \xC8\xE2\xE0\xED\xEE\xE2 and \xD1. \xD1. \xD1\xE8\xE4\xEE\xF0\xEE\xE2},
+ title = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xFC\xE8},
+ journal = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE6\xF3\xF0\xED\xE0\xEB\xE0},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+}
+
@ARTICLE{Yoffe_1993_AP_42_173,
author = {A. D. Yoffe},
title = {Low-dimensional systems: quantum size effects and electronic
@@ -54,7 +83,7 @@
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
+ title = {{\relax InP} Basic Parameters at 300 K},
booktitle = {Electronic archive New Semiconductor Materials.
Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
@@ -74,10 +103,9 @@
language = {russian},
}
- at PHDTHESIS{Skvortsov_2008,
+ at DSCITHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
- title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5
- \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
+ title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
type = {\xE4\xE8\xF1\xF1. \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {2008},
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,11 +1,11 @@
\documentclass[%
-bachelor, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+bachelor, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
]{disser}
\usepackage[
@@ -15,7 +15,6 @@
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
-%\usepackage{tabularx,longtable}
\ifpdf\usepackage{epstopdf}\fi
% \xCF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xE5 \xF0\xE8\xF1\xF3\xED\xEA\xE8 "\xE2 \xEE\xE1\xEE\xF0\xEA\xF3".
@@ -116,8 +115,13 @@
% \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5
\input{concl}
+% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+\newcommand\BibDash{"---}
+% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
+\let\BibEmph=\emph
+\bibliographystyle{gost705}
+
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
-\bibliographystyle{gost705}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,9 +3,10 @@
# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
#
-TARGET?=thesis
+TARGET ?= thesis
+BIBTEX ?= bibtex8
+BIBTEXFLAGS ?= -H -c cp1251
-
include ../../include/latex.mk
all:
@@ -18,7 +19,12 @@
env TARGET=autoref $(MAKE) pdf ;\
eval unset TARGET
+alldvi:
+ @env TARGET=thesis $(MAKE) dvi ;\
+ env TARGET=autoref $(MAKE) dvi ;\
+ eval unset TARGET
+
help: .help
- @echo " all build DVI 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" ;\
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -182,12 +182,18 @@
% ----------------------------------------------------------------
\renewcommand\bibsection{\nsection{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}}
-\bibliographystylemy{gost705}
+% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
+%\newcommand\BibDash{--- }
+% \xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE2\xFB\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC.
+%\newcommand\BibEmph[1]{\emph{#1}}
+\bibliographystylemy{gost705}
\bibliographymy{thesis}
\renewcommand\bibsection{\nsection{\xD6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xED\xE0\xFF \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xE0}}
-\bibliographystyle{gost705}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
+%\newcommand\BibDash{}
+\bibliographystyle{gost2008}
\bibliography{thesis}
% ----------------------------------------------------------------
% \xC2\xFB\xF5\xEE\xE4\xED\xFB\xE5 \xE4\xE0\xED\xED\xFB\xE5
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,6 +3,8 @@
rem Makefile for documents and templates
rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+set bibtex=bibtex8
+set bibtexflags=-H -c cp1251
set latexnmk=call ..\..\include\latex.nmk.cmd
if "%1"=="" (
@@ -11,9 +13,11 @@
for %%f in (%*) do if "%%f"=="help" (
call :%%f
) else if "%%f"=="all" (
- call :%%f
+ call :allpdf
) else if "%%f"=="allpdf" (
call :%%f
+ ) else if "%%f"=="alldvi" (
+ call :%%f
) else (
%latexnmk% %%f
)
@@ -22,19 +26,20 @@
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
-:all
- 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
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -83,7 +83,7 @@
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
+ title = {{\relax InP} Basic Parameters at 300 K},
booktitle = {Electronic archive New Semiconductor Materials.
Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
@@ -98,15 +98,73 @@
title = {\xCD\xE5\xF3\xEF\xF0\xF3\xE3\xEE\xE5 \xF0\xE0\xF1\xF1\xE5\xFF\xED\xE8\xE5 \xF1\xE2\xE5\xF2\xE0 \xE2 \xF1\xE8\xF1\xF2\xE5\xEC\xE5 \xE2\xE7\xE0\xE8\xEC\xEE\xE4\xE5\xE9\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xF5
\xFD\xEB\xE5\xEA\xF2\xF0\xEE\xED\xEE\xE2 \xE8 \xF4\xEE\xED\xEE\xED\xEE\xE2},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xEA\xE0\xED\xE4. \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {1996},
language = {russian},
}
- at DOCDISSER{Skvortsov_2008,
+ at DSCITHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
- title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5
- \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
+ title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {2008},
language = {russian},
}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at PATENT{patent1,
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authortype = {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ reqdate = {07.04.2000},
+ pubdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prdate = {09.04.1999},
+ prnumber = {09/289, 037},
+ prcountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
+
+ at PATENT{patent2,
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authortype = {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ date = {18.12.2000},
+ publdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,14 +1,13 @@
\documentclass[%
-candidate, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,classified % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
-%,libcat % \xED\xEE\xEC\xE5\xF0 \xD3\xC4\xCA
-%,facsimile % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
+candidate, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
+%classified, % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
+%facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
]{disser}
\usepackage[
@@ -18,7 +17,6 @@
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
-%\usepackage{tabularx,longtable}
\ifpdf\usepackage{epstopdf}\fi
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
@@ -54,7 +52,7 @@
%\classlabel{\xC4\xEB\xFF \xF1\xEB\xF3\xE6\xE5\xE1\xED\xEE\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xFF}
% \xED\xEE\xEC\xE5\xF0 \xD3\xC4\xCA
-%\libcatnum{12345}
+\libcatnum{12345}
\title{\xC4\xC8\xD1\xD1\xC5\xD0\xD2\xC0\xD6\xC8\xDF\\
\xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8\\
@@ -121,9 +119,14 @@
% \xD1\xEB\xEE\xE2\xE0\xF0\xFC \xF2\xE5\xF0\xEC\xE8\xED\xEE\xE2
%\input{dict}
+% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+\newcommand\BibDash{"---}
+% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
+\let\BibEmph=\emph
+\bibliographystyle{gost705}
+
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
-\bibliographystyle{gost705}
% \xD1\xEF\xE8\xF1\xEE\xEA \xE8\xEB\xEB\xFE\xF1\xF2\xF0\xE0\xF2\xE8\xE2\xED\xEE\xE3\xEE \xEC\xE0\xF2\xE5\xF0\xE8\xE0\xEB\xE0
%\listoffigures
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,9 +3,10 @@
# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
#
-TARGET?=thesis
+TARGET ?= thesis
+BIBTEX ?= bibtex8
+BIBTEXFLAGS ?= -H -c cp1251
-
include ../../include/latex.mk
all:
@@ -18,7 +19,12 @@
env TARGET=autoref $(MAKE) pdf ;\
eval unset TARGET
+alldvi
+ @env TARGET=thesis $(MAKE) dvi ;\
+ env TARGET=autoref $(MAKE) dvi ;\
+ eval unset TARGET
+
help: .help
- @echo " all build DVI 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" ;\
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -177,12 +177,16 @@
% ----------------------------------------------------------------
\renewcommand\bibsection{\nsection{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}}
-\bibliographystylemy{gost705}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
+%\newcommand\BibDash{}
+\bibliographystylemy{gost2008}
\bibliographymy{thesis}
\renewcommand\bibsection{\nsection{\xD6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xED\xE0\xFF \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xE0}}
-\bibliographystyle{gost705}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
+%\newcommand\BibDash{}
+\bibliographystyle{gost2008}
\bibliography{thesis}
% ----------------------------------------------------------------
% \xC2\xFB\xF5\xEE\xE4\xED\xFB\xE5 \xE4\xE0\xED\xED\xFB\xE5
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,6 +3,8 @@
rem Makefile for documents and templates
rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+set bibtex=bibtex8
+set bibtexflags=-H -c cp1251
set latexnmk=call ..\..\include\latex.nmk.cmd
if "%1"=="" (
@@ -11,9 +13,11 @@
for %%f in (%*) do if "%%f"=="help" (
call :%%f
) else if "%%f"=="all" (
- call :%%f
+ call :allpdf
) else if "%%f"=="allpdf" (
call :%%f
+ ) else if "%%f"=="alldvi" (
+ call :%%f
) else (
%latexnmk% %%f
)
@@ -27,7 +31,7 @@
%latexnmk% help
goto :eof
-:all
+:alldvi
set target=thesis & %latexnmk% dvi
set target=autoref & %latexnmk% dvi
set target=
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -83,7 +83,7 @@
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
+ title = {{\relax InP} Basic Parameters at 300 K},
booktitle = {Electronic archive New Semiconductor Materials.
Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
@@ -98,15 +98,73 @@
title = {\xCD\xE5\xF3\xEF\xF0\xF3\xE3\xEE\xE5 \xF0\xE0\xF1\xF1\xE5\xFF\xED\xE8\xE5 \xF1\xE2\xE5\xF2\xE0 \xE2 \xF1\xE8\xF1\xF2\xE5\xEC\xE5 \xE2\xE7\xE0\xE8\xEC\xEE\xE4\xE5\xE9\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xF5
\xFD\xEB\xE5\xEA\xF2\xF0\xEE\xED\xEE\xE2 \xE8 \xF4\xEE\xED\xEE\xED\xEE\xE2},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xEA\xE0\xED\xE4. \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {1996},
language = {russian},
}
- at DOCDISSER{Skvortsov_2008,
+ at DSCITHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
- title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5
- \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
+ title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {2008},
language = {russian},
}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at PATENT{patent1,
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authortype = {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ reqdate = {07.04.2000},
+ pubdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prdate = {09.04.1999},
+ prnumber = {09/289, 037},
+ prcountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
+
+ at PATENT{patent2,
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authortype = {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ date = {18.12.2000},
+ publdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,14 +1,13 @@
\documentclass[%
-doctor, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,classified % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
-%,libcat % \xED\xEE\xEC\xE5\xF0 \xD3\xC4\xCA
-%,facsimile % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
+doctor, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
+%classified, % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
+%facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
]{disser}
\usepackage[
@@ -18,7 +17,6 @@
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
-%\usepackage{tabularx,longtable}
\ifpdf\usepackage{epstopdf}\fi
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
@@ -54,7 +52,7 @@
%\classlabel{\xC4\xEB\xFF \xF1\xEB\xF3\xE6\xE5\xE1\xED\xEE\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xFF}
% \xED\xEE\xEC\xE5\xF0 \xD3\xC4\xCA
-%\libcatnum{12345}
+\libcatnum{12345}
\title{\xC4\xC8\xD1\xD1\xC5\xD0\xD2\xC0\xD6\xC8\xDF\\
\xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8\\
@@ -118,9 +116,14 @@
% \xD1\xEB\xEE\xE2\xE0\xF0\xFC \xF2\xE5\xF0\xEC\xE8\xED\xEE\xE2
%\input{dict}
+% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+\newcommand\BibDash{"---}
+% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
+\let\BibEmph=\emph
+\bibliographystyle{gost705}
+
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
-\bibliographystyle{gost705}
% \xD1\xEF\xE8\xF1\xEE\xEA \xE8\xEB\xEB\xFE\xF1\xF2\xF0\xE0\xF2\xE8\xE2\xED\xEE\xE3\xEE \xEC\xE0\xF2\xE5\xF0\xE8\xE0\xEB\xE0
%\listoffigures
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/Makefile 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,16 +3,19 @@
# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
#
-TARGET?=thesis
+TARGET ?= thesis
+BIBTEX ?= bibtex8
+BIBTEXFLAGS ?= -H -c cp1251
-
include ../../include/latex.mk
-all: dvi
+all: pdf
allpdf: pdf
+alldvi: dvi
+
help: .help
- @echo " all alias for dvi target" ;\
+ @echo " all alias for pdf target" ;\
echo " allpdf alias for pdf target" ;\
-
+ echo " alldvi alias for dvi target" ;\
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,6 +3,8 @@
rem Makefile for documents and templates
rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+set bibtex=bibtex8
+set bibtexflags=-H -c cp1251
set latexnmk=call ..\..\include\latex.nmk.cmd
if "%1"=="" (
@@ -11,9 +13,11 @@
for %%f in (%*) do if "%%f"=="help" (
call :%%f
) else if "%%f"=="all" (
- %latexnmk% dvi
+ %latexnmk% pdf
) else if "%%f"=="allpdf" (
%latexnmk% pdf
+ ) else if "%%f"=="alldvi" (
+ %latexnmk% dvi
) else (
%latexnmk% %%f
)
@@ -22,8 +26,8 @@
exit /b
:help
- echo all alias for dvi target
+ echo all alias for pdf target
echo allpdf alias for pdf target
+ echo alldvi alias for dvi target
%latexnmk% help
goto :eof
-
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,3 +1,32 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {\xC8. \xC8. \xC8\xE2\xE0\xED\xEE\xE2 and \xCF. \xCF. \xCF\xE5\xF2\xF0\xEE\xE2 and \xD1. \xD1. \xD1\xE8\xE4\xEE\xF0\xEE\xE2},
+ title = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xFC\xE8},
+ journal = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE6\xF3\xF0\xED\xE0\xEB\xE0},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {\xCF. \xCF. \xCF\xE5\xF2\xF0\xEE\xE2 and \xC8. \xC8. \xC8\xE2\xE0\xED\xEE\xE2 and \xD1. \xD1. \xD1\xE8\xE4\xEE\xF0\xEE\xE2},
+ title = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xFC\xE8},
+ journal = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE6\xF3\xF0\xED\xE0\xEB\xE0},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+}
+
@ARTICLE{Yoffe_1993_AP_42_173,
author = {A. D. Yoffe},
title = {Low-dimensional systems: quantum size effects and electronic
@@ -54,7 +83,7 @@
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
+ title = {{\relax InP} Basic Parameters at 300 K},
booktitle = {Electronic archive New Semiconductor Materials.
Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
@@ -69,15 +98,73 @@
title = {\xCD\xE5\xF3\xEF\xF0\xF3\xE3\xEE\xE5 \xF0\xE0\xF1\xF1\xE5\xFF\xED\xE8\xE5 \xF1\xE2\xE5\xF2\xE0 \xE2 \xF1\xE8\xF1\xF2\xE5\xEC\xE5 \xE2\xE7\xE0\xE8\xEC\xEE\xE4\xE5\xE9\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xF5
\xFD\xEB\xE5\xEA\xF2\xF0\xEE\xED\xEE\xE2 \xE8 \xF4\xEE\xED\xEE\xED\xEE\xE2},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xEA\xE0\xED\xE4. \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {1996},
language = {russian},
}
- at DOCDISSER{Skvortsov_2008,
+ at DSCITHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
- title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5
- \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
+ title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
year = {2008},
language = {russian},
}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at PATENT{patent1,
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authortype = {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ reqdate = {07.04.2000},
+ pubdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prdate = {09.04.1999},
+ prnumber = {09/289, 037},
+ prcountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
+
+ at PATENT{patent2,
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authortype = {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ date = {18.12.2000},
+ publdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,11 +1,11 @@
\documentclass[%
-master, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+master, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
]{disser}
\usepackage[
@@ -15,7 +15,6 @@
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
-%\usepackage{tabularx,longtable}
\ifpdf\usepackage{epstopdf}\fi
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
@@ -138,9 +137,14 @@
% \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5
\input{concl}
+% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+\newcommand\BibDash{"---}
+% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
+\let\BibEmph=\emph
+\bibliographystyle{gost705}
+
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
-\bibliographystyle{gost705}
% \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF
\appendix
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -41,6 +41,7 @@
:install
if not exist "!docdir!" mkdir "!docdir!"
xcopy /y /e /i /f ..\templates "!docdir!\templates"
+ xcopy /y /e /i /f ..\templates-utf8 "!docdir!\templates-utf8"
xcopy /y /e /i /f ..\include "!docdir!\include"
goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,16 +3,19 @@
# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
#
-TARGET?=thesis
+TARGET ?= thesis
+BIBTEX ?= bibtex8
+BIBTEXFLAGS ?= -H -c cp1251
-
include ../../include/latex.mk
-all: dvi
+all: pdf
allpdf: pdf
+alldvi: dvi
+
help: .help
- @echo " all alias for dvi target" ;\
+ @echo " all alias for pdf target" ;\
echo " allpdf alias for pdf target" ;\
-
+ echo " alldvi alias for dvi target" ;\
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -3,6 +3,8 @@
rem Makefile for documents and templates
rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+set bibtex=bibtex8
+set bibtexflags=-H -c cp1251
set latexnmk=call ..\..\include\latex.nmk.cmd
if "%1"=="" (
@@ -11,9 +13,11 @@
for %%f in (%*) do if "%%f"=="help" (
call :%%f
) else if "%%f"=="all" (
- %latexnmk% dvi
+ %latexnmk% pdf
) else if "%%f"=="allpdf" (
%latexnmk% pdf
+ ) else if "%%f"=="alldvi" (
+ %latexnmk% dvi
) else (
%latexnmk% %%f
)
@@ -22,8 +26,9 @@
exit /b
:help
- echo all alias for dvi target
+ echo all alias for pdf target
echo allpdf alias for pdf target
+ echo alldvi alias for dvi target
%latexnmk% help
goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,60 +1,170 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {\xC8. \xC8. \xC8\xE2\xE0\xED\xEE\xE2 and \xCF. \xCF. \xCF\xE5\xF2\xF0\xEE\xE2 and \xD1. \xD1. \xD1\xE8\xE4\xEE\xF0\xEE\xE2},
+ title = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xFC\xE8},
+ journal = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE6\xF3\xF0\xED\xE0\xEB\xE0},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {\xCF. \xCF. \xCF\xE5\xF2\xF0\xEE\xE2 and \xC8. \xC8. \xC8\xE2\xE0\xED\xEE\xE2 and \xD1. \xD1. \xD1\xE8\xE4\xEE\xF0\xEE\xE2},
+ title = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xFC\xE8},
+ journal = {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE6\xF3\xF0\xED\xE0\xEB\xE0},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+}
+
@ARTICLE{Yoffe_1993_AP_42_173,
- author = {A. D. Yoffe},
- title = {Low-dimensional systems: quantum size effects and electronic
- properties of semiconductor microcrystallites (zero-dimensional
- systems) and some quasi-two-dimensional systems},
- journal = {Adv. Phys.},
- pages = {173--266},
- volume = {42},
- year = {1993}
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
}
@ARTICLE{Efros_1982_FTP_16_7_1209,
- author = {{\relax \xC0\xEB}. \xCB. \xDD\xF4\xF0\xEE\xF1 and \xC0. \xCB. \xDD\xF4\xF0\xEE\xF1},
- title = {\xCC\xE5\xE6\xE7\xEE\xED\xED\xEE\xE5 \xEF\xEE\xE3\xEB\xEE\xF9\xE5\xED\xE8\xE5 \xF1\xE2\xE5\xF2\xE0 \xE2 \xEF\xEE\xEB\xF3\xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xEE\xE2\xEE\xEC \xF8\xE0\xF0\xE5},
- journal = {\xD4\xE8\xE7\xE8\xEA\xE0 \xE8 \xF2\xE5\xF5\xED\xE8\xEA\xE0 \xEF\xEE\xEB\xF3\xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xEE\xE2},
- year = {1982},
- volume = {16},
- number = {7},
- pages = {1209--1214},
- language = {russian},
+ author = {{\relax \xC0\xEB}. \xCB. \xDD\xF4\xF0\xEE\xF1 and \xC0. \xCB. \xDD\xF4\xF0\xEE\xF1},
+ title = {\xCC\xE5\xE6\xE7\xEE\xED\xED\xEE\xE5 \xEF\xEE\xE3\xEB\xEE\xF9\xE5\xED\xE8\xE5 \xF1\xE2\xE5\xF2\xE0 \xE2 \xEF\xEE\xEB\xF3\xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xEE\xE2\xEE\xEC \xF8\xE0\xF0\xE5},
+ journal = {\xD4\xE8\xE7\xE8\xEA\xE0 \xE8 \xF2\xE5\xF5\xED\xE8\xEA\xE0 \xEF\xEE\xEB\xF3\xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xEE\xE2},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
}
@BOOK{Anselm_1978,
- author = {\xC0. \xC8. \xC0\xED\xF1\xE5\xEB\xFC\xEC},
- title = {\xC2\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE2 \xF2\xE5\xEE\xF0\xE8\xFE \xEF\xEE\xEB\xF3\xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xEE\xE2},
- publisher = {\xCD\xE0\xF3\xEA\xE0},
- address = {\xCC\xEE\xF1\xEA\xE2\xE0},
- year = {1978},
- language = {russian}
+ author = {\xC0. \xC8. \xC0\xED\xF1\xE5\xEB\xFC\xEC},
+ title = {\xC2\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE2 \xF2\xE5\xEE\xF0\xE8\xFE \xEF\xEE\xEB\xF3\xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xEE\xE2},
+ publisher = {\xCD\xE0\xF3\xEA\xE0},
+ address = {\xCC\xEE\xF1\xEA\xE2\xE0},
+ year = {1978},
+ language = {russian},
}
@INPROCEEDINGS{Segall_1968,
- author = {B. Segall},
- year = {1968},
- editor = {S. M. Ryvkin},
- booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
- pages = {425},
- address = {Leningrad},
- publisher = {Nauka}
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
}
@INBOOK{Agranovich_1983,
- editor = {V. M. Agranovich and R. M. Hochstrasser},
- title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems},
- chapter = {6},
- publisher = {North-Holland},
- year = {1983},
- series = {Modern Problems in Condensed Matter Sciences},
- address = {Amsterdam}
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {0444863133},
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
- booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+ title = {{\relax InP} Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
- address = {St. Petersburg},
- year = {2001},
- url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
- urldate = {01.11.2009}
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
}
+
+ at PHDTHESIS{Mishchenko_1996,
+ author = {\xC5. \xC6. \xCC\xE8\xF9\xE5\xED\xEA\xEE},
+ title = {\xCD\xE5\xF3\xEF\xF0\xF3\xE3\xEE\xE5 \xF0\xE0\xF1\xF1\xE5\xFF\xED\xE8\xE5 \xF1\xE2\xE5\xF2\xE0 \xE2 \xF1\xE8\xF1\xF2\xE5\xEC\xE5 \xE2\xE7\xE0\xE8\xEC\xEE\xE4\xE5\xE9\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xF5
+ \xFD\xEB\xE5\xEA\xF2\xF0\xEE\xED\xEE\xE2 \xE8 \xF4\xEE\xED\xEE\xED\xEE\xE2},
+ school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xEA\xE0\xED\xE4. \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
+ year = {1996},
+ language = {russian},
+}
+
+ at DSCITHESIS{Skvortsov_2008,
+ author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
+ title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
+ school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
+ type = {\xE4\xE8\xF1\xF1. \xE4-\xF0\xE0 \xF4\xE8\xE7.-\xEC\xE0\xF2. \xED\xE0\xF3\xEA},
+ year = {2008},
+ language = {russian},
+}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at PATENT{patent1,
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authortype = {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ reqdate = {07.04.2000},
+ pubdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prdate = {09.04.1999},
+ prnumber = {09/289, 037},
+ prcountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
+
+ at PATENT{patent2,
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authortype = {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ reqnumber = {000108705/28},
+ date = {18.12.2000},
+ publdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
+}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,11 +1,11 @@
\documentclass[%
-specialist, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+specialist, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
]{disser}
\usepackage[
@@ -15,7 +15,6 @@
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
-%\usepackage{tabularx,longtable}
\ifpdf\usepackage{epstopdf}\fi
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
@@ -33,7 +32,6 @@
\graphicspath{{fig/}}
-%----------------------------------------------------------------
\begin{document}
% \xCF\xE5\xF0\xE5\xEE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xF5 \xE7\xE0\xE3\xEE\xEB\xEE\xE2\xEA\xEE\xE2
@@ -123,8 +121,13 @@
% \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5
\input{concl}
+% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+\newcommand\BibDash{"---}
+% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
+\let\BibEmph=\emph
+\bibliographystyle{gost705}
+
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
-\bibliographystyle{gost705}
\end{document}
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,32 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+#
+
+TARGET ?= thesis
+TEXMF ?= /usr/share/texmf
+DESTDIR ?= $(TEXMF)
+DOCDIR ?= $(DESTDIR)/doc/latex/disser
+
+dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf:
+ @$(MAKE) -i -C bachelor $@
+ @$(MAKE) -i -C specialist $@
+ @$(MAKE) -i -C master $@
+ @$(MAKE) -i -C candidate $@
+ @$(MAKE) -i -C doctor $@
+
+help:
+ @$(MAKE) -s -C candidate $@ ;\
+ echo " install install templates" ;\
+ echo " uninstall uninstall templates" ;\
+ echo " reinstall reinstall templates"
+
+install:
+ cp -rf ../templates $(DOCDIR) ;\
+ cp -rf ../templates-utf8 $(DOCDIR) ;\
+ cp -rf ../include $(DOCDIR)
+
+uninstall:
+ -rm -rf $(DOCDIR)
+
+reinstall: uninstall install
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,152 @@
+\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}
+
+Ссылка на рис.~\ref{f:fig}
+\begin{figure}[!ht]
+ \centering
+ \includegraphics[width=4cm]{fig}
+ \caption{\label{f:fig}%
+ Подпись к рисунку.
+ }
+\end{figure}
+
+\begin{wrapfigure}{r}{0.35\textwidth}
+\centering
+\includegraphics[width=4cm]{fig}
+\caption{\label{f:ff}%
+Рисунок <<в оборку>>.
+}
+\end{wrapfigure}
+
+Если разность энергий электронно-дырочных уровней $E_2 - E_1$ близка к энергии продольного оптического фонона $\hbar\Omega_{\mathrm{LO}}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$.
+Волновые функции последних представляют собой следующие комбинации вырожденных состояний\footnote{Текст сноски}.
+
+Ссылка на таблицу~\ref{t:InPSiO2}.
+\begin{table}[!ht]
+ \centering
+ \caption{Пример таблицы}\label{t:InPSiO2}
+ \begin{tabular}{l|ccc}
+ \hline\hline
+ & \quad$\lambda \cdot 10^{-11}$,~$\text{дин}\cdot\text{см}^{-2}$
+ & \quad$\mu \cdot 10^{-11}$,~$\text{дин}\cdot\text{см}^{-2}$
+ & \quad$\rho$, $\text{г}\cdot\text{см}^{-3}$ \\
+ \hline
+ InP & 3.82 & 1.69 & 4.14 \\
+ SiO$_{2}$ & 1.57 & 3.11 & 2.2 \\
+ \hline\hline
+ \end{tabular}
+\end{table}
+
+\begin{figure}[!ht]
+ \centering
+ \begin{minipage}{5cm}
+ \centering
+ \includegraphics[width=4cm]{fig}
+ \caption{Рисунок с отдельным названием}
+ \end{minipage}
+ \quad
+ \begin{minipage}{5cm}
+ \centering
+ \includegraphics[width=4cm]{fig}
+ \caption{Рисунок с отдельным названием}
+ \end{minipage}
+ \quad
+ \begin{minipage}{5cm}
+ \centering
+ \includegraphics[width=4cm]{fig}
+ \caption{Рисунок с отдельным названием}
+ \end{minipage}
+\end{figure}
+
+\begin{figure}[!ht]
+ \centering
+ \begin{minipage}{5cm}
+ \includegraphics[width=4cm]{fig}
+ \end{minipage}
+ \begin{minipage}{5cm}
+ \includegraphics[width=4cm]{fig}
+ \end{minipage}
+ \caption{Рисунки с единым названием}
+\end{figure}
+
+Ссылка на внутренний рисунок (рис.~\ref{f:sub1}).
+
+\begin{figure}[!ht]
+\centering
+ \begin{minipage}{5cm}
+ \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub1}
+ \end{minipage}
+ \begin{minipage}{5cm}
+ \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub2}
+ \end{minipage}
+ \begin{minipage}{5cm}
+ \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub3}
+ \end{minipage}
+ \caption[]{%
+ Рисунки с единым названием и подчиненной нумерацией:
+ \subref{f:sub1} ссылка 1,
+ \subref{f:sub2} ссылка 2,
+ \subref{f:sub3} ссылка 3.
+ }
+\end{figure}
+
+\subsection{Название подсекции}
+Текст подсекции
+\subsubsection{Название под-подсекции}
+Текст под-подсекции
+\paragraph{Название параграфа.}
+Текст параграфа
+\subparagraph{Название подпараграфа.}
+Текст подпараграфа
+
+Нумеруемый список:
+\begin{enumerate}
+ \item Первый уровень вложенности.
+ \begin{enumerate}
+ \item Второй уровень вложенности.
+ \begin{enumerate}
+ \item Третий уровень вложенности.
+ \end{enumerate}
+ \end{enumerate}
+\end{enumerate}
+
+Демонстрация полностью настраиваемых окружений типа <<теорема>>.
+
+\newtheorem{theorem}{Теорема}[chapter]
+\def\theoremstyle{}
+\def\postthetheorem{:}
+
+\newtheorem{lemm}{Лемма}[chapter]
+\def\thelemmstyle{\bfseries}
+\def\oparglemmstyle{}
+\def\lemmstyle{}
+\def\preoparglemm{(}
+\def\postoparglemm{):}
+
+\newtheorem{remark}{Примечание}[chapter]
+\def\remarkstyle{\itshape}
+\def\theremarkstyle{}
+\def\posttheremark{:}
+
+\begin{lemm}[Шура]
+Квадратная матрица, коммутирующая со всеми матрицами неприводимого представления, кратна единичной.
+\end{lemm}
+
+\begin{theorem}
+Гомоморфный образ группы изоморфен фактор-группе по ядру гомоморфизма.
+\end{theorem}
+
+\begin{remark}
+Текст примечания.
+\end{remark}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,21 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+#
+
+TARGET ?= thesis
+BIBTEX := biber
+BIBTEXFLAGS :=
+
+include ../../include/latex.mk
+
+all: pdf
+
+allpdf: pdf
+
+alldvi: dvi
+
+help: .help
+ @echo " all alias for pdf target" ;\
+ echo " allpdf alias for pdf target" ;\
+ echo " alldvi alias for dvi target" ;\
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,2 @@
+\appendix
+\chapter{Название приложения}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\conclusion
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+include ../../../include/latex.fig.mk
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps 2016-07-05 21:39:30 UTC (rev 41635)
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+ at call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/intro.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/intro.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\intro
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/intro.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,35 @@
+ at echo off
+
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+chcp 1251 > nul
+set bibtex=biber
+set bibtexflags=
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
+if "%1"=="" (
+ %latexnmk%
+) else (
+ for %%f in (%*) do if "%%f"=="help" (
+ call :%%f
+ ) else if "%%f"=="all" (
+ %latexnmk% pdf
+ ) else if "%%f"=="allpdf" (
+ %latexnmk% pdf
+ ) else if "%%f"=="alldvi" (
+ %latexnmk% dvi
+ ) else (
+ %latexnmk% %%f
+ )
+)
+
+exit /b
+
+:help
+ echo all alias for pdf target
+ echo allpdf alias for pdf target
+ echo alldvi alias for dvi target
+ %latexnmk% help
+goto :eof
+
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,173 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+ keywords = {own},
+}
+
+ at ARTICLE{Yoffe_1993_AP_42_173,
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
+}
+
+ at ARTICLE{Efros_1982_FTP_16_7_1209,
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
+}
+
+ at BOOK{Anselm_1978,
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
+}
+
+ at INPROCEEDINGS{Segall_1968,
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+ at INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {0444863133},
+}
+
+ at INCOLLECTION{InP,
+ title = {{\relax InP} Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
+ organization = {Ioffe Physico-Technical Institute},
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
+}
+
+ at PHDTHESIS{Mishchenko_1996,
+ author = {Е. Ж. Мищенко},
+ title = {Неупругое рассеяние света в системе взаимодействующих
+ электронов и фононов},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. канд. физ.-мат. наук},
+ year = {1996},
+ language = {russian},
+}
+
+ at DSCITHESIS{Skvortsov_2008,
+ author = {М. А. Скворцов},
+ title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. д-ра физ.-мат. наук},
+ year = {2008},
+ language = {russian},
+}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at 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},
+}
+
+ at 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},
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,130 @@
+\documentclass[%
+bachelor, % тип документа
+subf, % использовать пакет subcaption для вложенной нумерации рисунков
+href, % использовать пакет hyperref для создания гиперссылок
+colorlinks, % цветные гиперссылки
+%times, % шрифт Times как основной
+%fixint, % включить прямые знаки интегралов
+]{disser}
+
+\usepackage[
+ a4paper, mag=1000,
+ left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
+]{geometry}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Плавающие рисунки "в оборку".
+\usepackage{wrapfig}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Использовать полужирное начертание для векторов
+\let\vec=\mathbf
+
+% Включать подсекции в оглавление
+\setcounter{tocdepth}{2}
+
+\graphicspath{{fig/}}
+
+\begin{document}
+
+% Переопределение стандартных заголовков
+%\def\contentsname{Содержание}
+%\def\conclusionname{Выводы}
+%\def\bibname{Литература}
+
+\institution{Название организации}
+
+% Имя лица, допускающего к защите (зав. кафедрой)
+\apname{ФИО зав. кафедрой}
+
+\title{ВЫПУСКНАЯ РАБОТА\\БАКАЛАВРА}
+
+\topic{Тема работы}
+
+% Автор
+\author{ФИО студента} % ФИО
+\group{1111/1} % Группа
+\coursenum{111111} % Номер специальности
+\course{Физика} % Название специальности
+
+% Научный руководитель
+\sa {ФИО руководителя}
+\sastatus{д.~ф.-м.~н., ст.~н.~с.}
+
+% Город и год
+\city{Санкт-Петербург}
+\date{\number\year}
+
+\maketitle
+
+%%
+%% Titlepage in English
+%%
+%
+%\institution{Name of Organization}
+%
+%% Approved by
+%\apname{Professor S.\,S.~Sidorov}
+%
+%\title{Bachelor's Thesis}
+%
+%% Topic
+%\topic{Dummy Title}
+%
+%% Author
+%\author{Author's Name} % Full Name
+%\course{Physics} % Название специальности
+%
+%\group{} % Study Group
+%
+%% Scientific Advisor
+%\sa {I.\,I.~Ivanov}
+%\sastatus {Professor}
+%
+%% Reviewer
+%\rev {P.\,P.~Petrov}
+%\revstatus{Associate Professor}
+%
+%% City & Year
+%\city{Saint Petersburg}
+%\date{\number\year}
+%
+%\maketitle[en]
+
+% Содержание
+\tableofcontents
+
+% Введение
+\input{intro}
+
+% Глава 1
+\input{1}
+% Глава 2
+%\input{2}
+
+% Заключение
+\input{concl}
+
+% Список литературы
+\printbibliography[heading=bibintoc]
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,3 @@
+\chapter{Название главы}
+\section{Название секции}
+\section{Выводы к первой главе}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,30 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+#
+
+TARGET ?= thesis
+BIBTEX := biber
+BIBTEXFLAGS :=
+
+include ../../include/latex.mk
+
+all:
+ @env TARGET=thesis $(MAKE) ;\
+ env TARGET=autoref $(MAKE) ;\
+ eval unset TARGET
+
+allpdf:
+ @env TARGET=thesis $(MAKE) pdf ;\
+ env TARGET=autoref $(MAKE) pdf ;\
+ eval unset TARGET
+
+alldvi:
+ @env TARGET=thesis $(MAKE) dvi ;\
+ env TARGET=autoref $(MAKE) dvi ;\
+ eval unset TARGET
+
+help: .help
+ @echo " all build PDF of autoref and thesis" ;\
+ echo " allpdf build PDF of autoref and thesis" ;\
+ echo " alldvi build DVI of autoref and thesis" ;\
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,216 @@
+\documentclass[%
+autoref, % тип документа
+href, % использовать пакет hyperref для создания гиперссылок
+facsimile, % отображать факсимиле диссертанта и ученого секретаря
+colorlinks, % цветные гиперссылки
+%fixint, % отключить прямые знаки интегралов
+%times, % шрифт Times как основной
+%classified, % гриф секретности
+]{disser}
+
+\usepackage[
+ a4paper, mag=1000,
+ left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
+]{geometry}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\usepackage{tabularx}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ defernumbers,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Путь к файлам с иллюстрациями
+\graphicspath{{fig/}}
+
+\begin{document}
+% Включение файла с общим текстом диссертации и автореферата
+% (текст титульного листа и характеристика работы).
+\input{common}
+
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
+\title{АВТОРЕФЕРАТ\\
+диссертации на соискание ученой степени\\
+кандидата физико-математических наук}
+
+\maketitle
+
+% Внутренняя сторона обложки
+\thispagestyle{empty}
+\vspace*{-2cm}
+\noindent
+\begin{center}
+Работа выполнена в \emph{название организации}.
+\end{center}
+\vskip1ex
+\begin{tabularx}{\linewidth}{lp{1cm}X}
+Научный руководитель: & & \emph{ученая степень}, \\
+ & & \emph{ученое звание}, \\
+ & & \emph{фамилия имя отчество}
+\\
+Официальные оппоненты: & & \emph{ученая степень}, \\
+ & & \emph{ученое звание}, \\
+ & & \emph{фамилия имя отчество}\\
+ & & \emph{ученая степень}, \\
+ & & \emph{ученое звание}, \\
+ & & \emph{фамилия имя отчество}
+\\
+Ведущая организация: & & \emph{название организации}\\
+\end{tabularx}
+
+\vskip2ex\noindent
+Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt} часов
+на заседании диссертационного совета \emph{шифр совета} при \emph{название
+организации, при которой создан совет}, расположенном по адресу:
+\emph{адрес}
+
+\vskip1ex\noindent
+С диссертацией можно ознакомиться в библиотеке
+\emph{название организации}.
+
+\vskip1ex\noindent
+Автореферат разослан \datefield{}
+
+\vskip2ex\noindent
+Отзывы и замечания по автореферату в двух экземплярах, заверенные
+печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря
+диссертационного совета.
+
+\vfill\noindent
+\begin{minipage}[b]{0.4\linewidth}
+ Ученый секретарь\\
+ диссертационного совета,\\
+ \emph{ученая степень}, \emph{ученое звание}
+\end{minipage}
+\hfill
+% вставка файла, содержащего факсимиле ученого секретаря
+\makeatletter
+\ifDis at facsimile
+ \includegraphics[width=3cm]{sec-facsimile}\hfill
+\fi%
+\makeatother%
+\emph{фамилия и. о.}
+
+\clearpage
+
+\nsection{Общая характеристика работы}
+
+% Актуальность работы
+\actualitysection
+\actualitytext
+
+% Степень разработанности темы исследования
+\developmentsection
+\developmenttext
+
+% Цели и задачи диссертационной работы
+\objectivesection
+\objectivetext
+
+% Научная новизна
+\noveltysection
+\noveltytext
+
+% Теоретическая и практическая значимость
+\valuesection
+\valuetext
+
+% Методология и методы исследования
+\methodssection
+\methodstext
+
+% Положения, выносимые на защиту
+\resultssection
+\resultstext
+
+% Степень достоверности и апробация результатов
+\approbationsection
+\approbationtext
+
+% Публикации
+\pubsection
+\pubtext
+
+% Личный вклад автора
+\contribsection
+\contribtext
+
+% Структура и объем диссертации
+\structsection
+\structtext
+
+\nsection{Содержание работы}
+
+\textbf{Во Введении} обоснована актуальность диссертационной работы, сформулирована цель и аргументирована научная новизна исследований, показана практическая значимость полученных результатов, представлены выносимые на защиту научные положения.
+
+\textbf{В первой главе} ...
+
+Содержание первой главы.
+
+Результаты первой главы опубликованы в работе~\cite{Ivanov_1999_Journal_17_173}.
+
+\textbf{Во второй главе} ...
+
+Содержание второй главы.
+
+Результаты второй главы опубликованы в работе~\cite{Petrov_2001_Journal_23_12321}.
+
+\textbf{В третьей главе} ...
+
+Содержание третьей главы.
+
+Результаты третьей главы опубликованы в работе~\cite{Sidorov_2002_Journal_32_1531}.
+
+\textbf{В Заключении}
+
+% ----------------------------------------------------------------
+\printbibliography[keyword=own,title={Основные публикации по теме диссертации}]
+\printbibliography[notkeyword=own,title={Цитированная литература}]
+
+% ----------------------------------------------------------------
+% Выходные данные
+\clearpage
+\thispagestyle{empty}
+\normalfont\selectfont
+\vspace*{2cm}
+\begin{center}
+\textit{Научное издание}\\
+\vskip 2cm
+\makeatletter
+\@author
+\vskip 1.5cm
+\@title{} на тему:\\
+\@topic\\
+\makeatother
+\end{center}
+\vfill
+Подписано в печать~25.01.2011.
+Формат~$60 \times 90$~1/16.
+Тираж~100~экз.
+Заказ~256.\\[2ex]
+\noindent
+Санкт-Петербургская издательская фирма <<Наука>> РАН.
+199034, Санкт-Петербург, Менделеевская линия, 1,
+\href{http://www.naukaspb.spb.ru}{http://www.naukaspb.spb.ru}
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,77 @@
+% Общие поля титульного листа диссертации и автореферата
+\institution{Название организации}
+
+\topic{Тема диссертации}
+
+\author{ФИО автора}
+
+\specnum{01.04.05}
+\spec{Оптика}
+%\specsndnum{01.04.07}
+%\specsnd{Физика конденсированного состояния}
+
+\sa{ФИО руководителя}
+\sastatus{д.~ф.-м.~н., проф.}
+%\sasnd{ФИО второго руководителя}
+%\sasndstatus{к.~ф.-м.~н., проф.}
+
+%\scon{ФИО консультанта}
+%\sconstatus{д.~ф.-м.~н., проф.}
+%\sconsnd{ФИО второго консультанта}
+%\sconsndstatus{д.~ф.-м.~н., проф.}
+
+\city{Санкт-Петербург}
+\date{\number\year}
+
+% Общие разделы автореферата и диссертации
+\mkcommonsect{actuality}{Актуальность темы исследования.}{%
+Текст об актуальности. Ссылка~\cite{Yoffe_1993_AP_42_173}.
+}
+
+\mkcommonsect{development}{Степень разработанности темы исследования.}{
+Текст о степени разработанности темы.
+}
+
+\mkcommonsect{objective}{Цели и задачи диссертационной работы:}{%
+Список целей.
+
+Для достижения поставленных целей были решены следующие задачи:
+}
+
+\mkcommonsect{novelty}{Научная новизна.}{%
+Текст о новизне.
+}
+
+\mkcommonsect{value}{Теоретическая и практическая значимость.}{%
+Результаты, изложенные в диссертации, могут быть использованы для ...
+}
+
+\mkcommonsect{methods}{Методология и методы исследования.}{%
+Текст о методах исследования.
+}
+
+\mkcommonsect{results}{Положения, выносимые на защиту:}{%
+Текст о положениях и результатах.
+}
+
+\mkcommonsect{approbation}{Степень достоверности и апробация результатов.}{%
+Основные результаты диссертации докладывались на следующих конференциях:
+}
+
+\mkcommonsect{pub}{Публикации.}{%
+Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$
+статей в рецензируемых журналах~\cite{Ivanov_1999_Journal_17_173,
+Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ статей в
+сборниках трудов конференций и $n_3$ тезисов докладов.
+}
+
+\mkcommonsect{contrib}{Личный вклад автора.}{%
+Содержание диссертации и основные положения, выносимые на защиту, отражают персональный вклад автора в опубликованные работы.
+Подготовка к публикации полученных результатов проводилась совместно с соавторами, причем вклад диссертанта был определяющим. Все представленные в диссертации результаты получены лично автором.
+}
+
+\mkcommonsect{struct}{Структура и объем диссертации.}{%
+Диссертация состоит из введения, обзора литературы, $n$ глав, заключения и библиографии.
+Общий объем диссертации $P$ страниц, из них $p_1$ страницы текста, включая $f$ рисунков.
+Библиография включает $B$ наименований на $p_2$ страницах.
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\conclusion
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,9 @@
+% Список сокращений и условных обозначений
+\defs
+
+\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}}
+$\vec A$ & --- & векторный потенциал\\
+$I$ & --- & интенсивность света\\
+$j_l$ & --- & сферическая функция Бесселя первого рода\\
+$Y_{lm}$ & --- & сферическая гармоника\\
+\end{longtable}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,4 @@
+% Словарь терминов
+\dict
+
+\textbf{Термин} "--- определение.
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+include ../../../include/latex.fig.mk
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps 2016-07-05 21:39:30 UTC (rev 41635)
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+ at call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps 2016-07-05 21:39:30 UTC (rev 41635)
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,41 @@
+\intro
+
+%
+% Используемые далее команды определяются в файле common.tex.
+%
+
+% Актуальность работы
+\actualitysection
+\actualitytext
+
+% Цель диссертационной работы
+\objectivesection
+\objectivetext
+
+% Научная новизна
+\noveltysection
+\noveltytext
+
+% Практическая ценность
+\valuesection
+\valuetext
+
+% Результаты и положения, выносимые на защиту
+\resultssection
+\resultstext
+
+% Апробация работы
+\approbationsection
+\approbationtext
+
+% Публикации
+\pubsection
+\pubtext
+
+% Личный вклад автора
+\contribsection
+\contribtext
+
+% Структура и объем диссертации
+\structsection
+\structtext
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,46 @@
+ at echo off
+
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+chcp 1251 > nul
+set bibtex=biber
+set bibtexflags=
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
+if "%1"=="" (
+ %latexnmk%
+) else (
+ for %%f in (%*) do if "%%f"=="help" (
+ call :%%f
+ ) else if "%%f"=="all" (
+ call :allpdf
+ ) else if "%%f"=="allpdf" (
+ call :%%f
+ ) else if "%%f"=="alldvi" (
+ call :%%f
+ ) else (
+ %latexnmk% %%f
+ )
+)
+
+exit /b
+
+:help
+ 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
+
+: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
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\review
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,173 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+ keywords = {own},
+}
+
+ at ARTICLE{Yoffe_1993_AP_42_173,
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
+}
+
+ at ARTICLE{Efros_1982_FTP_16_7_1209,
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
+}
+
+ at BOOK{Anselm_1978,
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
+}
+
+ at INPROCEEDINGS{Segall_1968,
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+ at INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {0444863133},
+}
+
+ at INCOLLECTION{InP,
+ title = {{\relax InP} Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
+ organization = {Ioffe Physico-Technical Institute},
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
+}
+
+ at PHDTHESIS{Mishchenko_1996,
+ author = {Е. Ж. Мищенко},
+ title = {Неупругое рассеяние света в системе взаимодействующих
+ электронов и фононов},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. канд. физ.-мат. наук},
+ year = {1996},
+ language = {russian},
+}
+
+ at DSCITHESIS{Skvortsov_2008,
+ author = {М. А. Скворцов},
+ title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. д-ра физ.-мат. наук},
+ year = {2008},
+ language = {russian},
+}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at 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},
+}
+
+ at 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},
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,141 @@
+\documentclass[%
+candidate, % тип документа
+subf, % использовать пакет subcaption для вложенной нумерации рисунков
+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[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Ссылки на работы соискателя включаются в общий список литературы
+\let\citemy=\cite
+
+% Использовать полужирное начертание для векторов
+\let\vec=\mathbf
+
+% Путь к файлам с иллюстрациями
+\graphicspath{{fig/}}
+
+\begin{document}
+
+% Переопределение стандартных заголовков
+%\def\contentsname{Содержание}
+%\def\conclusionname{Выводы}
+%\def\bibname{Литература}
+
+% Включение файла с общим текстом диссертации и автореферата
+% (текст титульного листа и характеристика работы).
+\input{common}
+
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
+% номер УДК
+\libcatnum{12345}
+
+\title{ДИССЕРТАЦИЯ\\
+на соискание ученой степени\\
+кандидата физико-математических наук}
+
+\maketitle
+
+%%
+%% Titlepage in English
+%%
+%
+%\institution{Name of Organization}
+%
+%\title{PhD Thesis}
+%
+%% Topic
+%\topic{Dummy Title}
+%
+%% Author
+%\author{Author's Name}
+%
+%\specnum{01.04.05}
+%\spec{Optics}
+%
+%%\specsndnum{01.04.07}
+%%\specsnd{Condensed matter physics}
+%
+%\sa{I.\,I.~Ivanov}
+%\sastatus{Professor}
+%%\sasnd{P.\,P.~Petrov}
+%%\sasndstatus{Professor}
+%
+%% Scientific consultant
+%%\scon{B.\,B.~Baranov}
+%%\sconstatus{Professor}
+%
+%% City & Year
+%\city{Saint Petersburg}
+%\date{\number\year}
+%
+%\maketitle[en]
+
+% Содержание
+\tableofcontents
+
+% Введение
+\input{intro}
+
+% Обзор литературы
+%\input{review}
+
+% Основная часть
+%% Глава 1
+\input{1}
+%% Глава 2
+%\input{2}
+
+% Заключение
+\input{concl}
+
+% Список сокращений и условных обозначений
+%\input{defs}
+
+% Словарь терминов
+%\input{dict}
+
+% Список литературы
+\printbibliography[heading=bibintoc]
+
+% Список иллюстративного материала
+%\listoffigures
+
+% Приложения
+%\appendix
+%\input{app-a}
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,3 @@
+\chapter{Название главы}
+\section{Название секции}
+\section{Выводы к первой главе}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,30 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+#
+
+TARGET ?= thesis
+BIBTEX := biber
+BIBTEXFLAGS :=
+
+include ../../include/latex.mk
+
+all:
+ @env TARGET=thesis $(MAKE) ;\
+ env TARGET=autoref $(MAKE) ;\
+ eval unset TARGET
+
+allpdf:
+ @env TARGET=thesis $(MAKE) pdf ;\
+ env TARGET=autoref $(MAKE) pdf ;\
+ eval unset TARGET
+
+alldvi:
+ @env TARGET=thesis $(MAKE) dvi ;\
+ env TARGET=autoref $(MAKE) dvi ;\
+ eval unset TARGET
+
+help: .help
+ @echo " all build PDF of autoref and thesis" ;\
+ echo " allpdf build PDF of autoref and thesis" ;\
+ echo " alldvi build DVI of autoref and thesis" ;\
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,213 @@
+\documentclass[%
+autoref, % тип документа
+href, % использовать пакет hyperref для создания гиперссылок
+facsimile, % отображать факсимиле диссертанта и ученого секретаря
+colorlinks, % цветные гиперссылки
+%fixint, % отключить прямые знаки интегралов
+%times, % шрифт Times как основной
+%classified, % гриф секретности
+]{disser}
+
+\usepackage[
+ a4paper, mag=1000,
+ left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
+]{geometry}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\usepackage{tabularx}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ defernumbers,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Путь к файлам с иллюстрациями
+\graphicspath{{fig/}}
+
+\begin{document}
+% Включение файла с общим текстом диссертации и автореферата
+% (текст титульного листа и характеристика работы).
+\input{common}
+
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
+\title{АВТОРЕФЕРАТ\\
+диссертации на соискание ученой степени\\
+доктора физико-математических наук}
+
+\maketitle
+
+% Внутренняя сторона обложки
+\thispagestyle{empty}
+\vspace*{-2cm}
+\noindent
+\begin{center}
+Работа выполнена в \emph{название организации}.
+\end{center}
+\vskip1ex\noindent
+\begin{tabularx}{\linewidth}{@{}lX@{}}
+ \textbf{Научный консультант:} & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ \textbf{Официальные оппоненты:} & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ \textbf{Ведущая организация:} & название организации
+\end{tabularx}
+
+\vskip2ex\noindent
+Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt} часов
+на заседании диссертационного совета \emph{шифр совета} при \emph{название
+организации, при которой создан совет}, расположенном по адресу:
+\emph{адрес}
+
+\vskip1ex\noindent
+С диссертацией можно ознакомиться в библиотеке
+\emph{название организации}.
+
+\vskip1ex\noindent
+Автореферат разослан \datefield{}
+
+\vskip2ex\noindent
+Отзывы и замечания по автореферату в двух экземплярах, заверенные
+печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря
+диссертационного совета.
+
+\vfill\noindent
+\begin{minipage}[b]{0.4\linewidth}
+ Ученый секретарь\\
+ диссертационного совета,\\
+ \emph{ученая степень}, \emph{ученое звание}
+\end{minipage}
+\hfill
+% вставка файла, содержащего факсимиле ученого секретаря
+\makeatletter
+\ifDis at facsimile
+ \includegraphics[width=3cm]{sec-facsimile}\hfill
+\fi%
+\makeatother%
+\emph{фамилия и. о.}
+
+\clearpage
+
+\nsection{Общая характеристика работы}
+
+% Актуальность работы
+\actualitysection
+\actualitytext
+
+% Степень разработанности темы исследования
+\developmentsection
+\developmenttext
+
+% Цели и задачи диссертационной работы
+\objectivesection
+\objectivetext
+
+% Научная новизна
+\noveltysection
+\noveltytext
+
+% Теоретическая и практическая значимость
+\valuesection
+\valuetext
+
+% Методология и методы исследования
+\methodssection
+\methodstext
+
+% Положения, выносимые на защиту
+\resultssection
+\resultstext
+
+% Степень достоверности и апробация результатов
+\approbationsection
+\approbationtext
+
+% Публикации
+\pubsection
+\pubtext
+
+% Личный вклад автора
+\contribsection
+\contribtext
+
+% Структура и объем диссертации
+\structsection
+\structtext
+
+\nsection{Содержание работы}
+
+\textbf{Во Введении} обоснована актуальность диссертационной работы, сформулирована цель и аргументирована научная новизна исследований, показана практическая значимость полученных результатов, представлены выносимые на защиту научные положения.
+
+\textbf{В первой главе} ...
+
+Содержание первой главы.
+
+Результаты первой главы опубликованы в работе~\cite{Ivanov_1999_Journal_17_173}.
+
+\textbf{Во второй главе} ...
+
+Содержание второй главы.
+
+Результаты второй главы опубликованы в работе~\cite{Petrov_2001_Journal_23_12321}.
+
+\textbf{В третьей главе} ...
+
+Содержание третьей главы.
+
+Результаты третьей главы опубликованы в работе~\cite{Sidorov_2002_Journal_32_1531}.
+
+\textbf{В Заключении}
+
+% ----------------------------------------------------------------
+\printbibliography[keyword=own,title={Основные публикации по теме диссертации}]
+\printbibliography[notkeyword=own,title={Цитированная литература}]
+
+% ----------------------------------------------------------------
+% Выходные данные
+\clearpage
+\thispagestyle{empty}
+\normalfont\selectfont
+\vspace*{2cm}
+\begin{center}
+\textit{Научное издание}\\
+\vskip 2cm
+\makeatletter
+\@author
+\vskip 1.5cm
+\@title{} на тему:\\
+\@topic\\
+\makeatother
+\end{center}
+\vfill
+Подписано в печать~25.01.2011.
+Формат~$60 \times 90$~1/16.
+Тираж~100~экз.
+Заказ~256.\\[2ex]
+\noindent
+Санкт-Петербургская издательская фирма <<Наука>> РАН.
+199034, Санкт-Петербург, Менделеевская линия, 1,
+\href{http://www.naukaspb.spb.ru}{http://www.naukaspb.spb.ru}
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,72 @@
+% Общие поля титульного листа диссертации и автореферата
+\institution{Название организации}
+
+\topic{Тема диссертации}
+
+\author{ФИО автора}
+
+\specnum{01.04.05}
+\spec{Оптика}
+%\specsndnum{01.04.07}
+%\specsnd{Физика конденсированного состояния}
+
+\scon{ФИО консультанта}
+\sconstatus{д.~ф.-м.~н., проф.}
+%\sconsnd{ФИО второго консультанта}
+%\sconsndstatus{д.~ф.-м.~н., проф.}
+
+\city{Санкт-Петербург}
+\date{\number\year}
+
+% Общие разделы автореферата и диссертации
+\mkcommonsect{actuality}{Актуальность темы исследования.}{%
+Текст об актуальности. Ссылка~\cite{Yoffe_1993_AP_42_173}.
+}
+
+\mkcommonsect{development}{Степень разработанности темы исследования.}{
+Текст о степени разработанности темы.
+}
+
+\mkcommonsect{objective}{Цели и задачи диссертационной работы:}{%
+Список целей.
+
+Для достижения поставленных целей были решены следующие задачи:
+}
+
+\mkcommonsect{novelty}{Научная новизна.}{%
+Текст о новизне.
+}
+
+\mkcommonsect{value}{Теоретическая и практическая значимость.}{%
+Результаты, изложенные в диссертации, могут быть использованы для ...
+}
+
+\mkcommonsect{methods}{Методология и методы исследования.}{%
+Текст о методах исследования.
+}
+
+\mkcommonsect{results}{Положения, выносимые на защиту:}{%
+Текст о положениях и результатах.
+}
+
+\mkcommonsect{approbation}{Степень достоверности и апробация результатов.}{%
+Основные результаты диссертации докладывались на следующих конференциях:
+}
+
+\mkcommonsect{pub}{Публикации.}{%
+Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$
+статей в рецензируемых журналах~\cite{Ivanov_1999_Journal_17_173,
+Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ статей в
+сборниках трудов конференций и $n_3$ тезисов докладов.
+}
+
+\mkcommonsect{contrib}{Личный вклад автора.}{%
+Содержание диссертации и основные положения, выносимые на защиту, отражают персональный вклад автора в опубликованные работы.
+Подготовка к публикации полученных результатов проводилась совместно с соавторами, причем вклад диссертанта был определяющим. Все представленные в диссертации результаты получены лично автором.
+}
+
+\mkcommonsect{struct}{Структура и объем диссертации.}{%
+Диссертация состоит из введения, обзора литературы, $n$ глав, заключения и библиографии.
+Общий объем диссертации $P$ страниц, из них $p_1$ страницы текста, включая $f$ рисунков.
+Библиография включает $B$ наименований на $p_2$ страницах.
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\conclusion
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,9 @@
+% Список сокращений и условных обозначений
+\defs
+
+\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}}
+$\vec A$ & --- & векторный потенциал\\
+$I$ & --- & интенсивность света\\
+$j_l$ & --- & сферическая функция Бесселя первого рода\\
+$Y_{lm}$ & --- & сферическая гармоника\\
+\end{longtable}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,4 @@
+% Словарь терминов
+\dict
+
+\textbf{Термин} "--- определение.
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+include ../../../include/latex.fig.mk
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps 2016-07-05 21:39:30 UTC (rev 41635)
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+ at call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps 2016-07-05 21:39:30 UTC (rev 41635)
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,49 @@
+\intro
+
+%
+% Используемые далее команды определяются в файле common.tex.
+%
+
+% Актуальность работы
+\actualitysection
+\actualitytext
+
+% Степень разработанности темы исследования
+\developmentsection
+\developmenttext
+
+% Цели и задачи диссертационной работы
+\objectivesection
+\objectivetext
+
+% Научная новизна
+\noveltysection
+\noveltytext
+
+% Теоретическая и практическая значимость
+\valuesection
+\valuetext
+
+% Методология и методы исследования
+\methodssection
+\methodstext
+
+% Положения, выносимые на защиту
+\resultssection
+\resultstext
+
+% Степень достоверности и апробация результатов
+\approbationsection
+\approbationtext
+
+% Публикации
+\pubsection
+\pubtext
+
+% Личный вклад автора
+\contribsection
+\contribtext
+
+% Структура и объем диссертации
+\structsection
+\structtext
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,45 @@
+ at echo off
+
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+chcp 1251 > nul
+set bibtex=biber
+set bibtexflags=
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
+if "%1"=="" (
+ %latexnmk%
+) else (
+ for %%f in (%*) do if "%%f"=="help" (
+ call :%%f
+ ) else if "%%f"=="all" (
+ call :allpdf
+ ) else if "%%f"=="allpdf" (
+ call :%%f
+ ) else if "%%f"=="alldvi" (
+ call :%%f
+ ) else (
+ %latexnmk% %%f
+ )
+)
+
+exit /b
+
+:help
+ echo all build DVI of autoref and thesis
+ echo allpdf build PDF 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
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\review
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,173 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+ keywords = {own},
+}
+
+ at ARTICLE{Yoffe_1993_AP_42_173,
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
+}
+
+ at ARTICLE{Efros_1982_FTP_16_7_1209,
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
+}
+
+ at BOOK{Anselm_1978,
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
+}
+
+ at INPROCEEDINGS{Segall_1968,
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+ at INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {0444863133},
+}
+
+ at INCOLLECTION{InP,
+ title = {{\relax InP} Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
+ organization = {Ioffe Physico-Technical Institute},
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
+}
+
+ at PHDTHESIS{Mishchenko_1996,
+ author = {Е. Ж. Мищенко},
+ title = {Неупругое рассеяние света в системе взаимодействующих
+ электронов и фононов},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. канд. физ.-мат. наук},
+ year = {1996},
+ language = {russian},
+}
+
+ at DSCITHESIS{Skvortsov_2008,
+ author = {М. А. Скворцов},
+ title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. д-ра физ.-мат. наук},
+ year = {2008},
+ language = {russian},
+}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at 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},
+}
+
+ at 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},
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,138 @@
+\documentclass[%
+doctor, % тип документа
+subf, % использовать пакет subcaption для вложенной нумерации рисунков
+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[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Ссылки на работы соискателя включаются в общий список литературы
+\let\citemy=\cite
+
+% Использовать полужирное начертание для векторов
+\let\vec=\mathbf
+
+% Путь к файлам с иллюстрациями
+\graphicspath{{fig/}}
+
+\begin{document}
+
+% Переопределение стандартных заголовков
+%\def\contentsname{Содержание}
+%\def\conclusionname{Выводы}
+%\def\bibname{Литература}
+
+% Включение файла с общим текстом диссертации и автореферата
+% (текст титульного листа и характеристика работы).
+\input{common}
+
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
+% номер УДК
+\libcatnum{12345}
+
+\title{ДИССЕРТАЦИЯ\\
+на соискание ученой степени\\
+доктора физико-математических наук}
+
+\maketitle
+
+%%
+%% Titlepage in English
+%%
+%
+%\institution{Name of Organization}
+%
+%\title{Doctoral Dissertation}
+%
+%% Topic
+%\topic{Dummy Title}
+%
+%% Author
+%\author{Author's Name}
+%
+%\specnum{01.04.05}
+%\spec{Optics}
+%
+%%\specsndnum{01.04.07}
+%%\specsnd{Condensed matter physics}
+%
+%% Scientific consultants
+%\scon{B.\,B.~Baranov}
+%\sconstatus{Professor}
+%%\sconsnd{P.\,P.~Petrov}
+%%\sconsndstatus{Professor}
+%
+%% City & Year
+%\city{Saint Petersburg}
+%\date{\number\year}
+%
+%\maketitle[en]
+
+% Содержание
+\tableofcontents
+
+% Введение
+\input{intro}
+
+% Обзор литературы
+%\input{review}
+
+% Основная часть
+%% Глава 1
+\input{1}
+%% Глава 2
+%\input{2}
+
+% Заключение
+\input{concl}
+
+% Список сокращений и условных обозначений
+%\input{defs}
+
+% Словарь терминов
+%\input{dict}
+
+% Список литературы
+\printbibliography[heading=bibintoc]
+
+% Список иллюстративного материала
+%\listoffigures
+
+% Приложения
+%\appendix
+%\input{app-a}
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\chapter{Название главы}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,21 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+#
+
+TARGET ?= thesis
+BIBTEX := biber
+BIBTEXFLAGS :=
+
+include ../../include/latex.mk
+
+all: pdf
+
+allpdf: pdf
+
+alldvi: dvi
+
+help: .help
+ @echo " all alias for pdf target" ;\
+ echo " allpdf alias for pdf target" ;\
+ echo " alldvi alias for dvi target" ;\
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\chapter{Заголовок приложения}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\conclusion
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+include ../../../include/latex.fig.mk
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+ at call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,5 @@
+\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
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,34 @@
+ at echo off
+
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+chcp 1251 > nul
+set bibtex=biber
+set bibtexflags=
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
+if "%1"=="" (
+ %latexnmk%
+) else (
+ for %%f in (%*) do if "%%f"=="help" (
+ call :%%f
+ ) else if "%%f"=="all" (
+ %latexnmk% pdf
+ ) else if "%%f"=="allpdf" (
+ %latexnmk% pdf
+ ) else if "%%f"=="alldvi" (
+ %latexnmk% dvi
+ ) else (
+ %latexnmk% %%f
+ )
+)
+
+exit /b
+
+:help
+ echo all alias for pdf target
+ echo allpdf alias for pdf target
+ echo alldvi alias for dvi target
+ %latexnmk% help
+goto :eof
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,173 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+ keywords = {own},
+}
+
+ at ARTICLE{Yoffe_1993_AP_42_173,
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
+}
+
+ at ARTICLE{Efros_1982_FTP_16_7_1209,
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
+}
+
+ at BOOK{Anselm_1978,
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
+}
+
+ at INPROCEEDINGS{Segall_1968,
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+ at INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {0444863133},
+}
+
+ at INCOLLECTION{InP,
+ title = {{\relax InP} Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
+ organization = {Ioffe Physico-Technical Institute},
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
+}
+
+ at PHDTHESIS{Mishchenko_1996,
+ author = {Е. Ж. Мищенко},
+ title = {Неупругое рассеяние света в системе взаимодействующих
+ электронов и фононов},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. канд. физ.-мат. наук},
+ year = {1996},
+ language = {russian},
+}
+
+ at DSCITHESIS{Skvortsov_2008,
+ author = {М. А. Скворцов},
+ title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. д-ра физ.-мат. наук},
+ year = {2008},
+ language = {russian},
+}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at 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},
+}
+
+ at 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},
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,156 @@
+\documentclass[%
+master, % тип документа
+subf, % использовать пакет subcaption для вложенной нумерации рисунков
+href, % использовать пакет hyperref для создания гиперссылок
+colorlinks, % цветные гиперссылки
+%times, % шрифт Times как основной
+%fixint, % включить прямые знаки интегралов
+]{disser}
+
+\usepackage[
+ a4paper, mag=1000,
+ left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
+]{geometry}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Использовать полужирное начертание для векторов
+\let\vec=\mathbf
+
+% Включать подсекции в оглавление
+\setcounter{tocdepth}{2}
+
+\graphicspath{{fig/}}
+
+\begin{document}
+
+% Переопределение стандартных заголовков
+%\def\contentsname{Содержание}
+%\def\conclusionname{Выводы}
+%\def\bibname{Литература}
+
+\institution{Название организации}
+
+% Имя лица, допускающего к защите (зав. кафедрой)
+\apname{ФИО зав. кафедрой}
+
+\title{ДИССЕРТАЦИЯ\\[-14pt]на соискание ученой степени\\МАГИСТРА}
+
+\topic{Тема диссертации}
+
+% Автор
+\author {ФИО автора} % ФИО
+\group {1111/1} % Группа
+\coursenum {111111} % Номер направления
+\course {Название направления}
+\masterprognum{111111} % Номер магистерской программы
+\masterprog {Название программы}
+
+% Научный руководитель
+\sa {ФИО руководителя}
+\sastatus{д.~ф.-м.~н., ст.~н.~с.}
+% Второй научный руководитель
+%\sasnd {ФИО руководителя}
+%\sasndstatus{д.~ф.-м.~н., ст.~н.~с.}
+
+% Рецензент
+\rev {ФИО рецензента}
+\revstatus{д.~ф.-м.~н., в.~н.~с.}
+% Второй рецензент
+%\revsnd {ФИО рецензента}
+%\revsndstatus{д.~т.~н., ст.~н.~с.}
+
+% Консультант
+\con{ФИО консультанта}
+\conspec{вопросам\\охраны труда}
+\constatus{к.~т.~н., доц.}
+% Второй консультант
+%\consnd{ФИО консультанта}
+%\consndspec{экономическим\\вопросам}
+%\consndstatus{к.~э.~н., доц.}
+
+% Город и год
+\city{Санкт-Петербург}
+\date{\number\year}
+
+\maketitle
+
+%%
+%% Titlepage in English
+%%
+%
+%\institution{Name of Organization}
+%
+%% Approved by
+%\apname{Professor S.\,S.~Sidorov}
+%
+%\title{Master's Thesis}
+%
+%% Topic
+%\topic{Dummy Title}
+%
+%% Author
+%\author{Author's Name} % Full Name
+%\course{Physics} % Название специальности
+%
+%\group{} % Study Group
+%\masterprog {Title of program}
+%
+%% Scientific Advisor
+%\sa {I.\,I.~Ivanov}
+%\sastatus {Professor}
+%
+%% Reviewer
+%\rev {P.\,P.~Petrov}
+%\revstatus{Associate Professor}
+%
+%% Consultant
+%\con{}
+%\conspec{}
+%\constatus{}
+%
+%% City & Year
+%\city{Saint Petersburg}
+%\date{\number\year}
+%
+%\maketitle[en]
+
+% Содержание
+\tableofcontents
+% Введение
+\input{intro}
+% Глава 1
+\input{1}
+% Глава 2
+%\input{2}
+
+% Заключение
+\input{concl}
+
+% Список литературы
+\printbibliography[heading=bibintoc]
+
+% Приложения
+\appendix
+\input{app-a}
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,55 @@
+ at echo off
+
+rem nomake script for LaTeX projects
+rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+if "%CMDEXTVERSION%"=="" (
+ echo This script requires command interpreter from Windows 2000 or above.
+ goto :eof
+)
+
+setlocal enabledelayedexpansion
+
+set target=thesis
+if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.9
+if "!destdir!"=="" set destdir=!texmf!
+if "!docdir!"=="" set docdir=!destdir!\doc\latex\disser
+if "!subdirs!"=="" set subdirs=bachelor ..\specialist ..\master ..\candidate ..\doctor
+
+
+if "%1"=="help" (
+ call :%1
+) else if "%1"=="install" (
+ call :%1
+) else if "%1"=="uninstall" (
+ call :%1
+) else if "%1"=="reinstall" (
+ call :%1
+) else (
+ for %%i in (%subdirs%) do @cd %%i & call nomake %*
+)
+
+exit /b
+
+:help
+ cd candidate & call nomake help & cd ..
+ echo install install templates to TeX tree
+ echo uninstall uninstall templates
+ echo reinstall reinstall templates
+goto :eof
+
+:install
+ if not exist "!docdir!" mkdir "!docdir!"
+ xcopy /y /e /i /f ..\templates "!docdir!\templates"
+ xcopy /y /e /i /f ..\templates-utf8 "!docdir!\templates-utf8"
+ xcopy /y /e /i /f ..\include "!docdir!\include"
+goto :eof
+
+:uninstall
+ rmdir /s /q "!docdir!"
+goto :eof
+
+:reinstall
+ call :uninstall
+ call :install
+goto :eof
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\chapter{Название главы}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,21 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+#
+
+TARGET ?= thesis
+BIBTEX := biber
+BIBTEXFLAGS :=
+
+include ../../include/latex.mk
+
+all: pdf
+
+allpdf: pdf
+
+alldvi: dvi
+
+help: .help
+ @echo " all alias for pdf target" ;\
+ echo " allpdf alias for pdf target" ;\
+ echo " alldvi alias for dvi target" ;\
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\chapter{Заголовок приложения}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+\conclusion
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+include ../../../include/latex.fig.mk
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps 2016-07-05 21:39:30 UTC (rev 41635)
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1 @@
+ at call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,5 @@
+\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
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/nomake.cmd (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/nomake.cmd 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,35 @@
+ at echo off
+
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+chcp 1251 > nul
+set bibtex=biber
+set bibtexflags=
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
+if "%1"=="" (
+ %latexnmk%
+) else (
+ for %%f in (%*) do if "%%f"=="help" (
+ call :%%f
+ ) else if "%%f"=="all" (
+ %latexnmk% pdf
+ ) else if "%%f"=="allpdf" (
+ %latexnmk% pdf
+ ) else if "%%f"=="alldvi" (
+ %latexnmk% dvi
+ ) else (
+ %latexnmk% %%f
+ )
+)
+
+exit /b
+
+:help
+ echo all alias for pdf target
+ echo allpdf alias for pdf target
+ echo alldvi alias for dvi target
+ %latexnmk% help
+goto :eof
+
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/nomake.cmd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,173 @@
+ at ARTICLE{Ivanov_1999_Journal_17_173,
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Petrov_2001_Journal_23_12321,
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
+ keywords = {own},
+}
+
+ at ARTICLE{Sidorov_2002_Journal_32_1531,
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
+ keywords = {own},
+}
+
+ at ARTICLE{Yoffe_1993_AP_42_173,
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
+}
+
+ at ARTICLE{Efros_1982_FTP_16_7_1209,
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
+}
+
+ at BOOK{Anselm_1978,
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
+}
+
+ at INPROCEEDINGS{Segall_1968,
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+ at INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {0444863133},
+}
+
+ at INCOLLECTION{InP,
+ title = {{\relax InP} Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
+ organization = {Ioffe Physico-Technical Institute},
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
+}
+
+ at PHDTHESIS{Mishchenko_1996,
+ author = {Е. Ж. Мищенко},
+ title = {Неупругое рассеяние света в системе взаимодействующих
+ электронов и фононов},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. канд. физ.-мат. наук},
+ year = {1996},
+ language = {russian},
+}
+
+ at DSCITHESIS{Skvortsov_2008,
+ author = {М. А. Скворцов},
+ title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
+ school = {ИТФ им. Л.~Д.~Ландау},
+ type = {дисс. д-ра физ.-мат. наук},
+ year = {2008},
+ language = {russian},
+}
+
+% old-style arXiv reference
+ at ARTICLE{Perelman_2003_math:0307245,
+ author = {Grisha Perelman},
+ title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds},
+ eprint = {math/0307245},
+}
+
+% new-style arXiv reference
+ at 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},
+}
+
+ at 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},
+}
+
+ at 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},
+}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex 2016-07-05 21:39:30 UTC (rev 41635)
@@ -0,0 +1,136 @@
+\documentclass[%
+specialist, % тип документа
+subf, % использовать пакет subcaption для вложенной нумерации рисунков
+href, % использовать пакет hyperref для создания гиперссылок
+colorlinks, % цветные гиперссылки
+%times, % шрифт Times как основной
+%fixint, % включить прямые знаки интегралов
+]{disser}
+
+\usepackage[
+ a4paper, mag=1000,
+ left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
+]{geometry}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english,russian]{babel}
+\ifpdf\usepackage{epstopdf}\fi
+
+\usepackage[style=gost-numeric,
+ backend=biber,
+ language=auto,
+ hyperref=auto,
+ autolang=other,
+ sorting=none
+]{biblatex}
+
+\addbibresource{thesis.bib}
+
+% Номера страниц снизу и по центру
+%\pagestyle{footcenter}
+%\chapterpagestyle{footcenter}
+
+% Точка с запятой в качестве разделителя между номерами цитирований
+%\setcitestyle{semicolon}
+
+% Использовать полужирное начертание для векторов
+\let\vec=\mathbf
+
+% Включать подсекции в оглавление
+\setcounter{tocdepth}{2}
+
+\graphicspath{{fig/}}
+
+\begin{document}
+
+% Переопределение стандартных заголовков
+%\def\contentsname{Содержание}
+%\def\conclusionname{Выводы}
+%\def\bibname{Литература}
+
+%
+% Титульный лист на русском языке
+%
+
+% Название организации
+\institution{Название организации}
+
+% Имя лица, допускающего к защите (зав. кафедрой)
+\apname{д.\,ф.-м.\,н., профессор С.\,C.~Сидоров}
+
+\title{Дипломная работа}
+
+% Тема
+\topic{<<Тема работы>>}
+
+% Группа
+\group{Студента группы}
+% Автор
+\author{ФИО автора}
+
+% Научный руководитель
+\sa {И.\,И.~Иванов}
+\sastatus {д.\,ф.-м.\,н., профессор}
+
+% Рецензент
+\rev {П.\,П.~Петров}
+\revstatus{к.\,ф.-м.\,н., доцент}
+
+% Город и год
+\city{Санкт-Петербург}
+\date{\number\year}
+
+\maketitle
+
+%%
+%% Titlepage in English
+%%
+%
+%\setlength\thirdskip{0pt}
+%
+%\institution{Name of Organization}
+%
+%% Approved by
+%\apname{Professor S.\,S.~Sidorov}
+%
+%\title{Diploma Thesis}
+%
+%% Topic
+%\topic{Dummy Title}
+%
+%% Author
+%\author{Author's Name} % Full Name
+%\group{} % Study Group
+%
+%% Scientific Advisor
+%\sa {I.\,I.~Ivanov}
+%\sastatus {Professor}
+%
+%% Reviewer
+%\rev {P.\,P.~Petrov}
+%\revstatus{Associate Professor}
+%
+%% City & Year
+%\city{Saint Petersburg}
+%\date{\number\year}
+%
+%\maketitle[en]
+
+% Содержание
+\tableofcontents
+
+% Введение
+\input{intro}
+
+% Глава 1
+\input{1}
+% Глава 2
+%\input{2}
+
+% Заключение
+\input{concl}
+
+% Список литературы
+\printbibliography[heading=bibintoc]
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/disser/autoref.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/autoref.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/autoref.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -18,11 +18,11 @@
\if at titlepage\renewcommand\maketitle{
% \end{macrocode}
% \xC2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xE8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB \xEC\xE5\xE6\xE4\xF3 \xFD\xEB\xE5\xEC\xE5\xED\xF2\xE0\xEC\xE8 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xE3\xEE \xEB\xE8\xF1\xF2\xE0.
-% \DescribeMacro{\firstskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB !\verb*+\firstskip+}
-% \DescribeMacro{\secondskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB !\verb*+\secondskip+}
-% \DescribeMacro{\thirdskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB !\verb*+\thirdskip+}
-% \DescribeMacro{\fourthskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB !\verb*+\fourthskip+}
-% \DescribeMacro{\fifthskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB !\verb*+\fifthskip+}
+% \DescribeMacro{\firstskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\firstskip+}
+% \DescribeMacro{\secondskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\secondskip+}
+% \DescribeMacro{\thirdskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\thirdskip+}
+% \DescribeMacro{\fourthskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\fourthskip+}
+% \DescribeMacro{\fifthskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\fifthskip+}
% \begin{macrocode}
\ifundeflength\firstskip{1cm}
\ifundeflength\secondskip{3cm}
Modified: trunk/Master/texmf-dist/source/latex/disser/bachelor.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/bachelor.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/bachelor.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -4,7 +4,7 @@
%<*bachelor>
% \end{macrocode}
-% \subsubsection{\xD1\xF2\xE8\xEB\xFC \xE1\xE0\xEA\xE0\xEB\xE0\xE2\xF0\xF1\xEA\xEE\xE9 \xF0\xE0\xE1\xEE\xF2\xFB}
+% \subsubsection{\xD1\xF2\xE8\xEB\xFC \xF0\xE0\xE1\xEE\xF2\xFB \xE1\xE0\xEA\xE0\xEB\xE0\xE2\xF0\xE0}
%
% \xCD\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xFF.
% \begin{macrocode}
@@ -81,27 +81,29 @@
% \end{macrocode}
% \paragraph{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}
% \begin{macrocode}
-\begin{center}%
+\begin{center}
{\instfont\@institution}
\end{center}
% \end{macrocode}
-% \xC4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xE4\xEE\xEF\xF3\xF9\xE5\xED\xE0 \xEA \xE7\xE0\xF9\xE8\xF2\xE5
+% \xD0\xE0\xE1\xEE\xF2\xE0 \xE4\xEE\xEF\xF3\xF9\xE5\xED\xE0 \xEA \xE7\xE0\xF9\xE8\xF2\xE5
% \begin{macrocode}
\vskip\firstskip
{\@approved}
\vskip\secondskip
-
% \end{macrocode}
-% \xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA, \xF2\xE5\xEC\xE0.
+% \xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA
% \begin{macrocode}
-\begin{center}%
- {\titlefont\@title\par}%
- \vskip\thirdskip%
- {\topiclabelfont\topiclabel\ }%
+\begin{center}
+ {\titlefont\@title}
+ \vskip\thirdskip
+% \end{macrocode}
+% \xD2\xE5\xEC\xE0
+% \begin{macrocode}
+ {\topiclabelfont\topiclabel\ }
{\topicfont\@topic}
- \vskip\fourthskip\normalfont%
- \courselabel\ \@coursenum~--\ \@course%
+ \vskip\fourthskip\normalfont
+ {\courselabel\ \@coursenum~--\ \@course}
\end{center}
% \end{macrocode}
@@ -109,6 +111,10 @@
% \begin{macrocode}
\vskip\fifthskip
\begin{tabbing}
+% \end{macrocode}
+%
+% \xC2\xFB\xEF\xEE\xEB\xED\xE8\xEB \xF1\xF2\xF3\xE4\xE5\xED\xF2 \xE3\xF0. \xED\xEE\xEC\xE5\xF0...
+% \begin{macrocode}
\studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip]
% \end{macrocode}
% \xCD\xE0\xF3\xF7\xED\xFB\xE9 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC.
Modified: trunk/Master/texmf-dist/source/latex/disser/candidate.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/candidate.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/candidate.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -26,7 +26,7 @@
\def\sconname{Scientific Consultant}
\def\sconlabel{\sconname}
\def\sconsndname{\sconname}
- \def\sconsndlabel{\sconsndname}
+ \def\sconsndlabel{\sconname}
\def\topicname{Topic}
\def\asmanuscript{As Manuscript}
\fi
@@ -44,10 +44,10 @@
% \begin{macrocode}
\ifx\firstskip\undefined
\newlength\firstskip
- \ifDis at libcat
+ \ifx\@libcatnum\empty
+ \setlength\firstskip{4ex}
+ \else
\setlength\firstskip{2ex}
- \else
- \setlength\firstskip{4ex}
\fi
\fi
\ifundeflength\secondskip{2cm}
@@ -55,6 +55,7 @@
\ifundeflength\fourthskip{1cm}
\ifundeflength\fifthskip{1cm}
\ifundeflength\sixthskip{0cm}
+\ifundeflength\libcatskip{0cm}
\ifundeflength\specskip{-6pt}
\ifundeflength\saskip{0pt}
@@ -88,7 +89,7 @@
% \end{macrocode}
% \xCD\xE0 \xEF\xF0\xE0\xE2\xE0\xF5 \xF0\xF3\xEA\xEE\xEF\xE8\xF1\xE8
% \begin{macrocode}
- \asmanuscript%\\ %avoid no line to end error
+ \asmanuscript
% \end{macrocode}
% \xD4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5
% \begin{macrocode}
@@ -96,7 +97,10 @@
% \end{macrocode}
% \xCD\xEE\xEC\xE5\xF0 \xD3\xC4\xCA
% \begin{macrocode}
- \ifDis at libcat\libcatname\ \@libcatnum\fi
+ \ifx\@libcatnum\empty\else
+ \vskip\libcatskip
+ {\libcatname\ \@libcatnum}
+ \fi
\end{flushright}
\begin{center}
% \end{macrocode}
@@ -116,7 +120,7 @@
{\specfont\@specnum~--\ \@spec}
\ifx\@specsndnum\empty\else
\vskip\specskip
- {\specfont\@specsndnum~--\ \@specsnd}
+ {\specfont\@specsndnum~--\ \@specsnd}
\fi
% \end{macrocode}
% \xC4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xED\xE0 \xF1\xEE\xE8\xF1\xEA\xE0\xED\xE8\xE5 \xF3\xF7\xE5\xED\xEE\xE9 \xF1\xF2\xE5\xEF\xE5\xED\xE8...
Modified: trunk/Master/texmf-dist/source/latex/disser/counters.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/counters.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/counters.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -12,25 +12,25 @@
%
% \xCC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xFB\xE9 \xF3\xF0\xEE\xE2\xE5\xED\xFC \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xF1\xF2\xE8 \xF1\xE5\xEA\xF6\xE8\xE9, \xEF\xEE\xEC\xE5\xF9\xE0\xE5\xEC\xFB\xF5 \xE2 \xEE\xE3\xEB\xE0\xE2\xEB\xE5\xED\xE8\xE5
% (\xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE \xE2\xED\xEE\xF1\xFF\xF2\xF1\xFF |\part|, |\chapter| \xE8 |\section|).
-% \DescribeMacro{tocdepth}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+tocdepth+}
+% \DescribeCounter{tocdepth}
% \begin{macrocode}
\setcounter{tocdepth}{1}
% \end{macrocode}
% \xCC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xFB\xE9 \xF3\xF0\xEE\xE2\xE5\xED\xFC \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xF1\xF2\xE8 \xED\xF3\xEC\xE5\xF0\xF3\xE5\xEC\xFB\xF5 \xF1\xE5\xEA\xF6\xE8\xE9
% (\xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE \xED\xF3\xEC\xE5\xF0\xF3\xFE\xF2\xF1\xFF |\part|, |\chapter|, |\section| \xE8 |\subsection|).
-% \DescribeMacro{secnumdepth}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+secnumdepth+}
+% \DescribeCounter{secnumdepth}
% \begin{macrocode}
\setcounter{secnumdepth}{2}
% \end{macrocode}
%
-% \DescribeMacro{part}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+part+}
-% \DescribeMacro{chapter}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+chapter+}
-% \DescribeMacro{section}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+section+}
-% \DescribeMacro{subsection}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+subsection+}
-% \DescribeMacro{subsubsection}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+subsubsection+}
-% \DescribeMacro{paragraph}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+paragraph+}
-% \DescribeMacro{subparagraph}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+subparagraph+}
+% \DescribeCounter{part}
+% \DescribeCounter{chapter}
+% \DescribeCounter{section}
+% \DescribeCounter{subsection}
+% \DescribeCounter{subsubsection}
+% \DescribeCounter{paragraph}
+% \DescribeCounter{subparagraph}
% \begin{macrocode}
\newcounter{part}
\newcounter{chapter}
@@ -42,8 +42,8 @@
% \end{macrocode}
%
-% \DescribeMacro{figure}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+figure+}
-% \DescribeMacro{table}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+table+}
+% \DescribeCounter{figure}
+% \DescribeCounter{table}
% \begin{macrocode}
\newcounter{figure}[chapter]
\newcounter{table}[chapter]
@@ -84,14 +84,14 @@
% \DescribeMacro{\toctheparagraph}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\toctheparagraph+}
% \DescribeMacro{\tocthesubparagraph}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\tocthesubparagraph+}
% \begin{macrocode}
-\newcommand\tocthepart{\thepart}
-\newcommand\tocthechapter{\thechapter}
-\newcommand\toctheappendix{\theappendix}
-\newcommand\tocthesection{\thesection}
-\newcommand\tocthesubsection{\thesubsection}
-\newcommand\tocthesubsubsection{\thesubsubsection}
-\newcommand\toctheparagraph{\theparagraph}
-\newcommand\tocthesubparagraph{\thesubparagraph}
+\providecommand\tocthepart{\thepart}
+\providecommand\tocthechapter{\thechapter}
+\providecommand\toctheappendix{\theappendix}
+\providecommand\tocthesection{\thesection}
+\providecommand\tocthesubsection{\thesubsection}
+\providecommand\tocthesubsubsection{\thesubsubsection}
+\providecommand\toctheparagraph{\theparagraph}
+\providecommand\tocthesubparagraph{\thesubparagraph}
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/disser/custom.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/custom.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/custom.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -9,9 +9,9 @@
% \end{macrocode}
% \subsection{\xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0 \xF1\xF2\xEE\xF0\xEE\xED\xED\xE8\xF5 \xEF\xE0\xEA\xE5\xF2\xEE\xE2}
%
-% \DescribePackage{amsmath}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+amsmath+}
-% \DescribePackage{amssymb}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+amssymb+}
-% \DescribePackage{amsfonts}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+amsfonts+}
+% \DescribePackage{amsmath}
+% \DescribePackage{amssymb}
+% \DescribePackage{amsfonts}
% \begin{macrocode}
\ifDis at ams
\usepackage[intlimits]{amsmath}
@@ -38,26 +38,27 @@
\ifDis at mtpro
\AtBeginDocument{%
% \end{macrocode}
-% \DescribePackage{mtpro}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+mtpro+}
+% \DescribePackage{mtpro2}
% \begin{macrocode}
\IfFileExists{mtpro2.sty}{
\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
}{
+% \DescribePackage{mtpro}
\IfFileExists{mtpro.sty}{
\usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro}
}{
\PackageWarning{disser}%
- {Unable to find mtpro package. Font is unchanged.}
+ {Unable to find mtpro2 or mtpro package. Math font is unchanged.}
}
}
}
\else
% \end{macrocode}
-% \DescribePackage{txfonts}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+txfonts+}
+% \DescribePackage{newtxmath}
% \begin{macrocode}
\AtEndOfPackage{%
- \IfFileExists{txfonts.sty}{
- \usepackage{txfonts}
+ \IfFileExists{newtxmath.sty}{
+ \usepackage[varg,cmbraces,cmintegrals]{newtxmath}
}{
\PackageWarning{disser}%
{Unable to find txfonts package. Font is unchanged.}
@@ -67,7 +68,7 @@
\AtEndOfPackage{%
\IfFileExists{pscyr.sty}{
% \end{macrocode}
-% \DescribePackage{pscyr}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+pscyr+}
+% \DescribePackage{pscyr}
% \xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0 Times \xEA\xE0\xEA \xF8\xF0\xE8\xF4\xF2\xE0 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE, \xE2\xFB\xE1\xEE\xF0 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xEE\xE3\xEE \xEC\xEE\xED\xEE\xF8\xE8\xF0\xE8\xED\xED\xEE\xE3\xEE
% \xF8\xF0\xE8\xF4\xF2\xE0.
% \begin{macrocode}
@@ -77,7 +78,7 @@
}{
\IfFileExists{cyrtimes.sty}{
% \end{macrocode}
-% \DescribePackage{cyrtimes}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+cyrtimes+}
+% \DescribePackage{cyrtimes}
% \xC2\xEC\xE5\xF1\xF2\xEE \pkg{pscyr} \xEC\xEE\xE6\xE5\xF2 \xE1\xFB\xF2\xFC \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED \xEF\xE0\xEA\xE5\xF2 \pkg{cyrtimes}, \xE2\xF5\xEE\xE4\xFF\xF9\xE8\xE9 \xE2
% \xF1\xEE\xF1\xF2\xE0\xE2 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 \TeX Live.
% \begin{macrocode}
@@ -120,7 +121,7 @@
% \end{macrocode}
% \subsubsection{\xC1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xF1\xF1\xFB\xEB\xEA\xE8}
-% \DescribePackage{natbib}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+natbib+}
+% \DescribePackage{natbib}
% \begin{macrocode}
\ifDis at natbib
\usepackage[square,comma,sort&compress,numbers]{natbib}
@@ -130,13 +131,11 @@
% \DescribeMacro{\bibsection}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\bibsection+}
% \DescribeMacro{\bibpreamble}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\bibpreamble+}
% \DescribeMacro{\bibpostamble}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\bibpostamble+}
-% \DescribeMacro{\bibfont}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\bibfont+}
% \DescribeMacro{\bibsep}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\bibsep+}
% \begin{macrocode}
- \newcommand\bibsection{}
- \newcommand\bibpreamble{}
- \newcommand\bibpostamble{}
- \newcommand\bibfont{\normalfont\selectfont}
+ \providecommand*\bibsection{}
+ \providecommand*\bibpreamble{}
+ \providecommand*\bibpostamble{}
\newlength\bibsep
\fi
@@ -187,7 +186,7 @@
\renewenvironment{thebibliography}[1]{
\bibsection
\parindent\z@
- \bibpreamble\bibfont
+ \bibpreamble\normalfont\selectfont
\list{\@biblabel{\@arabic\c at enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
\setlength{\itemsep}{\bibsep}
\setlength{\parsep}{\bibsep}
@@ -212,8 +211,8 @@
%
% \xCF\xE0\xEA\xE5\xF2\xFB \pkg{caption} \xE8 \pkg{subcaption} \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xEF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xF5
% \xEE\xE1\xFA\xE5\xEA\xF2\xEE\xE2.
-% \DescribePackage{caption}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+caption+}
-% \DescribePackage{subcaption}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+subcaption+}
+% \DescribePackage{caption}
+% \DescribePackage{subcaption}
% \begin{macrocode}
\ifDis at subf
\usepackage[config,font=small,labelsep=period]{caption}
@@ -237,7 +236,7 @@
\ifpdf
\ifDis at href
% \end{macrocode}
-% \DescribePackage{hyperref}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+hyperref+}
+% \DescribePackage{hyperref}
% \begin{macrocode}
\usepackage[pdftex,unicode]{hyperref}
\hypersetup{
@@ -251,8 +250,8 @@
\pdfcompresslevel = 9
\fi
% \end{macrocode}
-% \DescribePackage{graphicx}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+graphicx+}
-% \DescribePackage{cmap}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+cmap+}
+% \DescribePackage{graphicx}
+% \DescribePackage{cmap}
% \begin{macrocode}
\usepackage[pdftex]{graphicx}
\usepackage{cmap}
@@ -259,12 +258,12 @@
\else
\ifDis at href
% \end{macrocode}
-% \DescribePackage{hyperref}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+hyperref+}
+% \DescribePackage{hyperref}
% \begin{macrocode}
\usepackage[hypertex,colorlinks=false]{hyperref}
\fi
% \end{macrocode}
-% \DescribePackage{graphicx}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+graphicx+}
+% \DescribePackage{graphicx}
% \begin{macrocode}
\usepackage{graphicx}
\fi
Modified: trunk/Master/texmf-dist/source/latex/disser/disser.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/disser.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/disser.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -19,7 +19,7 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{disser.drv}[2016/01/27 1.3.4 Document class for dissertations]
+\ProvidesFile{disser.drv}[2016/06/26 1.4.0 Document class for dissertations]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -49,16 +49,6 @@
menucolor = darkblue, urlcolor = darkblue
}
-\IfFileExists{pscyr.sty}{%
- \usepackage{pscyr}
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
-}{
- \IfFileExists{cyrtimes.sty}{%
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
- }{}
-}
\IfFileExists{url.sty}{\usepackage{url}}{\newcommand\url{\texttt}}
\usepackage[T2A]{fontenc}
@@ -82,8 +72,18 @@
\let\makelabel\deflabel}
}{\end{list}}
-\let\DescribePackage=\DescribeEnv
+\newcommand\DescribePackage[1]{%
+ \DescribeEnv{#1}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\texttt{#1}}
+}
+\newcommand\DescribeCounter[1]{%
+ \DescribeMacro{#1}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\texttt{#1}}
+}
+
+\newcommand\DescribeOption[1]{
+ \DescribeMacro{#1}\index{\xCE\xEF\xF6\xE8\xE8!\texttt{#1}}
+}
+
\makeatletter
\def\IndexParms{%
\parindent \z@
@@ -111,6 +111,7 @@
\makeindex
\GetFileInfo{disser.drv}
+
\begin{document}
\sloppy
\DocInput{disser.dtx}
@@ -182,13 +183,12 @@
%<*disser>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2015/07/25 1.3.2 %
- Document class for dissertations]
+\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations]
% \end{macrocode}
% \xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{kvoptions} \xE4\xEB\xFF \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xEE\xEF\xF6\xE8\xE9 \xE2 \xF4\xEE\xF0\xEC\xE0\xF2\xE5
% <<\xEA\xEB\xFE\xF7 = \xE7\xED\xE0\xF7\xE5\xED\xE8\xE5>>.
-% \DescribePackage{kvoptions}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+kvoptions+}
+% \DescribePackage{kvoptions}
% \begin{macrocode}
\RequirePackage{kvoptions}
@@ -196,12 +196,14 @@
% \xCE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xEE\xEF\xE5\xF0\xE0\xF2\xEE\xF0\xEE\xE2 \xF3\xF1\xEB\xEE\xE2\xED\xEE\xE3\xEE \xE2\xFB\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF:
% \begin{itemize}
% \item \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{ifpdf}, \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xFF\xFE\xF9\xE5\xE3\xEE \xEA\xEE\xEC\xE0\xED\xE4\xF3 |\ifpdf|.
-% \DescribePackage{ifpdf}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+ifpdf+}
+% \DescribePackage{ifpdf}
% \begin{macrocode}
\RequirePackage{ifpdf}
+% \end{macrocode}
% \item \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{ifthen} \xE4\xEB\xFF \xEF\xEE\xF1\xF2\xF0\xEE\xF7\xED\xFB\xF5 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE9.
-% \DescribePackage{ifthen}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+ifthen+}
+% \DescribePackage{ifthen}
+% \begin{macrocode}
\RequirePackage{ifthen}
% \end{macrocode}
@@ -267,6 +269,14 @@
% \begin{macrocode}
\newif\ifDis at natbib\Dis at natbibfalse
% \end{macrocode}
+% \item \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xF1\xF1\xFB\xEB\xEA\xE8 (\xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xEE).
+% \begin{macrocode}
+\newif\ifDis at colorlinks\Dis at colorlinksfalse
+% \end{macrocode}
+% \item \xC8\xF1\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE7\xED\xE0\xEA\xEE\xE2 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xED\xE0 \xE1\xEE\xEB\xE5\xE5 \xEF\xF0\xE8\xE2\xFB\xF7\xED\xFB\xE5 (\xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xEE).
+% \begin{macrocode}
+\newif\ifDis at fixint\Dis at fixintfalse
+% \end{macrocode}
% \end{itemize}
%
% \subsection{\xCE\xEF\xF6\xE8\xE8 \xEA\xEB\xE0\xF1\xF1\xE0}
@@ -299,6 +309,14 @@
% \begin{macrocode}
\DeclareOption{natbib}{\Dis at natbibtrue}
% \end{macrocode}
+% \xC8\xF1\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE7\xED\xE0\xEA\xEE\xE2 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xED\xE0 \xE1\xEE\xEB\xE5\xE5 \xEF\xF0\xE8\xE2\xFB\xF7\xED\xFB\xE5.
+% \begin{macrocode}
+\DeclareOption{fixint}{\Dis at fixinttrue}
+% \end{macrocode}
+% \xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xF6\xE2\xE5\xF2\xED\xFB\xF5 \xF1\xF1\xFB\xEB\xEE\xEA.
+% \begin{macrocode}
+\DeclareOption{colorlinks}{\Dis at colorlinkstrue}
+% \end{macrocode}
% \xD0\xE0\xE7\xEC\xE5\xF0\xFB \xEB\xE8\xF1\xF2\xEE\xE2.
% \begin{macrocode}
\DeclareOption{a4paper}{%
@@ -386,8 +404,8 @@
% \begin{macrocode}
\DeclareOption{mtpro}{\Dis at mtprotrue}
% \end{macrocode}
-% \xC5\xF1\xEB\xE8 \xF3\xEA\xE0\xE7\xE0\xED\xE0 \xFD\xF2\xE0 \xEE\xEF\xF6\xE8\xFF, \xF2\xEE \xE1\xEB\xEE\xEA\xE8 \xF2\xE5\xEA\xF1\xF2\xE0 \xE2 \xF1\xEF\xE8\xF1\xEA\xE5 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xE1\xF3\xE4\xF3\xF2
-% \xEF\xE5\xF7\xE0\xF2\xE0\xF2\xFC\xF1\xFF \xED\xE0 \xED\xEE\xE2\xFB\xF5 \xF1\xF2\xF0\xEE\xEA\xE0\xF5 \xE8 \xF1 \xEE\xF2\xF1\xF2\xF3\xEF\xEE\xEC.
+% \xC5\xF1\xEB\xE8 \xF3\xEA\xE0\xE7\xE0\xED\xE0 \xFD\xF2\xE0 \xEE\xEF\xF6\xE8\xFF, \xF2\xEE \xE1\xEB\xEE\xEA\xE8 \xF2\xE5\xEA\xF1\xF2\xE0 \xE2 \xF1\xEF\xE8\xF1\xEA\xE5 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xE1\xF3\xE4\xF3\xF2 \xEF\xE5\xF7\xE0\xF2\xE0\xF2\xFC\xF1\xFF
+% \xED\xE0 \xED\xEE\xE2\xFB\xF5 \xF1\xF2\xF0\xEE\xEA\xE0\xF5 \xE8 \xF1 \xEE\xF2\xF1\xF2\xF3\xEF\xEE\xEC.
% \begin{macrocode}
\DeclareOption{openbib}{%
\AtEndOfPackage{%
@@ -450,20 +468,14 @@
\Dis at autoreftrue
}
+% \end{macrocode}
+% \xCE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE0 \xEE\xEF\xF6\xE8\xE9 \xE2 \xF4\xEE\xF0\xEC\xE0\xF2\xE5 <<\xEA\xEB\xFE\xF7-\xE7\xED\xE0\xF7\xE5\xED\xE8\xE5>>.
+% \begin{macrocode}
\SetupKeyvalOptions{
family=Dis,
prefix=Dis@
}
-% \end{macrocode}
-% \xC8\xF1\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xE5 \xE7\xED\xE0\xEA\xEE\xE2 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xE8 \xEF\xF0\xE5\xE4\xE5\xEB\xEE\xE2 \xE8\xED\xF2\xE5\xE3\xF0\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xED\xE0 \xE1\xEE\xEB\xE5\xE5
-% \xEF\xF0\xE8\xE2\xFB\xF7\xED\xFB\xE5.
-% \begin{macrocode}
-\DeclareBoolOption[true]{fixint}
-% \end{macrocode}
-% \xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xF6\xE2\xE5\xF2\xED\xFB\xF5 \xF1\xF1\xFB\xEB\xEE\xEA.
-% \begin{macrocode}
-\DeclareBoolOption[false]{colorlinks}
\DeclareStringOption{substylefile}
% \end{macrocode}
@@ -494,9 +506,9 @@
\AtEndOfClass{\input{\Dis at substylefile}}
% \end{macrocode}
-% \xCE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xEA\xEE\xEC\xE0\xED\xE4 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE0 |\MakeTextUppercase|
-% \xE8 |\MakeTextLowercase|.
-% \DescribeMacro{textcase}\index{\xCF\xE0\xEA\xE5\xF2\xFB!\verb*+textcase+}
+% \xCE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xEA\xEE\xEC\xE0\xED\xE4 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE0 |\MakeTextUppercase| \xE8
+% |\MakeTextLowercase|.
+% \DescribePackage{textcase}
% \begin{macrocode}
\RequirePackage[overload]{textcase}
@@ -591,7 +603,7 @@
% \end{macrocode}
% \xCA\xEE\xEC\xE0\xED\xE4\xE0, \xEE\xE1\xFA\xE5\xE4\xE8\xED\xFF\xFE\xF9\xE0\xFF |\newlength| \xE8 |\setlength|.
-% \DescribeMacro{\Dis at deflength}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis at deflength+}
+% \DescribeMacro{\Dis at deflength}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis"@deflength+}
% \begin{macrocode}
\providecommand\Dis at deflength[2]{\newlength{#1}\setlength{#1}{#2}}
\providecommand\ifundeflength[2]{%
@@ -612,9 +624,9 @@
\setlength\normallineskip{1\p@}
% \end{macrocode}
-% \DescribeMacro{\Dis at singlespacing} \index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis at singlespacing+}
-% \DescribeMacro{\Dis at onehalfspacing}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis at onehalfspacing+}
-% \DescribeMacro{\Dis at doublespacing} \index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis at doublespacing+}
+% \DescribeMacro{\Dis at singlespacing} \index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis"@singlespacing+}
+% \DescribeMacro{\Dis at onehalfspacing}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis"@onehalfspacing+}
+% \DescribeMacro{\Dis at doublespacing} \index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Dis"@doublespacing+}
% \xD5\xE0\xF0\xE0\xEA\xF2\xE5\xF0\xED\xFB\xE5 \xE2\xE5\xEB\xE8\xF7\xE8\xED\xFB \xEC\xE5\xE6\xF1\xF2\xF0\xEE\xF7\xED\xE0\xF5 \xE8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xEE\xE2.
% \begin{macrocode}
\newcommand\Dis at singlespacing {\renewcommand\baselinestretch{1}\normalsize}
Modified: trunk/Master/texmf-dist/source/latex/disser/doctor.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/doctor.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/doctor.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -39,10 +39,10 @@
% \begin{macrocode}
\ifx\firstskip\undefined
\newlength\firstskip
- \ifDis at libcat
- \setlength\firstskip{1ex}
+ \ifx\@libcatnum\empty
+ \setlength\firstskip{4ex}
\else
- \setlength\firstskip{4ex}
+ \setlength\firstskip{2ex}
\fi
\fi
\ifundeflength\secondskip{3cm}
@@ -50,6 +50,7 @@
\ifundeflength\fourthskip{1cm}
\ifundeflength\fifthskip{1cm}
\ifundeflength\sixthskip{0cm}
+\ifundeflength\libcatskip{0cm}
\ifundeflength\specskip{-6pt}
% \end{macrocode}
@@ -82,7 +83,7 @@
% \end{macrocode}
% \xCD\xE0 \xEF\xF0\xE0\xE2\xE0\xF5 \xF0\xF3\xEA\xEE\xEF\xE8\xF1\xE8
% \begin{macrocode}
- \asmanuscript\\
+ \asmanuscript
% \end{macrocode}
% \xD4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5
% \begin{macrocode}
@@ -90,7 +91,10 @@
% \end{macrocode}
% \xCD\xEE\xEC\xE5\xF0 \xD3\xC4\xCA
% \begin{macrocode}
- \ifDis at libcat\libcatname\ \@libcatnum\fi
+ \ifx\@libcatnum\empty\else
+ \vskip\libcatskip
+ {\libcatname\ \@libcatnum}
+ \fi
\end{flushright}
\begin{center}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/disser/floats.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/floats.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/floats.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -14,19 +14,19 @@
% \begin{itemize}
% \item \xCC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xEE \xEF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xF5 \xEE\xE1\xFA\xE5\xEA\xF2\xEE\xE2, \xF0\xE0\xE7\xEC\xE5\xF9\xE0\xE5\xEC\xEE\xE5 \xE2\xE2\xE5\xF0\xF5\xF3
% \xF1\xF2\xF0\xE0\xED\xE8\xF6\xFB (\xEF\xF0\xE8 \xE4\xE2\xF3\xF5\xEA\xEE\xEB\xEE\xED\xED\xEE\xEC \xED\xE0\xE1\xEE\xF0\xE5 --- \xE2\xE2\xE5\xF0\xF5\xF3 \xEA\xEE\xEB\xEE\xED\xEA\xE8).
-% \DescribeMacro{topnumber}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+topnumber+}
+% \DescribeCounter{topnumber}
% \begin{macrocode}
\setcounter{topnumber}{2}
% \end{macrocode}
% \item \xCC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xEE \xEF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xF5 \xEE\xE1\xFA\xE5\xEA\xF2\xEE\xE2, \xF0\xE0\xE7\xEC\xE5\xF9\xE0\xE5\xEC\xEE\xE5 \xE2\xED\xE8\xE7\xF3
% \xF1\xF2\xF0\xE0\xED\xE8\xF6\xFB (\xEF\xF0\xE8 \xE4\xE2\xF3\xF5\xEA\xEE\xEB\xEE\xED\xED\xEE\xEC \xED\xE0\xE1\xEE\xF0\xE5 --- \xE2\xED\xE8\xE7\xF3 \xEA\xEE\xEB\xEE\xED\xEA\xE8).
-% \DescribeMacro{bottomnumber}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+bottomnumber+}
+% \DescribeCounter{bottomnumber}
% \begin{macrocode}
\setcounter{bottomnumber}{1}
% \end{macrocode}
% \item \xCC\xE0\xEA\xF1\xE8\xEC\xE0\xEB\xFC\xED\xEE\xE5 \xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xEE \xEF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xF5 \xEE\xE1\xFA\xE5\xEA\xF2\xEE\xE2, \xF0\xE0\xE7\xEC\xE5\xF9\xE0\xE5\xEC\xEE\xE5
% \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE5 (\xEF\xF0\xE8 \xE4\xE2\xF3\xF5\xEA\xEE\xEB\xEE\xED\xED\xEE\xEC \xED\xE0\xE1\xEE\xF0\xE5 --- \xE2 \xEA\xEE\xEB\xEE\xED\xEA\xE5).
-% \DescribeMacro{totalnumber}\index{\xD1\xF7\xE5\xF2\xF7\xE8\xEA\xE8!\verb*+totalnumber+}
+% \DescribeCounter{totalnumber}
% \begin{macrocode}
\setcounter{totalnumber}{3}
% \end{macrocode}
@@ -83,12 +83,12 @@
%
% \subsubsection{\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xEF\xEE\xE4\xEF\xE8\xF1\xE5\xE9}
%
-% \DescribeMacro{\abovecaptionskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\abovecaptionskip+}
+% \DescribeMacro{\abovecaptionskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\abovecaptionskip+}
% \xC2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE9 \xE8\xED\xF2\xE5\xF0\xE2\xE0\xEB \xEF\xE5\xF0\xE5\xE4 \xEF\xEE\xE4\xEF\xE8\xF1\xFC\xFE.
% \begin{macrocode}
\Dis at deflength\abovecaptionskip{10\p@}
% \end{macrocode}
-% \DescribeMacro{\belowcaptionskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\belowcaptionskip+}
+% \DescribeMacro{\belowcaptionskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\belowcaptionskip+}
% \xC2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE9 \xE8\xED\xF2\xE5\xF0\xE2\xE0\xEB \xE7\xE0 \xEF\xEE\xE4\xEF\xE8\xF1\xFC\xFE.
% \begin{macrocode}
\Dis at deflength\belowcaptionskip{0\p@}
Modified: trunk/Master/texmf-dist/source/latex/disser/gost705.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/gost705.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/gost705.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% This bibliography style attempts to format bibliography according to
-% GOST R 7.0.5-2008 with some conventional modifications.
+% GOST R 7.0.5-2008 with some modifications.
%
% Based on style gost71u.bst by Maksym Polyakov.
%
@@ -16,8 +16,7 @@
%
% bibtex8 -H -c <encoding>.csf <your_document>
%
-% Copyright (C) 2004-2014 by
-% Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+% Copyright (C) Stanislav Kruchinin
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -155,7 +154,7 @@
%</ignore>
%<*driver>
\ProvidesFile{gost705.drv}%
- [2013/12/25 1.3.0 Bibliography style for GOST R 7.0.5-2008]
+ [2016/06/18 1.4.0 Bibliography style for GOST R 7.0.5-2008]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -183,18 +182,6 @@
menucolor = darkblue, urlcolor = darkblue
}
-\IfFileExists{pscyr.sty}{%
- \usepackage{pscyr}
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
-}{
- \IfFileExists{cyrtimes.sty}{%
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
- }{}
-}
-\IfFileExists{url.sty}{\RequirePackage{url}}{\newcommand\url{\texttt}}
-
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
@@ -205,12 +192,9 @@
\def\pkg#1{\textsf{#1}}
\def\cmd#1{\texttt{#1}}
-\newcommand\DescribeBSTFunction[1]{
- \DescribeMacro{#1}\index{\xD4\xF3\xED\xEA\xF6\xE8\xE8!\texttt{#1}}
+\newcommand\DescribeFunction[1]{
+ \DescribeMacro{#1}\index{\texttt{#1}}
}
-\newcommand\DescribeBSTMacro[1]{
- \DescribeMacro{#1}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\texttt{#1}}
-}
\makeatletter
\def\IndexParms{%
@@ -328,10 +312,10 @@
% \subsection{\xCE\xE1\xFA\xFF\xE2\xEB\xE5\xED\xE8\xE5 \xE8 \xE8\xED\xE8\xF6\xE8\xE0\xEB\xE8\xE7\xE0\xF6\xE8\xFF \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xFB\xF5 \xE8 \xEA\xEE\xED\xF1\xF2\xE0\xED\xF2}
% \begin{macrocode}
INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.colon after.semicolon after.dash }
+after.dblslash after.slash after.colon after.semicolon }
% \end{macrocode}
-% \DescribeBSTFunction{init.state.consts}
+% \DescribeFunction{init.state.consts}
% \begin{macrocode}
FUNCTION {init.state.consts}
{
@@ -343,7 +327,6 @@
#5 'after.slash :=
#6 'after.colon :=
#7 'after.semicolon :=
- #8 'after.dash :=
}
STRINGS { s t }
@@ -352,7 +335,7 @@
% \end{macrocode}
% \subsection{\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xFF\xE7\xFB\xEA\xE0}
-% \DescribeBSTFunction{change.language}
+% \DescribeFunction{change.language}
% \begin{macrocode}
FUNCTION {change.language}
{
@@ -368,7 +351,7 @@
% \end{macrocode}
% \subsection{\xC2\xFB\xE2\xEE\xE4 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE9 \xE7\xE0\xEF\xE8\xF1\xE8}
-% \DescribeBSTFunction{output.nonnull}
+% \DescribeFunction{output.nonnull}
% \begin{macrocode}
FUNCTION {output.nonnull}
{
@@ -376,7 +359,8 @@
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
- { add.period$ " " * write$
+ { add.period$ write$
+ " \BibDash " write$
newline$
"\newblock " write$
}
@@ -390,11 +374,7 @@
{ ": " * write$ }
{ output.state after.semicolon =
{ "; " * write$ }
- { output.state after.dash =
- { "~--- " * write$ }
- { add.period$ " " * write$ }
- if$
- }
+ { add.period$ " " * write$ }
if$
}
if$
@@ -412,7 +392,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{output}
+% \DescribeFunction{output}
% \begin{macrocode}
FUNCTION {output}
{
@@ -423,7 +403,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{output.check}
+% \DescribeFunction{output.check}
% \begin{macrocode}
FUNCTION {output.check}
{
@@ -436,7 +416,7 @@
% \end{macrocode}
% \subsection{\xC2\xFB\xE2\xEE\xE4 \xE1\xEB\xEE\xEA\xEE\xE2 \xE8 \xEE\xE3\xF0\xE0\xED\xE8\xF7\xE8\xF2\xE5\xEB\xE5\xE9}
-% \DescribeBSTFunction{fin.entry}
+% \DescribeFunction{fin.entry}
% \begin{macrocode}
FUNCTION {fin.entry}
{
@@ -446,7 +426,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.block}
+% \DescribeFunction{new.block}
% \begin{macrocode}
FUNCTION {new.block}
{
@@ -457,7 +437,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.dblslash}
+% \DescribeFunction{new.dblslash}
% \begin{macrocode}
FUNCTION {new.dblslash}
{
@@ -468,7 +448,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.slash}
+% \DescribeFunction{new.slash}
% \begin{macrocode}
FUNCTION {new.slash}
{
@@ -479,7 +459,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.colon}
+% \DescribeFunction{new.colon}
% \begin{macrocode}
FUNCTION {new.colon}
{
@@ -490,7 +470,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.semicolon}
+% \DescribeFunction{new.semicolon}
% \begin{macrocode}
FUNCTION {new.semicolon}
{
@@ -501,19 +481,8 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.dash}
+% \DescribeFunction{new.sentence}
% \begin{macrocode}
-FUNCTION {new.dash}
-{
- output.state before.all =
- 'skip$
- { after.dash 'output.state := }
- if$
-}
-
-% \end{macrocode}
-% \DescribeBSTFunction{new.sentence}
-% \begin{macrocode}
FUNCTION {new.sentence}
{
output.state after.block =
@@ -527,12 +496,12 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{add.blank}
+% \DescribeFunction{add.blank}
% \begin{macrocode}
FUNCTION {add.blank} { " " * before.all 'output.state := }
% \end{macrocode}
-% \DescribeBSTFunction{not}
+% \DescribeFunction{not}
% \begin{macrocode}
FUNCTION {not}
{
@@ -542,7 +511,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{and}
+% \DescribeFunction{and}
% \begin{macrocode}
FUNCTION {and}
{
@@ -552,7 +521,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{or}
+% \DescribeFunction{or}
% \begin{macrocode}
FUNCTION {or}
{
@@ -562,7 +531,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{non.stop}
+% \DescribeFunction{non.stop}
% \begin{macrocode}
FUNCTION {non.stop}
{
@@ -572,7 +541,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.block.checka}
+% \DescribeFunction{new.block.checka}
% \begin{macrocode}
FUNCTION {new.block.checka}
{
@@ -583,7 +552,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.block.checkb}
+% \DescribeFunction{new.block.checkb}
% \begin{macrocode}
FUNCTION {new.block.checkb}
{
@@ -596,7 +565,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.sentence.checka}
+% \DescribeFunction{new.sentence.checka}
% \begin{macrocode}
FUNCTION {new.sentence.checka}
{
@@ -607,7 +576,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{new.sentence.checkb}
+% \DescribeFunction{new.sentence.checkb}
% \begin{macrocode}
FUNCTION {new.sentence.checkb}
{
@@ -620,7 +589,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{field.or.null}
+% \DescribeFunction{field.or.null}
% \begin{macrocode}
FUNCTION {field.or.null}
{
@@ -631,7 +600,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{emphasize}
+% \DescribeFunction{emphasize}
% \begin{macrocode}
FUNCTION {emphasize}
{
@@ -642,7 +611,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{space.word}
+% \DescribeFunction{space.word}
% \begin{macrocode}
FUNCTION {space.word} { " " swap$ * " " * }
@@ -667,7 +636,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.cmplr}
+% \DescribeFunction{bbl.cmplr}
% \begin{macrocode}
FUNCTION {bbl.cmplr}
{
@@ -686,7 +655,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.edition}
+% \DescribeFunction{bbl.edition}
% \begin{macrocode}
FUNCTION {bbl.edition} % { "\bbledition{}" }
{
@@ -705,7 +674,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.vvolume}
+% \DescribeFunction{bbl.vvolume}
% \begin{macrocode}
FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
{
@@ -724,7 +693,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.vvol}
+% \DescribeFunction{bbl.vvol}
% \begin{macrocode}
FUNCTION {bbl.vvol} % { "\bblVol{}" }
{
@@ -743,7 +712,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.iissue}
+% \DescribeFunction{bbl.iissue}
% \begin{macrocode}
FUNCTION {bbl.iissue} % { "\bblIssue{}" }
{
@@ -762,7 +731,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.iiss}
+% \DescribeFunction{bbl.iiss}
% \begin{macrocode}
FUNCTION {bbl.iiss} % { "\bblIss{}" }
{
@@ -781,7 +750,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.of}
+% \DescribeFunction{bbl.of}
% \begin{macrocode}
FUNCTION {bbl.of} % { "\bblof{}" }
{
@@ -800,7 +769,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.etal}
+% \DescribeFunction{bbl.etal}
% \begin{macrocode}
FUNCTION {bbl.etal} % { "\bblof{}" }
{
@@ -819,7 +788,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.nnumber}
+% \DescribeFunction{bbl.nnumber}
% \begin{macrocode}
FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
{
@@ -838,7 +807,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.number}
+% \DescribeFunction{bbl.number}
% \begin{macrocode}
FUNCTION {bbl.number} % { "\bblnumber{}" }
{
@@ -857,7 +826,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.nr}
+% \DescribeFunction{bbl.nr}
% \begin{macrocode}
FUNCTION {bbl.nr} % { "\bblno{}" }
{
@@ -876,7 +845,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.nnr}
+% \DescribeFunction{bbl.nnr}
% \begin{macrocode}
FUNCTION {bbl.nnr} % { "\bblno{}" }
{
@@ -895,7 +864,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.in}
+% \DescribeFunction{bbl.in}
% \begin{macrocode}
FUNCTION {bbl.in} % { "\bblin{}" }
{
@@ -914,7 +883,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.iin}
+% \DescribeFunction{bbl.iin}
% \begin{macrocode}
FUNCTION {bbl.iin} % { "\bblIn{}" }
{
@@ -933,7 +902,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.pages}
+% \DescribeFunction{bbl.pages}
% \begin{macrocode}
FUNCTION {bbl.pages} % { "\bblpp." }
{
@@ -952,7 +921,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.page}
+% \DescribeFunction{bbl.page}
% \begin{macrocode}
FUNCTION {bbl.page} % { "\bblp." }
{
@@ -971,7 +940,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.ppages}
+% \DescribeFunction{bbl.ppages}
% \begin{macrocode}
FUNCTION {bbl.ppages} % { "\bblPp." }
{
@@ -990,7 +959,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.ppage}
+% \DescribeFunction{bbl.ppage}
% \begin{macrocode}
FUNCTION {bbl.ppage} % { "\bblP." }
{
@@ -1009,7 +978,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.techrep}
+% \DescribeFunction{bbl.techrep}
% \begin{macrocode}
FUNCTION {bbl.techrep}
{
@@ -1028,7 +997,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.mthesis}
+% \DescribeFunction{bbl.mthesis}
% \begin{macrocode}
FUNCTION {bbl.mthesis}
{
@@ -1048,7 +1017,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.phdthesis}
+% \DescribeFunction{bbl.phdthesis}
% \begin{macrocode}
FUNCTION {bbl.phdthesis}
{
@@ -1068,9 +1037,9 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.docdisser}
+% \DescribeFunction{bbl.dscithesis}
% \begin{macrocode}
-FUNCTION {bbl.docdisser}
+FUNCTION {bbl.dscithesis}
{
curlanguage "english" =
{ "Dr.\,Sci. dissertation" }
@@ -1088,7 +1057,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.req}
+% \DescribeFunction{bbl.req}
% \begin{macrocode}
FUNCTION {bbl.req}
{
@@ -1107,7 +1076,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.publ}
+% \DescribeFunction{bbl.publ}
% \begin{macrocode}
FUNCTION {bbl.publ}
{
@@ -1126,7 +1095,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bbl.prio}
+% \DescribeFunction{bbl.prio}
% \begin{macrocode}
FUNCTION {bbl.prio}
{
@@ -1150,7 +1119,7 @@
INTEGERS { nameptr namesleft numnames }
% \end{macrocode}
-% \DescribeBSTFunction{format.names}
+% \DescribeFunction{format.names}
% \begin{macrocode}
FUNCTION {format.names}
{
@@ -1188,7 +1157,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.names.rev}
+% \DescribeFunction{format.names.rev}
% \begin{macrocode}
FUNCTION {format.names.rev}
{
@@ -1226,7 +1195,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.authors}
+% \DescribeFunction{format.authors}
% \begin{macrocode}
FUNCTION {format.authors}
{
@@ -1237,7 +1206,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.bookauthors}
+% \DescribeFunction{format.bookauthors}
% \begin{macrocode}
FUNCTION {format.bookauthors}
{
@@ -1248,7 +1217,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.authors.after}
+% \DescribeFunction{format.authors.after}
% \begin{macrocode}
FUNCTION {format.authors.after}
{
@@ -1259,7 +1228,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.bookauthors.after}
+% \DescribeFunction{format.bookauthors.after}
% \begin{macrocode}
FUNCTION {format.bookauthors.after}
{
@@ -1270,7 +1239,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.editors.after}
+% \DescribeFunction{format.editors.after}
% \begin{macrocode}
FUNCTION {format.editors.after}
{
@@ -1281,7 +1250,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.compiler.after}
+% \DescribeFunction{format.compiler.after}
% \begin{macrocode}
FUNCTION {format.compiler.after}
{
@@ -1292,7 +1261,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.title}
+% \DescribeFunction{format.title}
% \begin{macrocode}
FUNCTION {format.title}
{
@@ -1303,7 +1272,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.date}
+% \DescribeFunction{format.date}
% \begin{macrocode}
FUNCTION {format.date}
{
@@ -1322,7 +1291,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{output.address.publisher.date}
+% \DescribeFunction{output.address.publisher.date}
% \begin{macrocode}
FUNCTION {output.address.publisher.date}
{
@@ -1340,7 +1309,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{output.bibitem}
+% \DescribeFunction{output.bibitem}
% \begin{macrocode}
FUNCTION {output.bibitem}
{
@@ -1361,7 +1330,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{n.dashify}
+% \DescribeFunction{n.dashify}
% \begin{macrocode}
FUNCTION {n.dashify}
{
@@ -1390,17 +1359,17 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{word.in}
+% \DescribeFunction{word.in}
% \begin{macrocode}
FUNCTION {word.in} { bbl.iin " " * }
% \end{macrocode}
-% \DescribeBSTFunction{format.btitle}
+% \DescribeFunction{format.btitle}
% \begin{macrocode}
FUNCTION {format.btitle} { title }
% \end{macrocode}
-% \DescribeBSTFunction{tie.or.space.connect}
+% \DescribeFunction{tie.or.space.connect}
% \begin{macrocode}
FUNCTION {tie.or.space.connect}
{
@@ -1412,12 +1381,12 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{tie.connect}
+% \DescribeFunction{tie.connect}
% \begin{macrocode}
FUNCTION {tie.connect} { "~" swap$ * * }
% \end{macrocode}
-% \DescribeBSTFunction{either.or.check}
+% \DescribeFunction{either.or.check}
% \begin{macrocode}
FUNCTION {either.or.check}
{
@@ -1428,7 +1397,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.bvolume}
+% \DescribeFunction{format.bvolume}
% \begin{macrocode}
FUNCTION {format.bvolume}
{
@@ -1445,7 +1414,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.number.series}
+% \DescribeFunction{format.number.series}
% \begin{macrocode}
FUNCTION {format.number.series}
{
@@ -1471,7 +1440,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{is.num}
+% \DescribeFunction{is.num}
% \begin{macrocode}
FUNCTION {is.num}
{
@@ -1481,7 +1450,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{extract.num}
+% \DescribeFunction{extract.num}
% \begin{macrocode}
FUNCTION {extract.num}
{
@@ -1503,12 +1472,12 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{convert.edition}
+% \DescribeFunction{convert.edition}
% \begin{macrocode}
FUNCTION {convert.edition} { edition }
% \end{macrocode}
-% \DescribeBSTFunction{format.edition}
+% \DescribeFunction{format.edition}
% \begin{macrocode}
FUNCTION {format.edition}
{
@@ -1525,7 +1494,7 @@
INTEGERS { multiresult }
% \end{macrocode}
-% \DescribeBSTFunction{multi.page.check}
+% \DescribeFunction{multi.page.check}
% \begin{macrocode}
FUNCTION {multi.page.check}
{
@@ -1549,7 +1518,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.pages}
+% \DescribeFunction{format.pages}
% \begin{macrocode}
FUNCTION {format.pages}
{
@@ -1564,7 +1533,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.pages.page}
+% \DescribeFunction{format.pages.page}
% \begin{macrocode}
FUNCTION {format.pages.page}
{
@@ -1579,7 +1548,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.vol.num.pages}
+% \DescribeFunction{format.vol.num.pages}
% \begin{macrocode}
FUNCTION {format.vol.num.pages}
{
@@ -1604,7 +1573,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.volume}
+% \DescribeFunction{format.volume}
% \begin{macrocode}
FUNCTION {format.volume}
{
@@ -1615,7 +1584,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.number}
+% \DescribeFunction{format.number}
% \begin{macrocode}
FUNCTION {format.number}
{ number empty$
@@ -1625,7 +1594,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{empty.misc.check}
+% \DescribeFunction{empty.misc.check}
% \begin{macrocode}
FUNCTION {empty.misc.check}
{
@@ -1639,7 +1608,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.thesis.type}
+% \DescribeFunction{format.thesis.type}
% \begin{macrocode}
FUNCTION {format.thesis.type}
{
@@ -1652,7 +1621,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.tr.number}
+% \DescribeFunction{format.tr.number}
% \begin{macrocode}
FUNCTION {format.tr.number}
{
@@ -1667,7 +1636,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{author.before}
+% \DescribeFunction{author.before}
% \begin{macrocode}
FUNCTION {author.before}
{
@@ -1680,7 +1649,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bookauthor.before}
+% \DescribeFunction{bookauthor.before}
% \begin{macrocode}
FUNCTION {bookauthor.before}
{
@@ -1693,7 +1662,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{author.after}
+% \DescribeFunction{author.after}
% \begin{macrocode}
FUNCTION {author.after}
{
@@ -1710,7 +1679,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{bookauthor.after}
+% \DescribeFunction{bookauthor.after}
% \begin{macrocode}
FUNCTION {bookauthor.after}
{
@@ -1727,7 +1696,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{editor.organization.after}
+% \DescribeFunction{editor.organization.after}
% \begin{macrocode}
FUNCTION {editor.organization.after}
{
@@ -1752,7 +1721,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.annote}
+% \DescribeFunction{format.annote}
% \begin{macrocode}
FUNCTION {format.annote}
{
@@ -1766,7 +1735,7 @@
% \end{macrocode}
% \subsection{\xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA}
-% \DescribeBSTFunction{format.url}
+% \DescribeFunction{format.url}
% \begin{macrocode}
FUNCTION {format.url}
{
@@ -1777,7 +1746,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.urldate}
+% \DescribeFunction{format.urldate}
% \begin{macrocode}
FUNCTION {format.urldate}
{
@@ -1790,7 +1759,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{output.url}
+% \DescribeFunction{output.url}
% \begin{macrocode}
FUNCTION {output.url}
{
@@ -1803,7 +1772,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.isbn}
+% \DescribeFunction{format.isbn}
% \begin{macrocode}
FUNCTION {format.isbn}
{
@@ -1816,7 +1785,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{add.doi.url}
+% \DescribeFunction{add.doi.url}
% \begin{macrocode}
FUNCTION {add.doi.url}
{ duplicate$ empty$
@@ -1834,7 +1803,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.eprint}
+% \DescribeFunction{format.eprint}
% \begin{macrocode}
FUNCTION {format.eprint}
{ eprint empty$
@@ -1858,7 +1827,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{add.number}
+% \DescribeFunction{add.number}
% \begin{macrocode}
FUNCTION {add.number}
{ duplicate$ empty$
@@ -1868,7 +1837,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{in.square.brackets}
+% \DescribeFunction{in.square.brackets}
% \begin{macrocode}
FUNCTION {in.square.brackets}
{
@@ -1879,7 +1848,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{in.round.brackets}
+% \DescribeFunction{in.round.brackets}
% \begin{macrocode}
FUNCTION {in.round.brackets}
{
@@ -1890,7 +1859,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.type.number}
+% \DescribeFunction{format.type.number}
% \begin{macrocode}
FUNCTION {format.type.number}
{
@@ -1906,7 +1875,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.reqdate}
+% \DescribeFunction{format.reqdate}
% \begin{macrocode}
FUNCTION {format.reqdate}
{ reqdate empty$
@@ -1916,7 +1885,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.pubdate}
+% \DescribeFunction{format.pubdate}
% \begin{macrocode}
FUNCTION {format.pubdate}
{ pubdate empty$
@@ -1926,7 +1895,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{format.prdate}
+% \DescribeFunction{format.prdate}
% \begin{macrocode}
FUNCTION {format.prdate}
{ prdate empty$
@@ -1937,7 +1906,7 @@
% \end{macrocode}
% \subsection{\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xF2\xE8\xEF\xEE\xE2 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA}
-% \DescribeBSTFunction{article}
+% \DescribeFunction{article}
% \begin{macrocode}
FUNCTION {article}
{
@@ -1964,7 +1933,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{book}
+% \DescribeFunction{book}
% \begin{macrocode}
FUNCTION {book}
{
@@ -1996,7 +1965,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{booklet}
+% \DescribeFunction{booklet}
% \begin{macrocode}
FUNCTION {booklet}
{
@@ -2019,7 +1988,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{inbook}
+% \DescribeFunction{inbook}
% \begin{macrocode}
FUNCTION {inbook}
{
@@ -2053,7 +2022,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{incollection}
+% \DescribeFunction{incollection}
% \begin{macrocode}
FUNCTION {incollection}
{
@@ -2083,7 +2052,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{inproceedings}
+% \DescribeFunction{inproceedings}
% \begin{macrocode}
FUNCTION {inproceedings}
{
@@ -2122,12 +2091,12 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{conference}
+% \DescribeFunction{conference}
% \begin{macrocode}
FUNCTION {conference} { inproceedings }
% \end{macrocode}
-% \DescribeBSTFunction{manual}
+% \DescribeFunction{manual}
% \begin{macrocode}
FUNCTION {manual}
{
@@ -2170,7 +2139,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{mastersthesis}
+% \DescribeFunction{mastersthesis}
% \begin{macrocode}
FUNCTION {mastersthesis}
{
@@ -2194,7 +2163,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{misc}
+% \DescribeFunction{misc}
% \begin{macrocode}
FUNCTION {misc}
{
@@ -2217,7 +2186,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{phdthesis}
+% \DescribeFunction{phdthesis}
% \begin{macrocode}
FUNCTION {phdthesis}
{
@@ -2243,9 +2212,9 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{docdisser}
+% \DescribeFunction{dscithesis}
% \begin{macrocode}
-FUNCTION {docdisser}
+FUNCTION {dscithesis}
{
output.bibitem
format.authors "author" output.check
@@ -2252,7 +2221,7 @@
new.sentence
format.btitle add.doi.url "title" output.check
new.colon
- bbl.docdisser format.thesis.type output.nonnull
+ bbl.dscithesis format.thesis.type output.nonnull
new.slash
school "school" output.check
new.block
@@ -2269,7 +2238,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{proceedings}
+% \DescribeFunction{proceedings}
% \begin{macrocode}
FUNCTION {proceedings}
{
@@ -2301,7 +2270,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{techreport}
+% \DescribeFunction{techreport}
% \begin{macrocode}
FUNCTION {techreport}
{
@@ -2328,7 +2297,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{patent}
+% \DescribeFunction{patent}
% \begin{macrocode}
FUNCTION {patent}
{
@@ -2350,7 +2319,7 @@
holder output.nonnull
new.semicolon
credits output.nonnull
- new.dash
+ new.block
reqnumber add.number output
new.semicolon
format.reqdate output
@@ -2372,7 +2341,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{unpublished}
+% \DescribeFunction{unpublished}
% \begin{macrocode}
FUNCTION {unpublished}
{
@@ -2391,7 +2360,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{default.type}
+% \DescribeFunction{default.type}
% \begin{macrocode}
FUNCTION {default.type} { misc }
@@ -2414,8 +2383,8 @@
% \end{macrocode}
% \subsection{\xD1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xFF \xED\xE0\xE7\xE2\xE0\xED\xE8\xE9 \xE6\xF3\xF0\xED\xE0\xEB\xEE\xE2}
% \subsubsection{\xD4\xE8\xE7\xE8\xEA\xE0 \xE8 \xE0\xF1\xF2\xF0\xEE\xED\xEE\xEC\xE8\xFF}
-% \xCA\xEE\xE4 \xE4\xE0\xED\xED\xEE\xE9 \xF1\xE5\xEA\xF6\xE8\xE8 \xF1\xEE\xE7\xE4\xE0\xED \xED\xE0 \xEE\xF1\xED\xEE\xE2\xE5 \xF4\xE0\xE9\xEB\xE0 \file{physjour.mbs}
-% \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{custom-bib}.
+% \xCA\xEE\xE4 \xE4\xE0\xED\xED\xEE\xE9 \xF1\xE5\xEA\xF6\xE8\xE8 \xF1\xEE\xE7\xE4\xE0\xED \xED\xE0 \xEE\xF1\xED\xEE\xE2\xE5 \xF4\xE0\xE9\xEB\xE0 \file{physjour.mbs} \xEF\xE0\xEA\xE5\xF2\xE0
+% \pkg{custom-bib}.
% \begin{macrocode}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
@@ -2557,7 +2526,7 @@
% \begin{macrocode}
%<*gost705s>
% \end{macrocode}
-% \DescribeBSTFunction{sortify}
+% \DescribeFunction{sortify}
% \begin{macrocode}
FUNCTION {sortify}
{
@@ -2568,7 +2537,7 @@
INTEGERS { len }
% \end{macrocode}
-% \DescribeBSTFunction{chop.word}
+% \DescribeFunction{chop.word}
% \begin{macrocode}
FUNCTION {chop.word}
{
@@ -2581,7 +2550,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{sort.format.names}
+% \DescribeFunction{sort.format.names}
% \begin{macrocode}
FUNCTION {sort.format.names}
{
@@ -2609,7 +2578,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{sort.format.title}
+% \DescribeFunction{sort.format.title}
% \begin{macrocode}
FUNCTION {sort.format.title}
{
@@ -2624,7 +2593,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{author.sort}
+% \DescribeFunction{author.sort}
% \begin{macrocode}
FUNCTION {author.sort}
{
@@ -2639,7 +2608,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{author.title.sort}
+% \DescribeFunction{author.title.sort}
% \begin{macrocode}
FUNCTION {author.title.sort}
{
@@ -2658,7 +2627,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{presort}
+% \DescribeFunction{presort}
% \begin{macrocode}
FUNCTION {presort}
{
@@ -2690,7 +2659,7 @@
INTEGERS { number.label longest.label.width }
% \end{macrocode}
-% \DescribeBSTFunction{initialize.longest.label}
+% \DescribeFunction{initialize.longest.label}
% \begin{macrocode}
FUNCTION {initialize.longest.label}
{
@@ -2700,7 +2669,7 @@
}
% \end{macrocode}
-% \DescribeBSTFunction{longest.label.pass}
+% \DescribeFunction{longest.label.pass}
% \begin{macrocode}
FUNCTION {longest.label.pass}
{
@@ -2721,7 +2690,7 @@
% \end{macrocode}
% \subsection{\xD4\xEE\xF0\xEC\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF thebibliography}
% \subsubsection{\xCF\xF0\xE5\xE0\xEC\xE1\xF3\xEB\xE0}
-% \DescribeBSTFunction{begin.bib}
+% \DescribeFunction{begin.bib}
% \begin{macrocode}
FUNCTION {begin.bib}
{
@@ -2729,32 +2698,20 @@
'skip$
{ preamble$ write$ newline$ }
if$
- "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi"
- write$ newline$
- "\ifx\undefined\href\def\href#1#2{#2}\else\fi"
- write$ newline$
- "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi"
- write$ newline$
- "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi"
- write$ newline$
- "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi"
- write$ newline$
- "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%"
- write$ newline$
- "\cyr\cyrd\cyra\cyrt\cyra\ %"
- write$ newline$
- "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi"
- write$ newline$
- "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi"
- write$ newline$
- "\begin{thebibliography}{" longest.label * "}" *
- write$ newline$
- "\def\selectlanguageifdefined#1{"
- write$ newline$
- "\expandafter\ifx\csname date#1\endcsname\relax"
- write$ newline$
- "\else\language\csname l@#1\endcsname\fi}"
- write$ newline$
+ "\providecommand*\BibEmph[1]{#1}" write$ newline$
+ "\providecommand*\BibDash{}" write$ newline$
+ "\providecommand*\href[2]{#2}" write$ newline$
+ "\providecommand*\url[1]{\texttt{#1}}" write$ newline$
+ "\providecommand*\urlprefix{URL: }" write$ newline$
+ "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$
+ "\providecommand*\BibUrlDate[1]{({%" write$ newline$
+ "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$
+ "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$
+ "\providecommand*\BibAnnote[1]{#1}" write$ newline$
+ "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+ "\def\selectlanguageifdefined#1{" write$ newline$
+ "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
+ "\else\language\csname l@#1\endcsname\fi}" write$ newline$
}
% \end{macrocode}
@@ -2768,7 +2725,7 @@
% \end{macrocode}
% \subsubsection{\xCA\xEE\xED\xE5\xF6 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF}
-% \DescribeBSTFunction{end.bib}
+% \DescribeFunction{end.bib}
% \begin{macrocode}
FUNCTION {end.bib}
{
Modified: trunk/Master/texmf-dist/source/latex/disser/gost732.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/gost732.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/gost732.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -74,8 +74,7 @@
This document class attempts to format LaTeX document according to
GOST 7.32-2001.
-Copyright (C) 2004-2012 by
- Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+Copyright (C) Stanislav Kruchinin
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -125,7 +124,7 @@
\fi
%</ignore>
%<*driver>
-\ProvidesFile{gost732.drv}[2016/01/27 1.3.4 GOST 7.32-2001 implementation]
+\ProvidesFile{gost732.drv}[2016/06/26 1.4.0 GOST 7.32-2001 implementation]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -154,16 +153,6 @@
menucolor = darkblue, urlcolor = darkblue
}
-\IfFileExists{pscyr.sty}{%
- \usepackage{pscyr}
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
-}{
- \IfFileExists{cyrtimes.sty}{%
- \renewcommand\ttdefault{cmtt}
- \renewcommand\rmdefault{ftm}
- }{}
-}
\IfFileExists{url.sty}{\RequirePackage{url}}{\newcommand\url{\texttt}}
\usepackage[T2A]{fontenc}
@@ -205,7 +194,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2013/12/30 1.3.0 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2016/07/03 1.4.0 GOST 7.32-2001 implementation]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
\ProcessOptions\relax
Modified: trunk/Master/texmf-dist/source/latex/disser/lists.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/lists.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/lists.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -10,12 +10,12 @@
%
% \subsection{\xD1\xEF\xE8\xF1\xEA\xE8}
%
-% \DescribeMacro{\leftmargini}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\leftmargini+}
-% \DescribeMacro{\leftmarginii}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\leftmarginii+}
-% \DescribeMacro{\leftmarginiii}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\leftmarginiii+}
-% \DescribeMacro{\leftmarginiv}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\leftmarginiv+}
-% \DescribeMacro{\leftmarginv}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\leftmarginv+}
-% \DescribeMacro{\leftmarginvi}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\leftmarginvi+}
+% \DescribeMacro{\leftmargini}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\leftmargini+}
+% \DescribeMacro{\leftmarginii}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\leftmarginii+}
+% \DescribeMacro{\leftmarginiii}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\leftmarginiii+}
+% \DescribeMacro{\leftmarginiv}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\leftmarginiv+}
+% \DescribeMacro{\leftmarginv}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\leftmarginv+}
+% \DescribeMacro{\leftmarginvi}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\leftmarginvi+}
%
% \xC2\xE5\xEB\xE8\xF7\xE8\xED\xFB \xEE\xF2\xF1\xF2\xF3\xEF\xEE\xE2 \xEE\xF2 \xEB\xE5\xE2\xEE\xE3\xEE \xEF\xEE\xEB\xFF \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF \xE4\xEE \xEF\xEE\xEB\xFF \xEF\xE5\xF0\xE5\xF7\xED\xFF \xE4\xEB\xFF \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2
% \xF3\xEA\xE0\xE7\xE0\xED\xED\xEE\xE3\xEE \xF3\xF0\xEE\xE2\xED\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xF1\xF2\xE8.
Modified: trunk/Master/texmf-dist/source/latex/disser/master.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/master.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/master.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -4,7 +4,7 @@
%<*master>
% \end{macrocode}
-% \subsubsection{\xD1\xF2\xE8\xEB\xFC \xEC\xE0\xE3\xE8\xF1\xF2\xE5\xF0\xF1\xEA\xEE\xE9 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8}
+% \subsubsection{\xD1\xF2\xE8\xEB\xFC \xF0\xE0\xE1\xEE\xF2\xFB \xEC\xE0\xE3\xE8\xF1\xF2\xE5\xF0\xE0}
%
% \xCD\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xFF.
% \begin{macrocode}
@@ -40,11 +40,11 @@
% \end{macrocode}
% \xC2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xE8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB \xEC\xE5\xE6\xE4\xF3 \xFD\xEB\xE5\xEC\xE5\xED\xF2\xE0\xEC\xE8 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xE3\xEE \xEB\xE8\xF1\xF2\xE0.
-% \DescribeMacro{\firstskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\firstskip+}
-% \DescribeMacro{\secondskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\secondskip+}
-% \DescribeMacro{\thirdskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\thirdskip+}
-% \DescribeMacro{\fourthskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\fourthskip+}
-% \DescribeMacro{\fifthskip}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\fifthskip+}
+% \DescribeMacro{\firstskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\firstskip+}
+% \DescribeMacro{\secondskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\secondskip+}
+% \DescribeMacro{\thirdskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\thirdskip+}
+% \DescribeMacro{\fourthskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\fourthskip+}
+% \DescribeMacro{\fifthskip}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\fifthskip+}
% \begin{macrocode}
\ifundeflength\firstskip{1ex}
\ifundeflength\secondskip{1ex}
@@ -56,7 +56,7 @@
% \end{macrocode}
% \xC3\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xFC\xED\xFB\xE9 \xEE\xF2\xF1\xF2\xF3\xEF \xEF\xE5\xF0\xE5\xE4 \xF7\xE5\xF0\xF2\xEE\xE9 \xE2 \xF2\xE5\xEA\xF1\xF2\xEE\xE2\xFB\xEC \xEF\xEE\xEB\xE5 \xE4\xEB\xFF \xE8\xEC\xE5\xED\xE8, \xF3\xF7\xE5\xED\xEE\xE9
% \xF1\xF2\xE5\xEF\xE5\xED\xE8 \xE8 \xE7\xE2\xE0\xED\xE8\xFF \xED\xE0\xF3\xF7\xED\xEE\xE3\xEE \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFF \xE8 \xEA\xEE\xED\xF1\xF3\xEB\xFC\xF2\xE0\xED\xF2\xE0.
-% \DescribeMacro{\fieldhshift}\index{\xD0\xE0\xF1\xF1\xF2\xEE\xFF\xED\xE8\xFF!\verb*+\fieldhshift+}
+% \DescribeMacro{\fieldhshift}\index{\xC8\xED\xF2\xE5\xF0\xE2\xE0\xEB\xFB!\verb*+\fieldhshift+}
% \begin{macrocode}
\setlength\fieldhshift{8.5cm}
@@ -77,7 +77,7 @@
% \paragraph{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}
% \begin{macrocode}
\begin{center}
-\instfont\@institution\par
+ {\instfont\@institution}
\end{center}
% \end{macrocode}
@@ -84,21 +84,22 @@
% \xC4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xFF \xE4\xEE\xEF\xF3\xF9\xE5\xED\xE0 \xEA \xE7\xE0\xF9\xE8\xF2\xE5
% \begin{macrocode}
\vskip\firstskip
-\@approved
+{\@approved}
\vskip\secondskip
-\begin{center}
% \end{macrocode}
-% \xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA.
+% \xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA
% \begin{macrocode}
+\begin{center}
{\titlefont\@title}
\vskip\thirdskip
% \end{macrocode}
% \xD2\xE5\xEC\xE0
% \begin{macrocode}
- {\topiclabelfont\topiclabel}
+ {\topiclabelfont\topiclabel\ }
{\topicfont\@topic}
+ \vskip\fourthskip\normalfont
\end{center}
-\vskip\fourthskip
+
\begin{tabbing}
\phantom{\masterproglabel}\=\\
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/disser/specialist.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/specialist.dtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/source/latex/disser/specialist.dtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -21,6 +21,9 @@
% \DescribeMacro{\maketitle}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\maketitle+}
% \begin{macrocode}
\if at titlepage\renewcommand\maketitle[1][]{
+% \end{macrocode}
+% \xCF\xE5\xF0\xE5\xEE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xFF \xED\xE5\xEA\xEE\xF2\xEE\xF0\xFB\xF5 \xEF\xEE\xEB\xE5\xE9 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xE3\xEE \xEB\xE8\xF1\xF2\xE0 \xE4\xEB\xFF \xE0\xED\xE3\xEB\xEE\xFF\xE7\xFB\xF7\xED\xEE\xE9 \xE2\xE5\xF0\xF1\xE8\xE8.
+% \begin{macrocode}
\ifthenelse{\equal{#1}{en}}{\@titlepage at entrue}{\@titlepage at enfalse}
\if at titlepage@en
\def\appos{Head of Department}
@@ -89,10 +92,6 @@
{\instfont\@institution}
\end{center}
-% \end{macrocode}
-% \xD0\xE0\xE1\xEE\xF2\xE0
-% \DescribeMacro{\workname}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\topicfont+}
-% \begin{macrocode}
\def\@approved{
\hfill
\begin{minipage}{.5\linewidth}
@@ -109,7 +108,7 @@
{\@approved}
\vskip\secondskip
% \end{macrocode}
-% \xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA, \xF2\xE5\xEC\xE0, \xE0\xE2\xF2\xEE\xF0
+% \xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA, \xE0\xE2\xF2\xEE\xF0, \xF2\xE5\xEC\xE0
% \begin{macrocode}
\begin{center}
{\titlefont\@title}
Modified: trunk/Master/texmf-dist/tex/latex/disser/bachelor.rtx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/bachelor.rtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/tex/latex/disser/bachelor.rtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -54,7 +54,7 @@
\thispagestyle{empty}
\enlargethispage{1cm}
\vspace*{-2cm}
-\begin{center}%
+\begin{center}
{\instfont\@institution}
\end{center}
@@ -61,14 +61,13 @@
\vskip\firstskip
{\@approved}
\vskip\secondskip
-
-\begin{center}%
- {\titlefont\@title\par}%
- \vskip\thirdskip%
- {\topiclabelfont\topiclabel\ }%
+\begin{center}
+ {\titlefont\@title}
+ \vskip\thirdskip
+ {\topiclabelfont\topiclabel\ }
{\topicfont\@topic}
- \vskip\fourthskip\normalfont%
- \courselabel\ \@coursenum~--\ \@course%
+ \vskip\fourthskip\normalfont
+ {\courselabel\ \@coursenum~--\ \@course}
\end{center}
\vskip\fifthskip
Modified: trunk/Master/texmf-dist/tex/latex/disser/candidate.rtx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/candidate.rtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/tex/latex/disser/candidate.rtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -28,7 +28,7 @@
\def\sconname{Scientific Consultant}
\def\sconlabel{\sconname}
\def\sconsndname{\sconname}
- \def\sconsndlabel{\sconsndname}
+ \def\sconsndlabel{\sconname}
\def\topicname{Topic}
\def\asmanuscript{As Manuscript}
\fi
@@ -35,10 +35,10 @@
\ifx\firstskip\undefined
\newlength\firstskip
- \ifDis at libcat
+ \ifx\@libcatnum\empty
+ \setlength\firstskip{4ex}
+ \else
\setlength\firstskip{2ex}
- \else
- \setlength\firstskip{4ex}
\fi
\fi
\ifundeflength\secondskip{2cm}
@@ -46,6 +46,7 @@
\ifundeflength\fourthskip{1cm}
\ifundeflength\fifthskip{1cm}
\ifundeflength\sixthskip{0cm}
+\ifundeflength\libcatskip{0cm}
\ifundeflength\specskip{-6pt}
\ifundeflength\saskip{0pt}
@@ -63,9 +64,12 @@
\vskip\firstskip
\begin{flushright}
\ifDis at classified\classify\fi
- \asmanuscript%\\ %avoid no line to end error
+ \asmanuscript
\ifDis at facsimile\facsimile\fi
- \ifDis at libcat\libcatname\ \@libcatnum\fi
+ \ifx\@libcatnum\empty\else
+ \vskip\libcatskip
+ {\libcatname\ \@libcatnum}
+ \fi
\end{flushright}
\begin{center}
\vskip\secondskip
@@ -76,7 +80,7 @@
{\specfont\@specnum~--\ \@spec}
\ifx\@specsndnum\empty\else
\vskip\specskip
-{\specfont\@specsndnum~--\ \@specsnd}
+ {\specfont\@specsndnum~--\ \@specsnd}
\fi
\vskip\fifthskip
{\titlefont\@title}
Modified: trunk/Master/texmf-dist/tex/latex/disser/disser.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/disser.cls 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/tex/latex/disser/disser.cls 2016-07-05 21:39:30 UTC (rev 41635)
@@ -44,8 +44,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2015/07/25 1.3.2 %
- Document class for dissertations]
+\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations]
\RequirePackage{kvoptions}
@@ -72,6 +71,8 @@
\newif\ifDis at times\Dis at timesfalse
\newif\ifDis at mtpro\Dis at mtprofalse
\newif\ifDis at natbib\Dis at natbibfalse
+\newif\ifDis at colorlinks\Dis at colorlinksfalse
+\newif\ifDis at fixint\Dis at fixintfalse
\DeclareOption{href}{\Dis at hreftrue}
\DeclareOption{subf}{\Dis at subftrue}
\DeclareOption{libcat}{\Dis at libcattrue}
@@ -79,6 +80,8 @@
\DeclareOption{facsimile}{\Dis at facsimiletrue}
\DeclareOption{noams}{\Dis at amsfalse}
\DeclareOption{natbib}{\Dis at natbibtrue}
+\DeclareOption{fixint}{\Dis at fixinttrue}
+\DeclareOption{colorlinks}{\Dis at colorlinkstrue}
\DeclareOption{a4paper}{%
\setlength\paperheight{297mm}
\setlength\paperwidth {210mm}
@@ -191,8 +194,6 @@
prefix=Dis@
}
-\DeclareBoolOption[true]{fixint}
-\DeclareBoolOption[false]{colorlinks}
\DeclareStringOption{substylefile}
\ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate}
@@ -349,14 +350,14 @@
\renewcommand\theparagraph{\arabic{paragraph}}
\renewcommand\thesubparagraph{\theparagraph.\arabic{subparagraph}}
-\newcommand\tocthepart{\thepart}
-\newcommand\tocthechapter{\thechapter}
-\newcommand\toctheappendix{\theappendix}
-\newcommand\tocthesection{\thesection}
-\newcommand\tocthesubsection{\thesubsection}
-\newcommand\tocthesubsubsection{\thesubsubsection}
-\newcommand\toctheparagraph{\theparagraph}
-\newcommand\tocthesubparagraph{\thesubparagraph}
+\providecommand\tocthepart{\thepart}
+\providecommand\tocthechapter{\thechapter}
+\providecommand\toctheappendix{\theappendix}
+\providecommand\tocthesection{\thesection}
+\providecommand\tocthesubsection{\thesubsection}
+\providecommand\tocthesubsubsection{\thesubsubsection}
+\providecommand\toctheparagraph{\theparagraph}
+\providecommand\tocthesubparagraph{\thesubparagraph}
\newcommand\default at the{%
\@addtoreset{footnote}{chapter}
@@ -1358,14 +1359,14 @@
\usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro}
}{
\PackageWarning{disser}%
- {Unable to find mtpro package. Font is unchanged.}
+ {Unable to find mtpro2 or mtpro package. Math font is unchanged.}
}
}
}
\else
\AtEndOfPackage{%
- \IfFileExists{txfonts.sty}{
- \usepackage{txfonts}
+ \IfFileExists{newtxmath.sty}{
+ \usepackage[varg,cmbraces,cmintegrals]{newtxmath}
}{
\PackageWarning{disser}%
{Unable to find txfonts package. Font is unchanged.}
@@ -1416,10 +1417,9 @@
\ifDis at natbib
\usepackage[square,comma,sort&compress,numbers]{natbib}
\else
- \newcommand\bibsection{}
- \newcommand\bibpreamble{}
- \newcommand\bibpostamble{}
- \newcommand\bibfont{\normalfont\selectfont}
+ \providecommand*\bibsection{}
+ \providecommand*\bibpreamble{}
+ \providecommand*\bibpostamble{}
\newlength\bibsep
\fi
@@ -1455,7 +1455,7 @@
\renewenvironment{thebibliography}[1]{
\bibsection
\parindent\z@
- \bibpreamble\bibfont
+ \bibpreamble\normalfont\selectfont
\list{\@biblabel{\@arabic\c at enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
\setlength{\itemsep}{\bibsep}
\setlength{\parsep}{\bibsep}
Modified: trunk/Master/texmf-dist/tex/latex/disser/doctor.rtx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/doctor.rtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/tex/latex/disser/doctor.rtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -31,10 +31,10 @@
\ifx\firstskip\undefined
\newlength\firstskip
- \ifDis at libcat
- \setlength\firstskip{1ex}
+ \ifx\@libcatnum\empty
+ \setlength\firstskip{4ex}
\else
- \setlength\firstskip{4ex}
+ \setlength\firstskip{2ex}
\fi
\fi
\ifundeflength\secondskip{3cm}
@@ -42,6 +42,7 @@
\ifundeflength\fourthskip{1cm}
\ifundeflength\fifthskip{1cm}
\ifundeflength\sixthskip{0cm}
+\ifundeflength\libcatskip{0cm}
\ifundeflength\specskip{-6pt}
\def\titlefont{\normalsize}
@@ -58,9 +59,12 @@
\vskip\firstskip
\begin{flushright}
\ifDis at classified\classify\fi
- \asmanuscript\\
+ \asmanuscript
\ifDis at facsimile\facsimile\fi
- \ifDis at libcat\libcatname\ \@libcatnum\fi
+ \ifx\@libcatnum\empty\else
+ \vskip\libcatskip
+ {\libcatname\ \@libcatnum}
+ \fi
\end{flushright}
\begin{center}
\vskip\secondskip
Modified: trunk/Master/texmf-dist/tex/latex/disser/gost732.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/gost732.cls 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/tex/latex/disser/gost732.cls 2016-07-05 21:39:30 UTC (rev 41635)
@@ -12,7 +12,7 @@
%% This file is part of the disser package.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2013/12/30 1.3.0 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2016/07/03 1.4.0 GOST 7.32-2001 implementation]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
\ProcessOptions\relax
Modified: trunk/Master/texmf-dist/tex/latex/disser/master.rtx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/master.rtx 2016-07-05 21:38:52 UTC (rev 41634)
+++ trunk/Master/texmf-dist/tex/latex/disser/master.rtx 2016-07-05 21:39:30 UTC (rev 41635)
@@ -54,19 +54,20 @@
\enlargethispage{1cm}
\vspace*{-2cm}
\begin{center}
-\instfont\@institution\par
+ {\instfont\@institution}
\end{center}
\vskip\firstskip
-\@approved
+{\@approved}
\vskip\secondskip
\begin{center}
{\titlefont\@title}
\vskip\thirdskip
- {\topiclabelfont\topiclabel}
+ {\topiclabelfont\topiclabel\ }
{\topicfont\@topic}
+ \vskip\fourthskip\normalfont
\end{center}
-\vskip\fourthskip
+
\begin{tabbing}
\phantom{\masterproglabel}\=\\
\courselabel\>\ \@coursenum\ --\ \@course\\
More information about the tex-live-commits
mailing list