diff --git a/.build.sh.swp b/.build.sh.swp new file mode 100644 index 0000000..1b32307 Binary files /dev/null and b/.build.sh.swp differ diff --git a/build.sh b/build.sh index 6961e47..ef8868e 100755 --- a/build.sh +++ b/build.sh @@ -6,25 +6,12 @@ GREP='grep ".*:[0-9]*:.*"' # показывает на выходе только # Файлы/Папки PDF_NAME='thesis.pdf' TEX='tex' -INC='inc' -GOST='gost' -MAINTEX='main' - -# Копирование файлов из папки gost -cd $GOST -cp -r * ../$TEX -cd .. +IMG='tex/inc/img' +MAINTEX='0-main' # Конвертация eps -find -E $INC/ -type f -name "*.eps" -exec epstopdf {} ";" ; -find -E $INC -type f -name "*.eps" -exec rm -f {} \; - -# Копирование файлов из папки img -cd $INC -if [[ $(ls) ]]; then - cp -r * ../$TEX -fi -cd .. +find -E $IMG/ -type f -name "*.eps" -exec epstopdf {} ";" ; +find -E $IMG -type f -name "*.eps" -exec rm -f {} \; # Сборка latex cd tex @@ -39,6 +26,5 @@ cp $MAINTEX.pdf ../$PDF_NAME cd .. # Clear -find -E $TEX/ -type f ! -regex ".*\.(tex|bib|gitignore)" -exec rm -f {} \; ; -# find -E $TEX/ -type d -exec rm -rf {} \; +find -E $TEX/ -type f ! -regex ".*\.(tex|bib|cls|sty|bst|clo|gitignore)" -exec rm -f {} \; ; diff --git a/tex/main.bib b/tex/0-main.bib similarity index 100% rename from tex/main.bib rename to tex/0-main.bib diff --git a/tex/main.tex b/tex/0-main.tex similarity index 84% rename from tex/main.tex rename to tex/0-main.tex index 6bc2cac..dd96de5 100644 --- a/tex/main.tex +++ b/tex/0-main.tex @@ -4,31 +4,31 @@ \documentclass[utf8x, 12pt]{G7-32} % Стиль (по умолчанию будет 14pt) % Остальные стандартные настройки убраны в preamble.inc.tex. -\include{00-preamble} +\include{01-preamble} \begin{document} \frontmatter % выключает нумерацию ВСЕГО; здесь начинаются ненумерованные главы: реферат, введение, глоссарий, сокращения и прочее. -\include{01-title-page} +\include{11-title-page} \thispagestyle{empty} \setcounter{page}{0} \tableofcontents \clearpage -\include{02-intro} +\include{2-intro} \mainmatter -\include{10-chapter-one} -\include{20-chapter-two} +\include{31-chapter-one} +\include{32-chapter-two} \backmatter %% Здесь заканчивается нумерованная часть документа и начинаются ссылки и %% заключение -\include{80-conclusion} +\include{4-conclusion} -\include{81-biblio} +\include{5-biblio} \appendix % Тут идут приложения diff --git a/tex/00-preamble.tex b/tex/10-preamble.tex similarity index 100% rename from tex/00-preamble.tex rename to tex/10-preamble.tex diff --git a/tex/01-title-page.tex b/tex/11-title-page.tex similarity index 100% rename from tex/01-title-page.tex rename to tex/11-title-page.tex diff --git a/tex/02-intro.tex b/tex/2-intro.tex similarity index 100% rename from tex/02-intro.tex rename to tex/2-intro.tex diff --git a/tex/10-chapter-one.tex b/tex/31-chapter-one.tex similarity index 52% rename from tex/10-chapter-one.tex rename to tex/31-chapter-one.tex index 4f1bff6..1584cb7 100644 --- a/tex/10-chapter-one.tex +++ b/tex/31-chapter-one.tex @@ -1,4 +1,3 @@ \chapter{Первая глава} \label{cha:ch_1} -\includegraphics[width=0.8\textwidth]{matlab1} \ No newline at end of file diff --git a/tex/20-chapter-two.tex b/tex/32-chapter-two.tex similarity index 100% rename from tex/20-chapter-two.tex rename to tex/32-chapter-two.tex diff --git a/tex/80-conclusion.tex b/tex/4-conclusion.tex similarity index 100% rename from tex/80-conclusion.tex rename to tex/4-conclusion.tex diff --git a/tex/81-biblio.tex b/tex/5-biblio.tex similarity index 100% rename from tex/81-biblio.tex rename to tex/5-biblio.tex diff --git a/gost/G2-105.sty b/tex/G2-105.sty similarity index 100% rename from gost/G2-105.sty rename to tex/G2-105.sty diff --git a/gost/G7-32.cls b/tex/G7-32.cls similarity index 100% rename from gost/G7-32.cls rename to tex/G7-32.cls diff --git a/gost/G7-32.sty b/tex/G7-32.sty similarity index 100% rename from gost/G7-32.sty rename to tex/G7-32.sty diff --git a/gost/GostBase.clo b/tex/GostBase.clo similarity index 100% rename from gost/GostBase.clo rename to tex/GostBase.clo diff --git a/gost/cyrtimespatched.sty b/tex/cyrtimespatched.sty similarity index 100% rename from gost/cyrtimespatched.sty rename to tex/cyrtimespatched.sty diff --git a/gost/gost780u.bst b/tex/gost780u.bst similarity index 100% rename from gost/gost780u.bst rename to tex/gost780u.bst diff --git a/inc/.gitignore b/tex/inc/.gitignore similarity index 100% rename from inc/.gitignore rename to tex/inc/.gitignore diff --git a/tex/inc/img/.gitignore b/tex/inc/img/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/tex/inc/src/.gitignore b/tex/inc/src/.gitignore new file mode 100644 index 0000000..e69de29