Changeset 9950 for trunk/gsdl
- Timestamp:
- 2005-05-25T14:14:50+12:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/lib/display.cpp
r9593 r9950 1632 1632 text_tlist::iterator packageend = packagelist.end(); 1633 1633 mvalue *macrovalue = NULL; 1634 while ( (macrovalue == NULL) && (packagehere != packageend))1634 while (packagehere != packageend) 1635 1635 { 1636 1636 // first look in the currentmacros 1637 1637 macrovalue = currentmacros->macro_find(*packagehere, macroname); 1638 if (macrovalue == NULL) 1639 macrovalue = currentmacros->macro_find("Style", macroname); 1638 if (macrovalue != NULL) 1639 break; 1640 1641 macrovalue = currentmacros->macro_find("Style", macroname); 1642 if (macrovalue != NULL) 1643 break; 1640 1644 1641 1645 // look in the collection specific macros 1642 if (macrovalue == NULL) {1643 macrovalue = macro_find(collectionmacros,*packagehere,macroname); 1644 } 1646 macrovalue = macro_find(collectionmacros,*packagehere,macroname); 1647 if (macrovalue != NULL) 1648 break; 1645 1649 1646 1650 // and again in the collection specific package "Style" 1647 if (macrovalue == NULL) {1648 macrovalue = macro_find(collectionmacros,(char*)"Style",macroname); 1649 } 1651 macrovalue = macro_find(collectionmacros,(char*)"Style",macroname); 1652 if (macrovalue != NULL) 1653 break; 1650 1654 1651 1655 // look in the default macros 1652 if (macrovalue == NULL) {1653 macrovalue = macro_find(defaultmacros,*packagehere,macroname); 1654 } 1656 macrovalue = macro_find(defaultmacros,*packagehere,macroname); 1657 if (macrovalue != NULL) 1658 break; 1655 1659 1656 1660 // and again in the package "Style" 1657 if (macrovalue == NULL) { 1658 macrovalue = macro_find(defaultmacros,(char*)"Style",macroname); 1659 } 1660 1661 if (macrovalue == NULL) ++packagehere; 1661 macrovalue = macro_find(defaultmacros,(char*)"Style",macroname); 1662 if (macrovalue != NULL) 1663 break; 1664 ++packagehere; 1662 1665 } 1663 1666
Note:
See TracChangeset
for help on using the changeset viewer.