Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1747] trunk
|
From: <xf...@us...> - 2013-04-28 19:42:11
|
Revision: 1747
http://sourceforge.net/p/scstudio/code/1747
Author: xfarmad
Date: 2013-04-28 19:42:04 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
ExportTex tests
Modified Paths:
--------------
trunk/src/data/exporttex/exportTex.cpp
trunk/tests/CMakeLists.txt
trunk/tests/exporttex_position_test/exporttex_diff.py
trunk/tests/exporttex_position_test/exporttex_position_test.cpp
trunk/tests/exporttex_position_test/exporttex_position_test.tex.result
trunk/tests/exporttex_test/CMakeLists.txt
trunk/tests/exporttex_test/exporttex_diff.py
trunk/tests/exporttex_test/exporttex_test00.tex.result
trunk/tests/exporttex_test/exporttex_test01.tex.result
trunk/tests/exporttex_test/exporttex_test02.tex.result
trunk/tests/exporttex_test/exporttex_test03.tex.result
trunk/tests/exporttex_test/exporttex_test04.tex.result
trunk/tests/exporttex_test/exporttex_test05.tex.result
trunk/tests/exporttex_test/exporttex_test06.tex.result
trunk/tests/exporttex_test/exporttex_test07.tex.result
trunk/tests/exporttex_test/exporttex_test08.tex.result
trunk/tests/exporttex_test/exporttex_test09.tex.result
trunk/tests/exporttex_test/exporttex_test10.tex.result
trunk/tests/exporttex_test/exporttex_test11.tex.result
trunk/tests/exporttex_test/exporttex_test13.tex.result
trunk/tests/exporttex_test/exporttex_test15.tex.result
trunk/tests/exporttex_test/exporttex_test16.tex.result
trunk/tests/exporttex_test/exporttex_test17.tex.result
trunk/tests/exporttex_test/exporttex_test18.tex.result
trunk/tests/exporttex_test/exporttex_test19.tex.result
trunk/tests/exporttex_test/exporttex_test20.tex.result
trunk/tests/exporttex_test/exporttex_test21.tex.result
trunk/tests/exporttex_test/exporttex_test22.tex.result
trunk/tests/exporttex_test/exporttex_test23.tex.result
trunk/tests/exporttex_test/exporttex_test24.tex.result
trunk/tests/exporttex_test/exporttex_test25.tex.result
trunk/tests/exporttex_test/exporttex_test26.tex.result
trunk/tests/exporttex_test/exporttex_test27.tex.result
trunk/tests/exporttex_test/exporttex_test28.tex.result
trunk/tests/exporttex_test/exporttex_test29.tex.result
trunk/tests/exporttex_test/exporttex_test30.tex.result
trunk/tests/exporttex_test/exporttex_test31.tex.result
trunk/tests/exporttex_test/exporttex_test32.tex.result
trunk/tests/exporttex_test/exporttex_test33.tex.result
trunk/tests/exporttex_test/exporttex_test34.tex.result
trunk/tests/exporttex_test/exporttex_test35.tex.result
trunk/tests/exporttex_test/exporttex_test36.tex.result
trunk/tests/exporttex_test/exporttex_test37.tex.result
trunk/tests/exporttex_test/exporttex_test38.tex.result
trunk/tests/exporttex_test/exporttex_test39.tex.result
trunk/tests/exporttex_test/exporttex_test40.tex.result
trunk/tests/exporttex_test/exporttex_test41.tex.result
trunk/tests/exporttex_test/exporttex_test42.tex.result
trunk/tests/exporttex_test/exporttex_test45.tex.result
trunk/tests/exporttex_test/exporttex_test47.tex.result
trunk/tests/exporttex_test/exporttex_test49.tex.result
trunk/tests/exporttex_test/exporttex_test50.tex.result
trunk/tests/exporttex_test/exporttex_test51.tex.result
trunk/tests/exporttex_test/exporttex_test52.tex.result
trunk/tests/exporttex_test/exporttex_test53.tex.result
trunk/tests/exporttex_test/exporttex_test54.tex.result
trunk/tests/exporttex_test/exporttex_test55.tex.result
trunk/tests/exporttex_test/exporttex_test56.tex.result
trunk/tests/exporttex_test/exporttex_test58.tex.result
trunk/tests/exporttex_test/exporttex_test59.tex.result
trunk/tests/exporttex_test/exporttex_test60.tex.result
trunk/tests/exporttex_test/exporttex_test61.tex.result
trunk/tests/exporttex_test/exporttex_test62.tex.result
trunk/tests/exporttex_test/exporttex_test63.tex.result
trunk/tests/exporttex_test/exporttex_test64.tex.result
trunk/tests/exporttex_test/exporttex_test65.tex.result
trunk/tests/exporttex_test/exporttex_test66.tex.result
trunk/tests/exporttex_test/exporttex_test67.tex.result
trunk/tests/exporttex_test/exporttex_test68.tex.result
trunk/tests/exporttex_test/exporttex_test69.tex.result
trunk/tests/exporttex_test/exporttex_test70.tex.result
trunk/tests/exporttex_test/exporttex_test72.tex.result
trunk/tests/exporttex_test/exporttex_test73.tex.result
trunk/tests/exporttex_test/exporttex_test74.tex.result
trunk/tests/exporttex_test/exporttex_test75.tex.result
trunk/tests/exporttex_test/exporttex_test76.tex.result
trunk/tests/exporttex_test/exporttex_test77.tex.result
trunk/tests/exporttex_test/exporttex_test78.tex.result
trunk/tests/exporttex_test/exporttex_test79.tex.result
trunk/tests/exporttex_test/exporttex_test80.tex.result
trunk/tests/exporttex_test/exporttex_test81.tex.result
trunk/tests/exporttex_test/exporttex_test82.tex.result
trunk/tests/exporttex_test/exporttex_test83.tex.result
trunk/tests/exporttex_test/exporttex_test84.tex.result
trunk/tests/exporttex_test/exporttex_test85.tex.result
trunk/tests/exporttex_test/exporttex_test86.tex.result
trunk/tests/exporttex_test/exporttex_test87.tex.result
trunk/tests/exporttex_test/exporttex_test88.tex.result
trunk/tests/exporttex_test/exporttex_test89.tex.result
trunk/tests/exporttex_test/exporttex_test90.tex.result
trunk/tests/exporttex_test/exporttex_test92.tex.result
trunk/tests/exporttex_test/exporttex_test93.tex.result
trunk/tests/exporttex_test/exporttex_test94.tex.result
trunk/tests/exporttex_test/exporttex_time01.tex.result
trunk/tests/exporttex_test/exporttex_time02.tex.result
trunk/tests/exporttex_test/exporttex_time03.tex.result
trunk/tests/exporttex_test/exporttex_time04.tex.result
trunk/tests/exporttex_test/exporttex_time05.tex.result
trunk/tests/exporttex_test/exporttex_time06.tex.result
trunk/tests/exporttex_test/exporttex_time07.tex.result
trunk/tests/exporttex_test/exporttex_time08.tex.result
trunk/tests/exporttex_test/exporttex_time09.tex.result
trunk/tests/exporttex_test/exporttex_time10.tex.result
trunk/tests/exporttex_test/exporttex_time11.tex.result
trunk/tests/exporttex_test/exporttex_time12.tex.result
trunk/tests/exporttex_test/exporttex_time13.tex.result
trunk/tests/exporttex_test/exporttex_time14.tex.result
trunk/tests/exporttex_test/exporttex_time15.tex.result
trunk/tests/exporttex_test/exporttex_time16.tex.result
trunk/tests/exporttex_test/exporttex_time17.tex.result
trunk/tests/exporttex_test/exporttex_time18.tex.result
trunk/tests/exporttex_test/exporttex_time19.tex.result
trunk/tests/exporttex_test/exporttex_time20.tex.result
trunk/tests/exporttex_test/exporttex_time21.tex.result
trunk/tests/exporttex_test/exporttex_time22.tex.result
trunk/tests/exporttex_test/exporttex_time23.tex.result
trunk/tests/exporttex_test/exporttex_time24.tex.result
trunk/tests/exporttex_test/exporttex_time25.tex.result
trunk/tests/exporttex_test/exporttex_time26.tex.result
trunk/tests/exporttex_test/exporttex_time27.tex.result
trunk/tests/exporttex_test/exporttex_time28.tex.result
trunk/tests/exporttex_test/exporttex_time29.tex.result
trunk/tests/exporttex_test/exporttex_time30.tex.result
trunk/tests/exporttex_test/exporttex_time31.tex.result
trunk/tests/exporttex_test/exporttex_time32.tex.result
trunk/tests/exporttex_test/exporttex_time33.tex.result
trunk/tests/exporttex_test/exporttex_time34.tex.result
trunk/tests/exporttex_test/exporttex_time35.tex.result
trunk/tests/exporttex_test/exporttex_time36.tex.result
trunk/tests/exporttex_test/exporttex_time37.tex.result
trunk/tests/exporttex_test/exporttex_time38.tex.result
trunk/tests/exporttex_test/exporttex_time39.tex.result
trunk/tests/exporttex_test/exporttex_time40.tex.result
trunk/tests/exporttex_test/exporttex_time41.tex.result
trunk/tests/exporttex_test/exporttex_time42.tex.result
trunk/tests/exporttex_test/exporttex_time43.tex.result
trunk/tests/exporttex_test/exporttex_time44.tex.result
trunk/tests/exporttex_test/exporttex_time45.tex.result
trunk/tests/exporttex_test/exporttex_time46.tex.result
trunk/tests/exporttex_test/exporttex_time47.tex.result
trunk/tests/exporttex_test/exporttex_time48.tex.result
trunk/tests/exporttex_test/exporttex_time49.tex.result
trunk/tests/exporttex_test/reload.py
Added Paths:
-----------
trunk/tests/exporttex_test/exporttex_time11.tex.result2
trunk/tests/exporttex_test/exporttex_time26.tex.result2
trunk/tests/exporttex_test/exporttex_time27.tex.result2
trunk/tests/exporttex_test/exporttex_time28.tex.result2
trunk/tests/exporttex_test/exporttex_time29.tex.result2
trunk/tests/exporttex_test/exporttex_time30.tex.result2
Removed Paths:
-------------
trunk/tests/exporttex_test/exporttex_test12.mpr
trunk/tests/exporttex_test/exporttex_test12.tex.result
trunk/tests/exporttex_test/exporttex_test14.mpr
trunk/tests/exporttex_test/exporttex_test14.tex.result
trunk/tests/exporttex_test/exporttex_test43.mpr
trunk/tests/exporttex_test/exporttex_test43.tex.result
trunk/tests/exporttex_test/exporttex_test44.mpr
trunk/tests/exporttex_test/exporttex_test44.tex.result
trunk/tests/exporttex_test/exporttex_test46.mpr
trunk/tests/exporttex_test/exporttex_test46.tex.result
trunk/tests/exporttex_test/exporttex_test48.mpr
trunk/tests/exporttex_test/exporttex_test48.tex.result
trunk/tests/exporttex_test/exporttex_test57.mpr
trunk/tests/exporttex_test/exporttex_test57.tex.result
trunk/tests/exporttex_test/exporttex_test71.mpr
trunk/tests/exporttex_test/exporttex_test71.tex.result
trunk/tests/exporttex_test/exporttex_test91.mpr
trunk/tests/exporttex_test/exporttex_test91.tex.result
Modified: trunk/src/data/exporttex/exportTex.cpp
===================================================================
--- trunk/src/data/exporttex/exportTex.cpp 2013-04-15 05:40:35 UTC (rev 1746)
+++ trunk/src/data/exporttex/exportTex.cpp 2013-04-28 19:42:04 UTC (rev 1747)
@@ -59,8 +59,6 @@
std::string m_description;
std::string m_length_name;
-
-
Coordinate absoluteCoordinate(Coordinate coordinate, bool absolute)
{
if(absolute)
@@ -392,7 +390,9 @@
CoregionArea* coregion = dynamic_cast<CoregionArea*>(event->get_area());
if(coregion != NULL)
+ {
coor += Compare::round(coregion->get_begin_height());
+ }
coor += event->get_instance()->get_line_begin().get_y();
print_event_comment(event,coor);
@@ -613,7 +613,6 @@
}
if(Compare::equal((*min)->get_line_begin().get_y(),first))
{
- //implement color on instances in msc5.sty
print_color((*min)->get_marked());
m_stream << "\\declinst" << m_instance_width_map.printOptParam((*min)->get_width()) << "{" << m_instance_id_map.get_id(inst_pos((*min))) << "_inst}"
<< m_instance_height_map.printOptParam(3) << "{" << ExportTex::print_wchar((*min)->get_label()) << "}";
@@ -631,6 +630,7 @@
}
instances.erase(min);
}
+ m_stream << std::endl;
};
void print_instance(const InstancePtr& instance, Coordinate coordinate = 0)
@@ -833,7 +833,6 @@
void insert_pointer(MscElementPtr pointer, Coordinate coordinate)
{
- //TODO: improve coordinate key
coordinate = Compare::round(coordinate);
ElementListMap::iterator it;
it = m_event_level_map.find(coordinate);
@@ -844,8 +843,7 @@
}
if(it == m_event_level_map.end())
{
- //TODO: avoid this to happend
- m_stream << "[log] it is end, coordinate:" << coordinate << std::endl;
+ throw new std::runtime_error("ExportTex::PrintBmsc::create_level() failed");
}else{
(*it).second.push_back(pointer);
}
@@ -1201,7 +1199,7 @@
if(reverse_find == m_level_types.begin())
{
- //slope out of diagram == error
+ //slope out of diagram
m_stream << (it->first - it->second) << "mm}" << std::endl;
break;
}
@@ -1237,7 +1235,7 @@
}
if(Compare::equal(it->first,it->second))
{
- //slope is 0 has sense to print????
+ //slope is 0
m_stream << "0mm*\\real{\\mscScaleY}}" << std::endl;
continue;
}
@@ -1294,6 +1292,7 @@
find++;
}
}
+ m_stream << std::endl << std::endl;
};
void print_time_slope(DistanceMap *size, std::list<std::pair<Coordinate,Coordinate> > *coordinates)
@@ -1325,7 +1324,7 @@
if(reverse_find == m_level_types.begin())
{
- //slope out of diagram == error
+ //slope out of diagram
m_stream << (it->first - it->second) << "mm}" << std::endl;
break;
}
@@ -1361,7 +1360,7 @@
}
if(Compare::equal(it->first,it->second))
{
- //slope is 0 has sense to print????
+ //slope is 0
m_stream << "0mm*\\real{\\mscScaleY}}" << std::endl;
continue;
}
@@ -1374,7 +1373,7 @@
next++;
if(next == m_level_types.end())
{
- //slope out of diagram == error
+ //slope out of diagram
m_stream << (it->second - it->first) << "mm}" << std::endl;
break;
}
@@ -1426,7 +1425,7 @@
{
Coordinate begin_coregion = inst->get_line_begin().get_y() + coregion_area->get_begin_height();
Coordinate end_coregion = inst->get_line_begin().get_y() + coregion_area->get_end_height();
- //coregion is exported first -> begin change coordinate in msc.sty, end not
+
if(Compare::compare(begin_coregion,send_coordinate,true) && Compare::compare(send_coordinate,end_coregion))
{
send_padding += coregion_area->get_width();
@@ -1733,16 +1732,12 @@
}
else
m_stream << "\\setlength{\\levelheight}{" << it->first << "mm" << "}" << std::endl;
- m_stream << "\\nextlevel" << std::endl;
+ m_stream << "\\nextlevel" << std::endl << std::endl;;
}
}
m_stream << "\\end{msc}" << std::endl;
- /*
- for(ElementListMap::iterator it = m_event_level_map.begin(); it!=m_event_level_map.end(); it++)
- {
- (*it).second.clear();
- }*/
+
return 0;
};
};
@@ -2124,12 +2119,6 @@
PredecessorNode *predecessor_node = dynamic_cast<PredecessorNode*>(npos->get());
if(predecessor_node != NULL)
{
- /* mam overovat????
- if(predecessor_node->get_successors().empty())
- {
- print_report(RS_WARNING, stringize()
- << L"Warning: HMSC node without successors violates the Z.120 standard.");
- } */
for(NodeRelationPtrVector::const_iterator spos = predecessor_node->get_successors().begin();
spos != predecessor_node->get_successors().end(); spos++)
{
@@ -2197,15 +2186,19 @@
HMscNode *successor_node = dynamic_cast<HMscNode*>(successor);
print_color((*spos)->get_marked());
- m_stream << "\\arrow{" << node_id_map.get_id(*npos) << "}[";
+ m_stream << "\\arrow{" << node_id_map.get_id(*npos) << "}";
std::list<MscPoint> line = (*spos)->get_line().get_points();
- //for(std::list<MscPoint>::const_iterator point = (*spos)->get_line().get_points().begin(); point != (*spos)->get_line().get_points().end();point++)
- for(std::list<MscPoint>::const_iterator point = line.begin(); point != line.end();point++)
+ if(!line.empty())
{
- m_stream << "(" << get_pos_x(point->get_x()) << "," << get_pos_y(point->get_y()) << ")";
- }
-
- m_stream << "]{" << node_id_map.get_id(successor_node) << "}" << std::endl;
+ m_stream << "[";
+ //for(std::list<MscPoint>::const_iterator point = (*spos)->get_line().get_points().begin(); point != (*spos)->get_line().get_points().end();point++)
+ for(std::list<MscPoint>::const_iterator point = line.begin(); point != line.end();point++)
+ {
+ m_stream << "(" << get_pos_x(point->get_x()) << "," << get_pos_y(point->get_y()) << ")";
+ }
+ m_stream << "]";
+ }
+ m_stream << "{" << node_id_map.get_id(successor_node) << "}" << std::endl;
// add successors of this node to the stack
// note: std::list<>::push_back doesn't invalidate iterators
@@ -2322,7 +2315,6 @@
std::string ExportTex::print_wchar(const std::wstring &value)
{
static const std::string replacement = "\\_";
- bool was_replacement = false;
std::string new_value;
// performance optimalization: allocate buffer for all characters
@@ -2332,39 +2324,25 @@
for(std::wstring::const_iterator pos = value.begin();
pos != value.end(); pos++)
{
- char stripped;
-
- if((*pos >= 'A' && *pos <= 'Z') || (*pos >= 'a' && *pos <= 'z')
- || (*pos >= '0' && *pos <= '9')
- || *pos == '.' || *pos == ' ')
+ if( *pos == '#' || *pos == '%' || *pos == '&' || *pos == '_' )
{
// print valid characters
- new_value.push_back((char)*pos);
-
- was_replacement = false;
- }
- else if( *pos == '#' || *pos == '%' || *pos == '&' || *pos == '_' )
- {
- // print valid characters
new_value.push_back('\\');
new_value.push_back((char)*pos);
-
- was_replacement = false;
}
- else if((stripped = strip_diacritics(*pos)) != (char)0)
- {
- // use the transliteration table
- new_value.push_back(stripped);
- was_replacement = false;
- }
else
{
- // replace invalid characters by the 'replacement'
- // shrink multiple replacements into a single characters
- if(!was_replacement)
- new_value.append(replacement);
-
- was_replacement = true;
+ if( *pos == '+' || *pos == '=' || *pos == '|' || *pos == '<' || *pos == '>')
+ {
+ //characters availible only in mathematical mode
+ new_value.push_back('$');
+ new_value.push_back((char)*pos);
+ new_value.push_back('$');
+ }
+ else
+ {
+ new_value.push_back((char)*pos);
+ }
}
}
return new_value;
@@ -2389,7 +2367,17 @@
}
else
{
- new_value.push_back((char)*pos);
+ if( *pos == '+' || *pos == '=' || *pos == '|' || *pos == '<' || *pos == '>')
+ {
+ //characters availible only in mathematical mode
+ new_value.push_back('$');
+ new_value.push_back((char)*pos);
+ new_value.push_back('$');
+ }
+ else
+ {
+ new_value.push_back((char)*pos);
+ }
}
}
return new_value;
Modified: trunk/tests/CMakeLists.txt
===================================================================
--- trunk/tests/CMakeLists.txt 2013-04-15 05:40:35 UTC (rev 1746)
+++ trunk/tests/CMakeLists.txt 2013-04-28 19:42:04 UTC (rev 1747)
@@ -153,10 +153,10 @@
ENDMACRO(ADD_PCAP_TEST)
ADD_SUBDIRECTORY(pcap)
-# ADD_SUBDIRECTORY(exporttex_test)
+ADD_SUBDIRECTORY(exporttex_test)
# Exporttex test with known coordinates (test doesn't depends on beautify)
-# ADD_SUBDIRECTORY(exporttex_position_test)
+ADD_SUBDIRECTORY(exporttex_position_test)
SET(MSCGEN_SEQUENCE 0)
MACRO(ADD_MSCGEN_TEST FILE SATISFIED)
Modified: trunk/tests/exporttex_position_test/exporttex_diff.py
===================================================================
--- trunk/tests/exporttex_position_test/exporttex_diff.py 2013-04-15 05:40:35 UTC (rev 1746)
+++ trunk/tests/exporttex_position_test/exporttex_diff.py 2013-04-28 19:42:04 UTC (rev 1747)
@@ -6,7 +6,7 @@
p = subprocess.Popen([sys.argv[1]], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-output = p.stderr.readlines() + p.stdout.readlines()
+output = p.stdout.readlines() + p.stderr.readlines()
# print the output as it may contain valgrind error reports
# note: ctest expects the valgring errors at stderr
sys.stderr.writelines(output)
Modified: trunk/tests/exporttex_position_test/exporttex_position_test.cpp
===================================================================
--- trunk/tests/exporttex_position_test/exporttex_position_test.cpp 2013-04-15 05:40:35 UTC (rev 1746)
+++ trunk/tests/exporttex_position_test/exporttex_position_test.cpp 2013-04-28 19:42:04 UTC (rev 1747)
@@ -22,26 +22,26 @@
#include "data/exporttex/exportTex.h"
-CompleteMessagePtr get_cm(EventPtr e1, EventPtr e2)
+CompleteMessagePtr get_cm(MessageEventPtr e1, MessageEventPtr e2)
{
CompleteMessagePtr m1 = new CompleteMessage(L"hi1");
m1->glue_events(e1.get(), e2.get());
return m1;
}
-EventPtr get_event(StrictOrderAreaPtr strict1, MscPoint point){
- EventPtr e1 = strict1->add_event();
+MessageEventPtr get_event(StrictOrderAreaPtr strict1, MscPoint point){
+ MessageEventPtr e1 = strict1->add_event();
e1->set_position(point);
return e1;
}
-EventPtr get_event(CoregionAreaPtr strict1, MscPoint point){
- EventPtr e1 = strict1->add_event();
+MessageEventPtr get_event(CoregionAreaPtr strict1, MscPoint point){
+ MessageEventPtr e1 = strict1->add_event();
e1->set_position(point);
return e1;
}
-IncompleteMessagePtr get_im(EventPtr e1, MscPoint point, InstancePtr instance,IncompleteMsgType type = LOST){
+IncompleteMessagePtr get_im(MessageEventPtr e1, MscPoint point, InstancePtr instance,IncompleteMsgType type = LOST){
IncompleteMessagePtr im1 = new IncompleteMessage(type);
im1->glue_event(e1);
im1->set_dot_position(MscPoint(point.get_x()-instance->get_line_begin().get_x(),point.get_y()-instance->get_line_begin().get_y()-e1->get_position().get_y()));
@@ -50,7 +50,7 @@
return im1;
}
-IncompleteMessagePtr get_im(EventPtr e1, MscPoint point, IncompleteMsgType type = LOST){
+IncompleteMessagePtr get_im(MessageEventPtr e1, MscPoint point, IncompleteMsgType type = LOST){
IncompleteMessagePtr im1 = new IncompleteMessage(type);
im1->glue_event(e1);
im1->set_dot_position(point);
@@ -59,7 +59,7 @@
return im1;
}
-TimeRelationEventPtr getTimeRelationEvent(EventPtr e1, EventPtr e2, Coordinate width = 7, bool directed = false){
+TimeRelationEventPtr getTimeRelationEvent(MessageEventPtr e1, MessageEventPtr e2, Coordinate width = 7, bool directed = false){
MscTimeIntervalD in1(0,D::infinity());
MscTimeIntervalSetD ins1;
ins1.insert(in1);
@@ -90,7 +90,7 @@
return com1;
}
-AbsoluteTimePtr get_absTime(EventPtr e2, MscPoint point1, MscPoint point2, double interval_left = 0, double interval_right = 0){
+AbsoluteTimePtr get_absTime(MessageEventPtr e2, MscPoint point1, MscPoint point2, double interval_left = 0, double interval_right = 0){
AbsoluteTimePtr ab1 = new AbsoluteTime();
ab1->set_position(point1);
MscTimeIntervalSetD ins1;
@@ -107,16 +107,6 @@
return ab1;
}
-void get_order(EventPtr e1, EventPtr e2)
-{
- CoregionEventPtr ce1 = boost::dynamic_pointer_cast<CoregionEvent>(e1);
- CoregionEventPtr ce2 = boost::dynamic_pointer_cast<CoregionEvent>(e2);
- if(ce1!=NULL && ce2!=NULL)
- {
- ce1->add_successor(ce2.get());
- }
-}
-
int main(int argc, char** argv)
{
ExportTex exportTex;
@@ -182,24 +172,24 @@
instance2->add_area(strict2);
instance3->add_area(strict3);
- EventPtr e1 = get_event(strict1,MscPoint(0,7));
- EventPtr e2 = get_event(strict1,MscPoint(0,12));
- EventPtr e3 = get_event(strict1,MscPoint(0,17));
- EventPtr e4 = get_event(strict1,MscPoint(0,27));
- EventPtr e5 = get_event(strict1,MscPoint(0,35));
- EventPtr e6 = get_event(strict1,MscPoint(0,44));
- EventPtr e7 = get_event(strict1,MscPoint(0,60));
- EventPtr e8 = get_event(strict2,MscPoint(0,7));
- EventPtr e9 = get_event(strict2,MscPoint(0,12));
- EventPtr e10 = get_event(strict2,MscPoint(0,22));
- EventPtr e11 = get_event(strict2,MscPoint(0,35));
- EventPtr e12 = get_event(strict2,MscPoint(0,44));
- EventPtr e13 = get_event(strict2,MscPoint(0,60));
- EventPtr e14 = get_event(strict2,MscPoint(0,65));
- EventPtr e15 = get_event(strict3,MscPoint(0,17));
- EventPtr e16 = get_event(strict3,MscPoint(0,22));
- EventPtr e17 = get_event(strict3,MscPoint(0,27));
- EventPtr e18 = get_event(strict3,MscPoint(0,65));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,7));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,12));
+ MessageEventPtr e3 = get_event(strict1,MscPoint(0,17));
+ MessageEventPtr e4 = get_event(strict1,MscPoint(0,27));
+ MessageEventPtr e5 = get_event(strict1,MscPoint(0,35));
+ MessageEventPtr e6 = get_event(strict1,MscPoint(0,44));
+ MessageEventPtr e7 = get_event(strict1,MscPoint(0,60));
+ MessageEventPtr e8 = get_event(strict2,MscPoint(0,7));
+ MessageEventPtr e9 = get_event(strict2,MscPoint(0,12));
+ MessageEventPtr e10 = get_event(strict2,MscPoint(0,22));
+ MessageEventPtr e11 = get_event(strict2,MscPoint(0,35));
+ MessageEventPtr e12 = get_event(strict2,MscPoint(0,44));
+ MessageEventPtr e13 = get_event(strict2,MscPoint(0,60));
+ MessageEventPtr e14 = get_event(strict2,MscPoint(0,65));
+ MessageEventPtr e15 = get_event(strict3,MscPoint(0,17));
+ MessageEventPtr e16 = get_event(strict3,MscPoint(0,22));
+ MessageEventPtr e17 = get_event(strict3,MscPoint(0,27));
+ MessageEventPtr e18 = get_event(strict3,MscPoint(0,65));
CompleteMessagePtr m1 = get_cm(e1,e8);
CompleteMessagePtr m2 = get_cm(e2,e9);
@@ -237,24 +227,24 @@
instance1->add_area(strict1);
instance2->add_area(strict2);
- EventPtr e1 = get_event(strict1,MscPoint(0,8));
- EventPtr e2 = get_event(strict1,MscPoint(0,23));
- EventPtr e3 = get_event(strict1,MscPoint(0,43));
- EventPtr e4 = get_event(strict1,MscPoint(0,53));
- EventPtr e5 = get_event(strict1,MscPoint(0,68));
- EventPtr e6 = get_event(strict1,MscPoint(0,83));
- EventPtr e7 = get_event(strict1,MscPoint(0,88));
- EventPtr e8 = get_event(strict1,MscPoint(0,100));
- EventPtr e9 = get_event(strict1,MscPoint(0,133));
- EventPtr e10 = get_event(strict2,MscPoint(0,8));
- EventPtr e11 = get_event(strict2,MscPoint(0,18));
- EventPtr e12 = get_event(strict2,MscPoint(0,33));
- EventPtr e13 = get_event(strict2,MscPoint(0,58));
- EventPtr e14 = get_event(strict2,MscPoint(0,75));
- EventPtr e15 = get_event(strict2,MscPoint(0,83));
- EventPtr e16 = get_event(strict2,MscPoint(0,93));
- EventPtr e17 = get_event(strict2,MscPoint(0,108));
- EventPtr e18 = get_event(strict2,MscPoint(0,113));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,8));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,23));
+ MessageEventPtr e3 = get_event(strict1,MscPoint(0,43));
+ MessageEventPtr e4 = get_event(strict1,MscPoint(0,53));
+ MessageEventPtr e5 = get_event(strict1,MscPoint(0,68));
+ MessageEventPtr e6 = get_event(strict1,MscPoint(0,83));
+ MessageEventPtr e7 = get_event(strict1,MscPoint(0,88));
+ MessageEventPtr e8 = get_event(strict1,MscPoint(0,100));
+ MessageEventPtr e9 = get_event(strict1,MscPoint(0,133));
+ MessageEventPtr e10 = get_event(strict2,MscPoint(0,8));
+ MessageEventPtr e11 = get_event(strict2,MscPoint(0,18));
+ MessageEventPtr e12 = get_event(strict2,MscPoint(0,33));
+ MessageEventPtr e13 = get_event(strict2,MscPoint(0,58));
+ MessageEventPtr e14 = get_event(strict2,MscPoint(0,75));
+ MessageEventPtr e15 = get_event(strict2,MscPoint(0,83));
+ MessageEventPtr e16 = get_event(strict2,MscPoint(0,93));
+ MessageEventPtr e17 = get_event(strict2,MscPoint(0,108));
+ MessageEventPtr e18 = get_event(strict2,MscPoint(0,113));
CompleteMessagePtr m1 = get_cm(e1,e10);
CompleteMessagePtr m2 = get_cm(e2,e11);
@@ -292,30 +282,30 @@
instance1->add_area(strict1);
instance2->add_area(strict2);
- EventPtr e1 = get_event(strict1,MscPoint(0,8));
- EventPtr e2 = get_event(strict1,MscPoint(0,15));
- EventPtr e3 = get_event(strict1,MscPoint(0,20));
- EventPtr e4 = get_event(strict1,MscPoint(0,34));
- EventPtr e5 = get_event(strict1,MscPoint(0,45));
- EventPtr e6 = get_event(strict1,MscPoint(0,55));
- EventPtr e7 = get_event(strict1,MscPoint(0,70));
- EventPtr e8 = get_event(strict1,MscPoint(0,75));
- EventPtr e9 = get_event(strict1,MscPoint(0,80));
- EventPtr e10 = get_event(strict1,MscPoint(0,88));
- EventPtr e11 = get_event(strict1,MscPoint(0,93));
- EventPtr e12 = get_event(strict1,MscPoint(0,110));
- EventPtr e13 = get_event(strict2,MscPoint(0,15));
- EventPtr e14 = get_event(strict2,MscPoint(0,22));
- EventPtr e15 = get_event(strict2,MscPoint(0,28));
- EventPtr e16 = get_event(strict2,MscPoint(0,40));
- EventPtr e17 = get_event(strict2,MscPoint(0,45));
- EventPtr e18 = get_event(strict2,MscPoint(0,55));
- EventPtr e19 = get_event(strict2,MscPoint(0,65));
- EventPtr e20 = get_event(strict2,MscPoint(0,70));
- EventPtr e21 = get_event(strict2,MscPoint(0,77));
- EventPtr e22 = get_event(strict2,MscPoint(0,85));
- EventPtr e23 = get_event(strict2,MscPoint(0,98));
- EventPtr e24 = get_event(strict2,MscPoint(0,103));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,8));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,15));
+ MessageEventPtr e3 = get_event(strict1,MscPoint(0,20));
+ MessageEventPtr e4 = get_event(strict1,MscPoint(0,34));
+ MessageEventPtr e5 = get_event(strict1,MscPoint(0,45));
+ MessageEventPtr e6 = get_event(strict1,MscPoint(0,55));
+ MessageEventPtr e7 = get_event(strict1,MscPoint(0,70));
+ MessageEventPtr e8 = get_event(strict1,MscPoint(0,75));
+ MessageEventPtr e9 = get_event(strict1,MscPoint(0,80));
+ MessageEventPtr e10 = get_event(strict1,MscPoint(0,88));
+ MessageEventPtr e11 = get_event(strict1,MscPoint(0,93));
+ MessageEventPtr e12 = get_event(strict1,MscPoint(0,110));
+ MessageEventPtr e13 = get_event(strict2,MscPoint(0,15));
+ MessageEventPtr e14 = get_event(strict2,MscPoint(0,22));
+ MessageEventPtr e15 = get_event(strict2,MscPoint(0,28));
+ MessageEventPtr e16 = get_event(strict2,MscPoint(0,40));
+ MessageEventPtr e17 = get_event(strict2,MscPoint(0,45));
+ MessageEventPtr e18 = get_event(strict2,MscPoint(0,55));
+ MessageEventPtr e19 = get_event(strict2,MscPoint(0,65));
+ MessageEventPtr e20 = get_event(strict2,MscPoint(0,70));
+ MessageEventPtr e21 = get_event(strict2,MscPoint(0,77));
+ MessageEventPtr e22 = get_event(strict2,MscPoint(0,85));
+ MessageEventPtr e23 = get_event(strict2,MscPoint(0,98));
+ MessageEventPtr e24 = get_event(strict2,MscPoint(0,103));
CompleteMessagePtr m1 = get_cm(e1,e16);
CompleteMessagePtr m2 = get_cm(e2,e13);
@@ -348,18 +338,18 @@
StrictOrderAreaPtr strict1(new StrictOrderArea());
instance1->add_area(strict1);
- EventPtr e1 = get_event(strict1,MscPoint(0,15));
- EventPtr e2 = get_event(strict1,MscPoint(0,25));
- EventPtr e3 = get_event(strict1,MscPoint(0,30));
- EventPtr e4 = get_event(strict1,MscPoint(0,40));
- EventPtr e5 = get_event(strict1,MscPoint(0,50));
- EventPtr e6 = get_event(strict1,MscPoint(0,55));
- EventPtr e7 = get_event(strict1,MscPoint(0,70));
- EventPtr e8 = get_event(strict1,MscPoint(0,80));
- EventPtr e9 = get_event(strict1,MscPoint(0,85));
- EventPtr e10 = get_event(strict1,MscPoint(0,95));
- EventPtr e11 = get_event(strict1,MscPoint(0,105));
- EventPtr e12 = get_event(strict1,MscPoint(0,115));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,15));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,25));
+ MessageEventPtr e3 = get_event(strict1,MscPoint(0,30));
+ MessageEventPtr e4 = get_event(strict1,MscPoint(0,40));
+ MessageEventPtr e5 = get_event(strict1,MscPoint(0,50));
+ MessageEventPtr e6 = get_event(strict1,MscPoint(0,55));
+ MessageEventPtr e7 = get_event(strict1,MscPoint(0,70));
+ MessageEventPtr e8 = get_event(strict1,MscPoint(0,80));
+ MessageEventPtr e9 = get_event(strict1,MscPoint(0,85));
+ MessageEventPtr e10 = get_event(strict1,MscPoint(0,95));
+ MessageEventPtr e11 = get_event(strict1,MscPoint(0,105));
+ MessageEventPtr e12 = get_event(strict1,MscPoint(0,115));
IncompleteMessagePtr im1 = get_im(e1,MscPoint(60,-265),instance1);
IncompleteMessagePtr im2 = get_im(e2,MscPoint(60,-258),instance1);
@@ -400,12 +390,12 @@
instance1->add_area(strict1);
instance2->add_area(strict2);
- EventPtr e1 = get_event(strict1,MscPoint(0,13));
- EventPtr e2 = get_event(strict1,MscPoint(0,33));
- EventPtr e3 = get_event(strict2,MscPoint(0,13));
- EventPtr e4 = get_event(strict2,MscPoint(0,33));
- EventPtr e5 = get_event(strict1,MscPoint(0,46));
- EventPtr e6 = get_event(strict2,MscPoint(0,46));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,13));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,33));
+ MessageEventPtr e3 = get_event(strict2,MscPoint(0,13));
+ MessageEventPtr e4 = get_event(strict2,MscPoint(0,33));
+ MessageEventPtr e5 = get_event(strict1,MscPoint(0,46));
+ MessageEventPtr e6 = get_event(strict2,MscPoint(0,46));
CompleteMessagePtr m1 = get_cm(e1,e3);
CompleteMessagePtr m2 = get_cm(e2,e4);
@@ -515,22 +505,22 @@
instance3->add_area(coregion3);
//first instance
- EventPtr e1 = get_event(coregion1,MscPoint(0,2));
- EventPtr e2 = get_event(coregion1,MscPoint(0,5));
- EventPtr e3 = get_event(coregion1,MscPoint(0,12));
- EventPtr e4 = get_event(coregion1,MscPoint(0,17));
+ MessageEventPtr e1 = get_event(coregion1,MscPoint(0,2));
+ MessageEventPtr e2 = get_event(coregion1,MscPoint(0,5));
+ MessageEventPtr e3 = get_event(coregion1,MscPoint(0,12));
+ MessageEventPtr e4 = get_event(coregion1,MscPoint(0,17));
//second instance
- EventPtr e5 = get_event(strict2,MscPoint(0,10));
- EventPtr e6 = get_event(coregion2,MscPoint(0,3));
- EventPtr e7 = get_event(coregion2,MscPoint(0,4.5));
- EventPtr e8 = get_event(coregion2,MscPoint(0,13));
- EventPtr e9 = get_event(coregion2,MscPoint(0,16));
+ MessageEventPtr e5 = get_event(strict2,MscPoint(0,10));
+ MessageEventPtr e6 = get_event(coregion2,MscPoint(0,3));
+ MessageEventPtr e7 = get_event(coregion2,MscPoint(0,4.5));
+ MessageEventPtr e8 = get_event(coregion2,MscPoint(0,13));
+ MessageEventPtr e9 = get_event(coregion2,MscPoint(0,16));
//third instance
- EventPtr e10 = get_event(strict3,MscPoint(0,5));
- EventPtr e11 = get_event(coregion3,MscPoint(0,5));
- EventPtr e12 = get_event(coregion3,MscPoint(0,15));
+ MessageEventPtr e10 = get_event(strict3,MscPoint(0,5));
+ MessageEventPtr e11 = get_event(coregion3,MscPoint(0,5));
+ MessageEventPtr e12 = get_event(coregion3,MscPoint(0,15));
//messages
@@ -573,10 +563,10 @@
instance1->add_area(strict1);
instance2->add_area(strict2);
- EventPtr e1 = get_event(strict1,MscPoint(0,15));
- EventPtr e2 = get_event(strict1,MscPoint(0,35));
- EventPtr e3 = get_event(strict2,MscPoint(0,15));
- EventPtr e4 = get_event(strict2,MscPoint(0,35));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,15));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,35));
+ MessageEventPtr e3 = get_event(strict2,MscPoint(0,15));
+ MessageEventPtr e4 = get_event(strict2,MscPoint(0,35));
//Comments
e1->add_comment(get_comment(MscPoint(27,-258)));
@@ -614,10 +604,10 @@
instance1->add_area(strict1);
instance2->add_area(strict2);
- EventPtr e1 = get_event(strict1,MscPoint(0,15));
- EventPtr e2 = get_event(strict1,MscPoint(0,35));
- EventPtr e3 = get_event(strict2,MscPoint(0,15));
- EventPtr e4 = get_event(strict2,MscPoint(0,35));
+ MessageEventPtr e1 = get_event(strict1,MscPoint(0,15));
+ MessageEventPtr e2 = get_event(strict1,MscPoint(0,35));
+ MessageEventPtr e3 = get_event(strict2,MscPoint(0,15));
+ MessageEventPtr e4 = get_event(strict2,MscPoint(0,35));
//absolute time
AbsoluteTimePtr ab1 = get_absTime(e1,MscPoint(25,-258),MscPoint(23,-245));
@@ -654,18 +644,18 @@
instance1->add_area(coregion1);
- EventPtr e1 = get_event(coregion1,MscPoint(10,6));
- EventPtr e2 = get_event(coregion1,MscPoint(10,13));
- EventPtr e3 = get_event(coregion1,MscPoint(0,16));
- EventPtr e4 = get_event(coregion1,MscPoint(0,23));
- EventPtr e5 = get_event(coregion1,MscPoint(0,31));
- EventPtr e6 = get_event(coregion1,MscPoint(10,40));
- EventPtr e7 = get_event(coregion1,MscPoint(10,48));
- EventPtr e8 = get_event(coregion1,MscPoint(0,51));
- EventPtr e9 = get_event(coregion1,MscPoint(10,60));
- EventPtr e10 = get_event(coregion1,MscPoint(0,71));
- EventPtr e11 = get_event(coregion1,MscPoint(0,78));
- EventPtr e12 = get_event(coregion1,MscPoint(10,78));
+ MessageEventPtr e1 = get_event(coregion1,MscPoint(10,6));
+ MessageEventPtr e2 = get_event(coregion1,MscPoint(10,13));
+ MessageEventPtr e3 = get_event(coregion1,MscPoint(0,16));
+ MessageEventPtr e4 = get_event(coregion1,MscPoint(0,23));
+ MessageEventPtr e5 = get_event(coregion1,MscPoint(0,31));
+ MessageEventPtr e6 = get_event(coregion1,MscPoint(10,40));
+ MessageEventPtr e7 = get_event(coregion1,MscPoint(10,48));
+ MessageEventPtr e8 = get_event(coregion1,MscPoint(0,51));
+ MessageEventPtr e9 = get_event(coregion1,MscPoint(10,60));
+ MessageEventPtr e10 = get_event(coregion1,MscPoint(0,71));
+ MessageEventPtr e11 = get_event(coregion1,MscPoint(0,78));
+ MessageEventPtr e12 = get_event(coregion1,MscPoint(10,78));
IncompleteMessagePtr im1 = get_im(e1,MscPoint(20,0));
IncompleteMessagePtr im2 = get_im(e2,MscPoint(20,0));
@@ -680,12 +670,13 @@
IncompleteMessagePtr im11 = get_im(e11,MscPoint(-20,0),FOUND);
IncompleteMessagePtr im12 = get_im(e12,MscPoint(20,0));
- get_order(e1,e2);
- get_order(e3,e4);
- get_order(e5,e6);
- get_order(e7,e8);
- get_order(e9,e10);
- get_order(e11,e12);
+ coregion1->add_successor_rel(e1.get(),e2.get());
+ coregion1->add_successor_rel(e1.get(),e2.get());
+ coregion1->add_successor_rel(e3.get(),e4.get());
+ coregion1->add_successor_rel(e5.get(),e6.get());
+ coregion1->add_successor_rel(e7.get(),e8.get());
+ coregion1->add_successor_rel(e9.get(),e10.get());
+ coregion1->add_successor_rel(e11.get(),e12.get());
msc.push_back(bmsc);
}
Modified: trunk/tests/exporttex_position_test/exporttex_position_test.tex.result
===================================================================
--- trunk/tests/exporttex_position_test/exporttex_position_test.tex.result 2013-04-15 05:40:35 UTC (rev 1746)
+++ trunk/tests/exporttex_position_test/exporttex_position_test.tex.result 2013-04-28 19:42:04 UTC (rev 1747)
@@ -84,17 +84,22 @@
\dummyinst{2_inst}
\setlength{\instdist}{\instanceSpaceC}
\dummyinst{3_inst}
+
\create{}{}{3_inst}{4}{}
\nextlevel
+
\create{}{}{2_inst}{3}{}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\stop*{1_inst}
\setlength{\levelheight}{\levelC}
\nextlevel
+
\stop*{2_inst}
\setlength{\levelheight}{\levelD}
\nextlevel
+
\stop*{0_inst}
\end{msc}
\newpage
@@ -135,6 +140,8 @@
%%%% Slope:
\def\slopeA{0mm*\real{\mscScaleY}}
+
+
%%%% Width od time interval:
\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
@@ -169,38 +176,47 @@
\declinst{1_inst}{2}{}
\setlength{\instdist}{\instanceSpaceB}
\declinst{2_inst}{3}{}
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{2_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{2_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{2_inst}[0.3]{0_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelD}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{1_inst}[0.3]{2_inst}
\end{msc}
@@ -249,6 +265,8 @@
\def\slopeE{7mm*\real{\mscScaleY}}
\def\slopeF{8mm*\real{\mscScaleY}}
\def\slopeG{\levelE}
+
+
%%%% Width od time interval:
\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
@@ -280,46 +298,62 @@
\declinst{0_inst}{1}{}
\declinst{1_inst}{2}{}
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\slopeD}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelA}
\nextlevel
+
\nextlevel
+
\setlength{\levelheight}{10mm}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeD}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeE}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\levelD}
\nextlevel
+
\setlength{\levelheight}{\slopeF}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\levelE}
\nextlevel
+
\setlength{\levelheight}{20mm}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\end{msc}
@@ -373,6 +407,8 @@
\def\slopeI{\levelF}
\def\slopeJ{5mm*\real{\mscScaleY}}
\def\slopeK{\levelA+\levelB+\slopeJ+\levelB+\levelF+\levelB+\levelF}
+
+
%%%% Width od time interval:
\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
@@ -404,65 +440,85 @@
\declinst{0_inst}{1}{}
\declinst{1_inst}{2}{}
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeB}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\slopeC}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\levelC}
\nextlevel
+
\nextlevel
+
\setlength{\levelheight}{6mm}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\slopeE}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\slopeE}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelD}
\nextlevel
+
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\slopeJ}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\slopeJ}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelE}
\nextlevel
+
\setlength{\levelheight}{\levelF}
\nextlevel
+
\setlength{\levelheight}{\slopeH}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\levelF}
\nextlevel
+
\setlength{\levelheight}{3mm}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\setlength{\levelheight}{\levelB}
\nextlevel
+
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
\nextlevel
+
\nextlevel
+
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{33mm}
\mess{hi1}{0_inst}[0.3]{1_inst}[-1]
\end{msc}
\newpage
-\setmsckeyword{Lost\_Found message test}
+\setmsckeyword{Lost/Found message test}
\begin{msc}{}
@@ -539,42 +595,54 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\declinst{0_inst}{1}{}
+
\setlength{\selfmesswidth}{\lostFoundWidthA}
\lost[r]{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\lost[r]{im}{}[\incSlopeB]{0_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\lost[r]{im}{}[\incSlopeC]{0_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\found{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\found{im}{}[\incSlopeD]{0_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\found{im}{}{0_inst}
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\selfmesswidth}{\lostFoundWidthB}
\lost{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\selfmesswidth}{\lostFoundWidthC}
\lost{im}{}[\incSlopeD]{0_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\selfmesswidth}{\lostFoundWidthD}
\lost{im}{}{0_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\selfmesswidth}{\lostFoundWidthE}
\found[r]{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\setlength{\selfmesswidth}{\lostFoundWidthC}
\found[r]{im}{}[\incSlopeF]{0_inst}
\nextlevel
+
\setlength{\selfmesswidth}{\lostFoundWidthF}
\found[r]{im}{}[\incSlopeG]{0_inst}
\end{msc}
@@ -614,6 +682,8 @@
%%%% Slope:
\def\slopeA{0mm*\real{\mscScaleY}}
+
+
%%%% Width od time interval:
\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
@@ -650,6 +720,7 @@
\declinst{0_inst}{1}{}
\declinst{1_inst}{2}{}
+
\setlength{\levelheight}{\timeIntervalSlopeA}
\setlength{\selfmesswidth}{\timeIntervalWidthA}
\measure[l]{[0,inf)}{0_inst}{0_inst}[1]
@@ -659,6 +730,7 @@
\setlength{\levelheight}{\timeIntervalSlopeA}
\measure[r]{[0,inf)}{1_inst}{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\timeIntervalSlopeB}
\measure[l]{[0,inf)}{0_inst}[yes]{0_inst}[1]
\measure[r]{[0,inf)}{0_inst}{0_inst}[1]
@@ -667,6 +739,7 @@
\setlength{\levelheight}{\timeIntervalSlopeB}
\measure[l]{[0,inf)}{1_inst}{1_inst}[1]
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\timeIntervalSlopeC}
@@ -751,20 +824,26 @@
\declinst{0_inst}{1}{}
\declinst{1_inst}{2}{}
+
\regionstart{coregion}{0_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
+
\regionstart{coregion}{1_inst}[\coregionWidthC]
\setlength{\levelheight}{\coregionLastA}
\nextlevel
+
\regionend{0_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\regionstart{coregion}{0_inst}[\coregionWidthB]
\setlength{\levelheight}{\coregionLastB}
\nextlevel
+
\regionend{1_inst}
\nextlevel
+
\regionend{0_inst}
\end{msc}
\newpage
@@ -807,6 +886,8 @@
\def\slopeA{0mm*\real{\mscScaleY}}
\def\slopeB{\levelB+\coregionFirstB+\levelC+\levelA+\coregionLastA+\levelD+\levelA}
\def\slopeC{\levelA+\coregionLastA+\levelD+\levelA+\coregionLastA+\levelA}
+
+
%%%% Coregin first levels:
\def\coregionFirstA{2mm*\real{\mscScaleY}}
\def\coregionFirstB{3mm*\real{\mscScaleY}}
@@ -857,52 +938,66 @@
\declinst{1_inst}{2}{}
\setlength{\instdist}{\instanceSpaceB}
\declinst{2_inst}{3}{}
+
\setlength{\levelheight}{\slopeB}
\mess{hi1}{2_inst}[0.3]{0_inst}[1][\coregionWidthA*\real{0.5}]
\setlength{\levelheight}{\levelA}
\nextlevel
+
\regionstart{coregion}{0_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\slopeB}
\mess{hi1}{0_inst}[0.3]{1_inst}[1][\coregionWidthA*\real{0.5}]
\setlength{\levelheight}{\levelB}
\nextlevel
+
\regionstart{coregion}{1_inst}
\setlength{\levelheight}{\coregionFirstB}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{1_inst}[0.3]{0_inst}
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\levelheight}{\slopeC}
\mess{hi1}{1_inst}[0.3]{2_inst}[1][\coregionWidthA*\real{0.5}]
\setlength{\levelheight}{\levelA}
\nextlevel
+
\regionstart{coregion}{2_inst}
\setlength{\levelheight}{\coregionLastA}
\nextlevel
+
\regionend{0_inst}
\setlength{\levelheight}{\levelD}
\nextlevel
+
\setlength{\levelheight}{\slopeA}
\mess{hi1}{1_inst}[0.3]{2_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\coregionLastA}
\nextlevel
+
\regionend{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\levelheight}{\coregionLastB}
\nextlevel
+
\regionend{2_inst}
\end{msc}
\newpage
@@ -940,6 +1035,8 @@
%%%% Slope:
\def\slopeA{0mm*\real{\mscScaleY}}
+
+
%%%% Width of comment:
\def\commentWidthA{3mm*\real{\mscScaleX}}
\def\commentWidthC{5mm*\real{\mscScaleX}}
@@ -987,6 +1084,7 @@
\mscglobalcomment{Comment}(4,-2.5)
\declinst{0_inst}{1}{}
\declinst{1_inst}{2}{}
+
\setlength{\msccommentdist}{\commentWidthA}
\setlength{\levelheight}{\commentSlopeA}
\msccomment{Comment}{0_inst}[-1]
@@ -997,6 +1095,7 @@
\msccomment[r]{Comment}{1_inst}[-1]
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\msccommentdist}{\commentWidthB}
\setlength{\levelheight}{\commentSlopeB}
\msccomment{Comment}{0_inst}[-1]
@@ -1041,6 +1140,8 @@
%%%% Slope:
\def\slopeA{0mm*\real{\mscScaleY}}
+
+
%%%% Width of absolute time:
\def\absoluteTimeWidthF{3mm*\real{\mscScaleX}}
\def\absoluteTimeWidthE{4mm*\real{\mscScaleX}}
@@ -1093,6 +1194,7 @@
\declinst{0_inst}{1}{}
\declinst{1_inst}{2}{}
+
\setlength{\selfmesswidth}{\absoluteTimeWidthA}
\setlength{\markdist}{\absoluteTimeSlopeA}
\mscmark[tl]{@[0]}{0_inst}
@@ -1109,6 +1211,7 @@
\mscmark[br]{@[0]}{1_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\setlength{\selfmesswidth}{\absoluteTimeWidthB}
\setlength{\markdist}{\absoluteTimeSlopeC}
\mscmark[tr]{@[0]}{0_inst}
@@ -1213,53 +1316,67 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\declinst{0_inst}{1}{}
+
\regionstart{coregion}{0_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
+
\setlength{\levelheight}{\orderSlopeA}
\setlength{\selfmesswidth}{\orderingWidthA}
\order*[r]{0_inst}{0_inst}[1]
+\order*[r]{0_inst}{0_inst}[1]
\setlength{\selfmesswidth}{\lostFoundWidthA}
\lost[r]{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\lost[r]{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelB}
\nextlevel
+
\setlength{\levelheight}{\orderSlopeA}
\setlength{\selfmesswidth}{\orderingWidthA}
\order*[l]{0_inst}{0_inst}[1]
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\found{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\levelheight}{\orderSlopeB}
\order*[l]{0_inst}[yes]{0_inst}[1]
\found{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\lost[r]{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelC}
\nextlevel
+
\setlength{\levelheight}{\orderSlopeC}
\order*[r]{0_inst}[yes]{0_inst}[1]
\lost[r]{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\found{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelD}
\nextlevel
+
\setlength{\levelheight}{\orderSlopeD}
\order*[r]{0_inst}[yes]{0_inst}[1]
\lost[r]{im}{}[\incSlopeA]{0_inst}
\nextlevel
+
\found{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\levelA}
\nextlevel
+
\order[l][yes]{0_inst}{0_inst}[0]
\found{im}{}[\incSlopeA]{0_inst}
\lost[r]{im}{}[\incSlopeA]{0_inst}
\setlength{\levelheight}{\coregionLastA}
\nextlevel
+
\regionend{0_inst}
\end{msc}
\newpage
@@ -1327,17 +1444,17 @@
\hmscendsymbol{6}(1.5,4.3)
\hmscreference{7}{HMsc reference}(9,4.1)
\hmscendsymbol{8}(7,1.5)
-\arrow{0}[]{1}
-\arrow{1}[]{2}
-\arrow{1}[]{3}
-\arrow{2}[]{4}
+\arrow{0}{1}
+\arrow{1}{2}
+\arrow{1}{3}
+\arrow{2}{4}
\hmscmeasure{[0,inf)}[\timeintervalWidthA]{3}[bottom]{5}[top]
-\arrow{3}[]{5}
+\arrow{3}{5}
\hmscmeasure{[0,inf)}[\timeintervalWidthA]{4}[top]{4}[bottom]
-\arrow{4}[]{6}
+\arrow{4}{6}
\hmscmeasure[yes]{[0,inf)}[\timeintervalWidthA]{5}[top]{7}[bottom]
-\arrow{5}[]{7}
-\arrow{7}[]{8}
+\arrow{5}{7}
+\arrow{7}{8}
\end{hmsc}
\newpage
\setmsckeyword{HMsc reference}
@@ -1391,5 +1508,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\declinst{0_inst}{1}{}
+
\end{msc}
\end{document}
Modified: trunk/tests/exporttex_test/CMakeLists.txt
===================================================================
--- trunk/tests/exporttex_test/CMakeLists.txt 2013-04-15 05:40:35 UTC (rev 1746)
+++ trunk/tests/exporttex_test/CMakeLists.txt 2013-04-28 19:42:04 UTC (rev 1747)
@@ -1,155 +1,283 @@
FIND_PACKAGE(PythonInterp REQUIRED)
+
+
ADD_EXECUTABLE(exporttex_test
exporttex_test.cpp
)
+
+
TARGET_LINK_LIBRARIES(exporttex_test
sctex
scZ120
scbeautify
)
+
ADD_EXPORTTEX_TEST(exporttex_test00.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test01.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test02.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test02.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test03.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test04.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test05.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test05.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test06.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test07.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test08.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test08.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test09.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test10.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test11.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test12.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test11.mpr 1)
ADD_EXPORTTEX_TEST(exporttex_test13.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test14.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test15.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test16.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test17.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test17.mpr 1)
ADD_EXPORTTEX_TEST(exporttex_test18.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test19.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test20.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test19.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test20.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test21.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test22.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test23.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test24.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test25.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test26.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test27.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test28.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test29.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test30.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test31.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test32.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test33.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test34.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test33.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test34.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test35.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test36.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test37.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test38.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test39.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test40.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test41.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test41.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test42.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test43.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test44.mpr 1)
+
ADD_EXPORTTEX_TEST(exporttex_test45.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test46.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test47.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test48.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test49.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test50.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test51.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test52.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test53.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test54.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test55.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test56.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test57.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test58.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test59.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test60.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test61.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test62.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test63.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test64.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test65.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test66.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test67.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test68.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test69.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test70.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test71.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test72.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test73.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test74.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test75.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test76.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test77.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test78.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test79.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test80.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test81.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test82.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test83.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test84.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test85.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test86.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test87.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test88.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test89.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test90.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test91.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test92.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test93.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_test94.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time01.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time02.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time03.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time04.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time05.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time06.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time07.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time08.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time09.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time10.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time11.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time12.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time13.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time14.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time15.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time16.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time17.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time18.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time19.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time20.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time21.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time22.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time23.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time24.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time25.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time26.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time27.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time28.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time29.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time30.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time31.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time32.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time33.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time34.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time35.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time36.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time37.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time38.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time39.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time40.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time41.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time42.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time43.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time44.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time45.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time46.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time47.mpr 1)
-ADD_EXPORTTEX_TEST(exporttex_time48.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test47.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test49.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test50.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test51.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test52.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test53.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test54.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test55.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test56.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test58.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test59.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test60.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test61.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test62.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test63.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test64.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test65.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test66.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test67.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test68.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test69.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test70.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test72.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test73.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test74.mpr 1)
+
+ADD_EXPORTTEX_TEST(exporttex_test75.mpr 1)
+
+ADD_EXPORTTEX_TEST(export...
[truncated message content] |
