1.1 --- a/lemon/lgf_reader.h	Thu Dec 01 09:05:47 2011 +0100
     1.2 +++ b/lemon/lgf_reader.h	Wed Jan 11 22:21:07 2012 +0100
     1.3 @@ -2148,7 +2148,7 @@
     1.4    /// reads the red and blue nodes from separate sections, and these
     1.5    /// sections can contain different set of maps.
     1.6    ///
     1.7 -  /// The red and blue maps are read from the corresponding
     1.8 +  /// The red and blue node maps are read from the corresponding
     1.9    /// sections. If a map is defined with the same name in both of
    1.10    /// these sections, then it can be read as a node map.
    1.11    template <typename BGR>
    1.12 @@ -2337,9 +2337,9 @@
    1.13        return *this;
    1.14      }
    1.15  
    1.16 -    /// Add a red map reading rule to the reader.
    1.17 +    /// Add a red node map reading rule to the reader.
    1.18      template <typename Map>
    1.19 -    BpGraphReader& redMap(const std::string& caption, Map& map) {
    1.20 +    BpGraphReader& redNodeMap(const std::string& caption, Map& map) {
    1.21        checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    1.22        _reader_bits::MapStorageBase<Node>* storage =
    1.23          new _reader_bits::MapStorage<Node, Map>(map);
    1.24 @@ -2347,13 +2347,13 @@
    1.25        return *this;
    1.26      }
    1.27  
    1.28 -    /// \brief Red map reading rule
    1.29 +    /// \brief Red node map reading rule
    1.30      ///
    1.31 -    /// Add a red map reading rule with specialized converter to the
    1.32 -    /// reader.
    1.33 +    /// Add a red node map node reading rule with specialized converter to
    1.34 +    /// the reader.
    1.35      template <typename Map, typename Converter>
    1.36 -    BpGraphReader& redMap(const std::string& caption, Map& map,
    1.37 -                          const Converter& converter = Converter()) {
    1.38 +    BpGraphReader& redNodeMap(const std::string& caption, Map& map,
    1.39 +                              const Converter& converter = Converter()) {
    1.40        checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    1.41        _reader_bits::MapStorageBase<Node>* storage =
    1.42          new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
    1.43 @@ -2361,9 +2361,9 @@
    1.44        return *this;
    1.45      }
    1.46  
    1.47 -    /// Add a blue map reading rule to the reader.
    1.48 +    /// Add a blue node map reading rule to the reader.
    1.49      template <typename Map>
    1.50 -    BpGraphReader& blueMap(const std::string& caption, Map& map) {
    1.51 +    BpGraphReader& blueNodeMap(const std::string& caption, Map& map) {
    1.52        checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    1.53        _reader_bits::MapStorageBase<Node>* storage =
    1.54          new _reader_bits::MapStorage<Node, Map>(map);
    1.55 @@ -2371,13 +2371,13 @@
    1.56        return *this;
    1.57      }
    1.58  
    1.59 -    /// \brief Blue map reading rule
    1.60 +    /// \brief Blue node map reading rule
    1.61      ///
    1.62 -    /// Add a blue map reading rule with specialized converter to the
    1.63 -    /// reader.
    1.64 +    /// Add a blue node map reading rule with specialized converter to
    1.65 +    /// the reader.
    1.66      template <typename Map, typename Converter>
    1.67 -    BpGraphReader& blueMap(const std::string& caption, Map& map,
    1.68 -                           const Converter& converter = Converter()) {
    1.69 +    BpGraphReader& blueNodeMap(const std::string& caption, Map& map,
    1.70 +                               const Converter& converter = Converter()) {
    1.71        checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    1.72        _reader_bits::MapStorageBase<Node>* storage =
    1.73          new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
    1.74 @@ -2684,7 +2684,7 @@
    1.75          while (_reader_bits::readToken(line, map)) {
    1.76            if (maps.find(map) != maps.end()) {
    1.77              std::ostringstream msg;
    1.78 -            msg << "Multiple occurence of red map: " << map;
    1.79 +            msg << "Multiple occurence of red node map: " << map;
    1.80              throw FormatError(msg.str());
    1.81            }
    1.82            maps.insert(std::make_pair(map, index));
    1.83 @@ -2777,7 +2777,7 @@
    1.84          while (_reader_bits::readToken(line, map)) {
    1.85            if (maps.find(map) != maps.end()) {
    1.86              std::ostringstream msg;
    1.87 -            msg << "Multiple occurence of blue map: " << map;
    1.88 +            msg << "Multiple occurence of blue node map: " << map;
    1.89              throw FormatError(msg.str());
    1.90            }
    1.91            maps.insert(std::make_pair(map, index));