tex_level now is correct on exit

This commit is contained in:
Kolan Sh 2011-06-28 11:11:23 +04:00
parent b2acdb1b9f
commit b3ed9f553c
3 changed files with 90 additions and 77 deletions

View File

@ -1,15 +1,22 @@
\D{\c}{%
\f{T}\s\d\e{T}}
\D{\t}[1]{\l{\c #1}}
\A{\D{T}{}{}}
%\p{\tabularnewline}{\\}
%\a{\b}{\\}
%%%%%
%\c
%\end
%~ \D{\c}{%
%~ \f{T}\s\d\e{T}}
%~ \D{\t}[1]{\l{\c #1}}
%~ \A{\D{T}{}{}}
%% B
\p{\t}{\\}
%~ \p{\t}{\\}
%% U
\u[r]{b}
%~ \u[r]{b}
\end{HA}
%~ \end{HA}
%\t{\T{p}}
%\end{haha}
@ -53,128 +60,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
@ -182,8 +189,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

@ -293,6 +293,7 @@ printf("tex_level = %lu, c = %c\n", tex_level, c);
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isalnum(c) || c == '#') {
@ -319,6 +320,7 @@ printf("tex_level = %lu, c = %c\n", tex_level, c);
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isgraph(c) || c < 0) {
@ -345,6 +347,7 @@ printf("tex_level = %lu, c = %c\n", tex_level, c);
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isgraph(c) || c < 0) {
@ -388,6 +391,7 @@ printf("tex_level = %lu, c = %c\n", tex_level, c);
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isalnum(c) || c == '#') {
@ -414,6 +418,7 @@ printf("tex_level = %lu, c = %c\n", tex_level, c);
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isgraph(c) || c < 0) {
@ -440,6 +445,7 @@ printf("tex_level = %lu, c = %c\n", tex_level, c);
} else if (c == '}' || c == ']') {
where_stack[tex_level--] = IN_UNDEF;
i--;
} else if (isalnum(c) || c == '#') {

View File

@ -17,11 +17,11 @@ long_line_column=72
[files]
current_page=1
FILE_NAME_0=1029;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table_test.c;0
FILE_NAME_1=1575;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table.c;0
FILE_NAME_2=119;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table.h;0
FILE_NAME_3=1762;C;0;16;1;1;1;/home/kolan/projects/include/zalloc_ext.h;0
FILE_NAME_4=634;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table_tags.h;0
FILE_NAME_0=0;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table_test.c;0
FILE_NAME_1=1308;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table.c;0
FILE_NAME_2=2399;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table.h;0
FILE_NAME_3=599;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_table_tags.h;0
FILE_NAME_4=1762;C;0;16;1;1;1;/home/kolan/projects/include/zalloc_ext.h;0
FILE_NAME_5=1859;Make;0;16;1;1;1;/home/kolan/dev/c/tex_parser/Makefile;0
[build-menu]