до 671-го символа дошли

This commit is contained in:
Kolan Sh 2011-06-27 19:26:59 +04:00
parent 49e1eca45d
commit b2acdb1b9f
2 changed files with 96 additions and 75 deletions

View File

@ -1,3 +1,19 @@
\D{\c}{%
\f{T}\s\d\e{T}}
\D{\t}[1]{\l{\c #1}}
\A{\D{T}{}{}}
%% B
\p{\t}{\\}
%% U
\u[r]{b}
\end{HA}
%\t{\T{p}}
%\end{haha}
%% LyX 1.6.8 created this file. For more info, see http://www.lyx.org/.
%% Do not edit unless you really know what you are doing.
\documentclass[english,russian]{article}
@ -37,128 +53,128 @@ DrosselTable1
\begin{longtable}{|>{\centering}p{0.11\linewidth}|>{\raggedright}p{0.05\linewidth}|>{\centering}p{0.07\paperwidth}|>{\centering}p{0.07\paperwidth}|>{\centering}m{0.07\paperheight}|>{\centering}m{0.07\paperheight}|>{\centering}p{0.07\paperheight}|>{\centering}p{0.07\paperheight}|}
\hline
\multicolumn{8}{|c|}{ó×ÏÄÎÙÊ ÐÒÏÔÏËÏÌ ÒÅÚÕÌØÔÁÔÏ× ÉÓÐÙÔÁÎÉÑ Ä×ÉÇÁÔÅÌÑ ô÷7-117÷ \textnumero{}}\tabularnewline
\multicolumn{8}{|c|}{óÔÅÎÄ \textnumero{}18 ~~ éõä óéë ~ äÁÔÁ: ~~~~~~~~ Ç. ÷ÒÅÍÑ:
~~~~~~~~~ òÎ = ~~~ ÍÍ ÒÔ ÓÔ~~ t×È = ~~~ $\,^{\circ}\mbox{C}$}\tabularnewline
\multicolumn{8}{|c|}{èÁÒÁËÔÅÒÉÓÔÉËÁ ~~~~~~~ áËÔ ÓÄÁÞÉ, ËÏÎÔÒÏÌØÎÙÅ ÔÏÞËÉ}\tabularnewline
\multicolumn{8}{|c|}{Сводный протокол результатов испытания двигателя ТВ7-117В \textnumero{}}\tabularnewline
\multicolumn{8}{|c|}{Стенд \textnumero{}18 ~~ ИУД СИК ~ Дата: ~~~~~~~~ г. Время:
~~~~~~~~~ Рн = ~~~ мм рт ст~~ tвх = ~~~ $\,^{\circ}\mbox{C}$}\tabularnewline
\multicolumn{8}{|c|}{Характеристика ~~~~~~~ Акт сдачи, контрольные точки}\tabularnewline
\hline
\endhead
\hline
\multicolumn{2}{|>{\centering}m{0.11\linewidth}|}{\centering{}óÏÓÔÁ×ÉÌ} & \multicolumn{2}{c|}{éÎÖÅÎÅÒ ÐÏ ÉÓÐÙÔÁÎÉÑÍ} & îÁÞÁÌØÎÉË âôë & îÁÞÁÌØÎÉË ÕÞÁÓÔËÁ õéä óéë & \multicolumn{2}{c|}{ðÒÅÄÓÔÁ×ÉÔÅÌØ ÚÁËÁÚÞÉËÁ}\tabularnewline
\multicolumn{2}{|>{\centering}m{0.11\linewidth}|}{\centering{}Составил} & \multicolumn{2}{c|}{Инженер по испытаниям} & Начальник БТК & Начальник участка УИД СИК & \multicolumn{2}{c|}{Представитель заказчика}\tabularnewline
\hline
\multicolumn{2}{|>{\centering}p{0.11\linewidth}|}{\centering{}\textit{ðÏÄÐÉÓØ}} & \multicolumn{2}{c|}{\textit{ðÏÄÐÉÓØ}} & \centering{}\textit{ðÏÄÐÉÓØ} & \centering{}\textit{ðÏÄÐÉÓØ} & \multicolumn{2}{c|}{\textit{ðÏÄÐÉÓØ}}\tabularnewline
\multicolumn{2}{|>{\centering}p{0.11\linewidth}|}{\textit{ÆÁÍÉÌÉÑ}} & \multicolumn{2}{c|}{\textit{ÆÁÍÉÌÉÑ}} & \multicolumn{1}{c|}{\textit{ÆÁÍÉÌÉÑ}} & \textit{ÆÁÍÉÌÉÑ} & \multicolumn{2}{c|}{\textit{ÆÁÍÉÌÉÑ}}\tabularnewline
\multicolumn{2}{|>{\centering}p{0.11\linewidth}|}{\centering{}\textit{Подпись}} & \multicolumn{2}{c|}{\textit{Подпись}} & \centering{}\textit{Подпись} & \centering{}\textit{Подпись} & \multicolumn{2}{c|}{\textit{Подпись}}\tabularnewline
\multicolumn{2}{|>{\centering}p{0.11\linewidth}|}{\textit{фамилия}} & \multicolumn{2}{c|}{\textit{фамилия}} & \multicolumn{1}{c|}{\textit{фамилия}} & \textit{фамилия} & \multicolumn{2}{c|}{\textit{фамилия}}\tabularnewline
\hline
\endfoot
\multicolumn{8}{|l|}{õÓÒÅÄΣÎÎÙÅ ÚÎÁÞÅÎÉÑ ÐÏ ÒÅÖÉÍÁÍ}\tabularnewline
\multicolumn{8}{|l|}{Усреднённые значения по режимам}\tabularnewline
\hline
\multicolumn{2}{|c|}{ðÁÒÁÍÅÔÒ} & NÅÐÒ & Ce & GÔ ÐÒ & nÔË ÐÒ & t{*}z ÓÔ ÐÒ & ðË\tabularnewline
\multicolumn{2}{|c|}{Параметр} & Nепр & Ce & Gт пр & nтк пр & t{*}z ст пр & Пк\tabularnewline
\hline
\multicolumn{2}{|>{\centering}p{0.07\paperwidth}|}{\centering{}òÅÖÉÍ} & & & & & & \tabularnewline
\multicolumn{2}{|>{\centering}p{0.07\paperwidth}|}{\centering{}Режим} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{úíç} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{ЗМГ} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{0,4 Íð} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{0,4 мП} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{Ne1650} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{íËÒ} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{Мкр} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{íð} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{МП} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{Ne2500} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{÷ÚÌ} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{Взл} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{30-ÍÉÎ.Í.} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{30-мин.м.} & & & & & & \tabularnewline
\hline
\multicolumn{8}{|c|}{úÁÍÅÒÅÎÎÙÅ ÐÁÒÁÍÅÔÒÙ}\tabularnewline
\multicolumn{8}{|c|}{Замеренные параметры}\tabularnewline
\hline
\multicolumn{2}{|c|}{ðÁÒÁÍÅÔÒ} & Ne & Ce && nÔË & t{*}z ÓÔ & ðË\tabularnewline
\multicolumn{2}{|c|}{Параметр} & Ne & Ce && nтк & t{*}z ст & Пк\tabularnewline
\hline
\multicolumn{2}{|l|}{úíç} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{ЗМГ} & & & & & & \tabularnewline
\hline
\multicolumn{2}{|l|}{2,5 ÍÉÎ.Í.} & & & & & & \tabularnewline
\multicolumn{2}{|l|}{2,5 мин.м.} & & & & & & \tabularnewline
\hline
\multicolumn{8}{|c|}{ïÃÅÎËÁ ÒÅÖÉÍÏ× ÐÏ ôõ}\tabularnewline
\multicolumn{8}{|c|}{Оценка режимов по ТУ}\tabularnewline
\hline
\multicolumn{2}{|c|}{ðÁÒÁÍÅÔÒ} & \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{NeÐÒ}}\selectlanguage{russian}
\multicolumn{2}{|c|}{Параметр} & \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{Neпр}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{ÎÅ
ÂÏÌÅÅ nÔË ÐÒ,\%}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{не
более nтк пр,\%}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{nÓÔ,\%}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{nст,\%}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.09\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{ÎÅ
ÂÏÌÅÅ t{*}z ÓÔ ÐÒ,$\,^{\circ}\mbox{C}$}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.09\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{не
более t{*}z ст пр,$\,^{\circ}\mbox{C}$}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.08\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{ÎÅ
ÂÏÌÅÅ Ce Ç/Ì.Ó.Þ.}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.08\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{не
более Ce г/л.с.}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{GÔ
ÐÒ, ËÇ/ÞÁÓ}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{Gт
пр, кг/час}}\selectlanguage{russian}
\tabularnewline
\cline{1-2}
\multicolumn{2}{|c|}{òÅÖÉÍ} & & & & & & \tabularnewline
\multicolumn{2}{|c|}{Режим} & & & & & & \tabularnewline
\hline
& ôõ & 1900 & 93,0 & 98,0$\pm$0,5 & 680 & 221 & -\tabularnewline
& ТУ & 1900 & 93,0 & 98,0$\pm$0,5 & 680 & 221 & -\tabularnewline
\cline{2-8}
íËÒ & æÁËÔ & & & & & & \tabularnewline
Мкр & Факт & & & & & & \tabularnewline
\cline{2-8}
& ïÔËÌ. & & & & & & \tabularnewline
& Откл. & & & & & & \tabularnewline
\hline
& ôõ & 2100 & 94,0 & 98,0$\pm$0,5 & 705 & - & -\tabularnewline
& ТУ & 2100 & 94,0 & 98,0$\pm$0,5 & 705 & - & -\tabularnewline
\cline{2-8}
íð & æÁËÔ & & & & & & \tabularnewline
МП & Факт & & & & & & \tabularnewline
\cline{2-8}
& ïÔËÌ. & & & & & & \tabularnewline
& Откл. & & & & & & \tabularnewline
\hline
& ôõ & 2800 & 97,5 & 98,0$\pm$0,5 & 775 & 205 & -\tabularnewline
& ТУ & 2800 & 97,5 & 98,0$\pm$0,5 & 775 & 205 & -\tabularnewline
\cline{2-8}
÷ÚÌ & æÁËÔ & & & & & & \tabularnewline
Взл & Факт & & & & & & \tabularnewline
\cline{2-8}
& ïÔËÌ. & & & & & & \tabularnewline
& Откл. & & & & & & \tabularnewline
\hline
& ôõ & 3000 & 98,5 & 98,0$\pm$0,5 & 795 & - & -\tabularnewline
& ТУ & 3000 & 98,5 & 98,0$\pm$0,5 & 795 & - & -\tabularnewline
\cline{2-8}
30-ÍÉÎ.Í. & æÁËÔ & & & & & & \tabularnewline
30-мин.м. & Факт & & & & & & \tabularnewline
\cline{2-8}
& ïÔËÌ. & & & & & & \tabularnewline
& Откл. & & & & & & \tabularnewline
\hline
\multicolumn{8}{|c|}{úÁÍÅÒÅÎÎÙÅ ÐÁÒÁÍÅÔÒÙ}\tabularnewline
\multicolumn{8}{|c|}{Замеренные параметры}\tabularnewline
\hline
\multicolumn{2}{|c|}{ðÁÒÁÍÅÔÒ} & \selectlanguage{english}%
\multicolumn{2}{|c|}{Параметр} & \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{Ne}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{ÎÅ
ÂÏÌÅÅ nÔË,\%}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{не
более nтк,\%}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{nÓÔ,\%}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{nст,\%}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.09\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{ÎÅ
ÂÏÌÅÅ t{*}z ÓÔ,$\,^{\circ}\mbox{C}$}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.09\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{не
более t{*}z ст,$\,^{\circ}\mbox{C}$}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.08\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{ÎÅ
ÂÏÌÅÅ Ce Ç/Ì.Ó.Þ.}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.08\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{не
более Ce г/л.с.}}\selectlanguage{russian}
& \selectlanguage{english}%
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{GÔ,
ËÇ/ÞÁÓ}}\selectlanguage{russian}
\inputencoding{latin9}\multirow{2}{0.07\paperwidth}{\inputencoding{koi8-r}\foreignlanguage{russian}{Gт,
кг/час}}\selectlanguage{russian}
\tabularnewline
\cline{1-2}
\multicolumn{2}{|c|}{òÅÖÉÍ} & & & & & & \tabularnewline
\multicolumn{2}{|c|}{Режим} & & & & & & \tabularnewline
\hline
& ôõ & - & & 80,0$\pm$0,5 & - & - & -\tabularnewline
& ТУ & - & & 80,0$\pm$0,5 & - & - & -\tabularnewline
\cline{2-8}
úíç & æÁËÔ & & & & & & \tabularnewline
ЗМГ & Факт & & & & & & \tabularnewline
\cline{2-8}
& ïÔËÌ. & & & & & & \tabularnewline
& Откл. & & & & & & \tabularnewline
\hline
& ôõ & - & 101,0 & 98,0$\pm$0,5 & 805 & - & -\tabularnewline
& ТУ & - & 101,0 & 98,0$\pm$0,5 & 805 & - & -\tabularnewline
\cline{2-8}
2,5 ÍÉÎ.Í. & æÁËÔ & & & & & & \tabularnewline
2,5 мин.м. & Факт & & & & & & \tabularnewline
\cline{2-8}
& ïÔËÌ. & & & & & & \tabularnewline
& Откл. & & & & & & \tabularnewline
\hline
\multicolumn{3}{|c|}{A0} & & & & & \tabularnewline
\hline
@ -166,8 +182,8 @@ DrosselTable1
\hline
\multicolumn{3}{|c|}{A2} & & & & & \tabularnewline
\hline
\multicolumn{3}{|c|}{óëï} & & & & & \tabularnewline
\multicolumn{3}{|c|}{СКО} & & & & & \tabularnewline
\hline
\multicolumn{3}{|c|}{ðÒÉÍÅÞÁÎÉÅ} & \multicolumn{5}{c|}{}\tabularnewline
\multicolumn{3}{|c|}{Примечание} & \multicolumn{5}{c|}{}\tabularnewline
\end{longtable}
\end{document}

View File

@ -59,7 +59,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
/* read one character from input stream */
char c = table_source[i];
printf("tex_level = %lu, c = %c\n", tex_level, c);
/* looking at where_stack and encountered character */
switch (where_stack[tex_level]) {
case IN_UNDEF:
@ -67,6 +67,10 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
tag = zfree_null(tag);
where_stack[++tex_level] = IN_TAG;
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '%') {
where_stack[++tex_level] = IN_COMMENT;
@ -206,7 +210,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
where_stack[tex_level] = IN_TAG_UNKNOWN;
}
if (c == '\\')
if (c == '\\' || c == '}' || c == ']')
i--;
}
break;
@ -260,8 +264,9 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isgraph(c) || c < 0) {
@ -286,7 +291,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
} else if (isalnum(c) || c == '#') {
@ -312,7 +317,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
} else if (isgraph(c) || c < 0) {
@ -338,7 +343,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
} else if (isgraph(c) || c < 0) {
@ -381,7 +386,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
} else if (isalnum(c) || c == '#') {
@ -407,7 +412,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
} else if (isgraph(c) || c < 0) {
@ -433,7 +438,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
} else if (isspace(c)) {
where_stack[++tex_level] = IN_SPACE;
} else if (c == '}') {
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
} else if (isalnum(c) || c == '#') {
@ -464,7 +469,7 @@ int parse_table(const char *table_source, size_t len, struct table_s *table, str
break;
}
}
printf("tex_level = %lu\n", tex_level);
table->id = "Drossel1.Table1";
return 0;