From a79f349f0e0aca8573ad0f48adce24f716c7ca9a Mon Sep 17 00:00:00 2001
From: MyPetIsBear <alexandr.ledovskiy@gmail.com>
Date: Wed, 5 Mar 2014 23:33:05 +0400
Subject: [PATCH] new structure

---
 .build.sh.swp                                 | Bin 0 -> 12288 bytes
 build.sh                                      |  24 ++++--------------
 tex/{main.bib => 0-main.bib}                  |   0
 tex/{main.tex => 0-main.tex}                  |  14 +++++-----
 tex/{00-preamble.tex => 10-preamble.tex}      |   0
 tex/{01-title-page.tex => 11-title-page.tex}  |   0
 tex/{02-intro.tex => 2-intro.tex}             |   0
 ...{10-chapter-one.tex => 31-chapter-one.tex} |   1 -
 ...{20-chapter-two.tex => 32-chapter-two.tex} |   0
 tex/{80-conclusion.tex => 4-conclusion.tex}   |   0
 tex/{81-biblio.tex => 5-biblio.tex}           |   0
 {gost => tex}/G2-105.sty                      |   0
 {gost => tex}/G7-32.cls                       |   0
 {gost => tex}/G7-32.sty                       |   0
 {gost => tex}/GostBase.clo                    |   0
 {gost => tex}/cyrtimespatched.sty             |   0
 {gost => tex}/gost780u.bst                    |   0
 {inc => tex/inc}/.gitignore                   |   0
 tex/inc/img/.gitignore                        |   0
 tex/inc/src/.gitignore                        |   0
 20 files changed, 12 insertions(+), 27 deletions(-)
 create mode 100644 .build.sh.swp
 rename tex/{main.bib => 0-main.bib} (100%)
 rename tex/{main.tex => 0-main.tex} (84%)
 rename tex/{00-preamble.tex => 10-preamble.tex} (100%)
 rename tex/{01-title-page.tex => 11-title-page.tex} (100%)
 rename tex/{02-intro.tex => 2-intro.tex} (100%)
 rename tex/{10-chapter-one.tex => 31-chapter-one.tex} (52%)
 rename tex/{20-chapter-two.tex => 32-chapter-two.tex} (100%)
 rename tex/{80-conclusion.tex => 4-conclusion.tex} (100%)
 rename tex/{81-biblio.tex => 5-biblio.tex} (100%)
 rename {gost => tex}/G2-105.sty (100%)
 rename {gost => tex}/G7-32.cls (100%)
 rename {gost => tex}/G7-32.sty (100%)
 rename {gost => tex}/GostBase.clo (100%)
 rename {gost => tex}/cyrtimespatched.sty (100%)
 rename {gost => tex}/gost780u.bst (100%)
 rename {inc => tex/inc}/.gitignore (100%)
 create mode 100644 tex/inc/img/.gitignore
 create mode 100644 tex/inc/src/.gitignore

diff --git a/.build.sh.swp b/.build.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..1b32307a323c84f8d98f3f46f02de172b6716f5d
GIT binary patch
literal 12288
zcmeI2-)j_C6vvO!r&jw@@S#wS<HBfQW}+6<EDPP#RJItiv`G<Sl-=38yCbtR%gh9l
zcAMIi+Cl`O^r?Lip$~0ex($`a7UMtAhZ(B>f<9F!_|^yey_?<GRcXkha0Wiyxp(fp
zbI#}7eF&NA=m(`qK5D;7xLzju@x#6E|8e_Inqs1&uNL(1R+pY<wJPpb^Op2PryPYB
zl$*qkUrDg85ypvC^V)vca;o#5U$f)pRvXE4F(3xEXJ9_5TgP_Ok;8{Z^}_weK7Q@h
zneFW%v&DcI5CdXB42S_SAO^&M7<i@)B<&sa2{PE(&*F`KyW_F8-<3uThygJm2E>3E
z5CdXB42S_SAO^&M7<dK^RBA+T?IOAj^#A_{fB!#xiRc0N9=r=m;1GBnyaFD+NOT|k
z1yb-eI1kQ&5*P<2cplu?P4pG$fJJZ)6hR)0fy3ZVKZYOBu7OqX6ZjTf0!!com;!si
zbKsvBi2ermz+E7h7!U(uKn#chF(3xSfEW-18wU1s-3w}LP0*8fkA^rmJ#of)yw6s$
z*j9|yYC*Xiwb+X4{L#mJHcxuj?aoIO8!zI)%0avNK)-Q#aJYBI*(#_<FWHE`&ifFy
zYN!P^?2)tf0epPise09p>&KlqS?pBf1ovU5;U!)p2qSgS_)o(9d^wLe-u6``B64eN
z+vK)6H(4y5hB&)jt7FK?l~25L{&aD2g7n>~A|7qd;ST3czBf^ZIAUDNZH8>*#!KT<
zGt=dnX@k5v&(01FabbxK6-8lW@Z4OUlcov~MtU_}Pk&3h>95&Jx|(*g<?J$t^GSO?
zVI+q9%nE1AnDl#g857qzUFGak^gheJz_RO{u4iASYw6E=AKDC|kUOxkd^6~S|Cb0f
z;8i-FYkH^bqK=7sA9qvlc=Re!nmpOBSe>n)(o$@U*s2{r#qrRhL7ktz3L7M$wvNMS
z<c(f+(r=K?O$fQ3T}1ZX>{7axU13Zm>KCeDj^cZDFE9yV6-<Qhc!BG9t%gY`R&T_l
zK^4($s@RKlc}<<?caV1j8dn^Ypqt)8!fQmjss*zVskS~~W3!{y@wt&Pd&DpqYi<qK
z3c)QiqU@q3*-G{~p8kS@3|DJV9libFAQenR(UZ%T7bGgGxQQ1Ag&+*HidI-tY{gCG
c`<9B`3Vya$-Sd^@dx5fgXGo_|?(aeLFFE_PE&u=k

literal 0
HcmV?d00001

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