upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 19:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Markup: allow simpler syntax for passing attributes to tag()

Browse Source
This commit is contained in:
Charles Dang 2025-03-17 17:49:18 -04:00
parent 4f163b2528
commit 20b43ea775
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/serialization/markup.hpp
View File

@ -21,9 +21,9 @@
#include "font/standard_colors.hpp"
#include "formatter.hpp"
#include <map>
#include <string>
#include <string_view>
#include <vector>
class config;
@ -55,32 +55,34 @@ std::string tag(std::string_view tag, Args&&... data)
return formatter() << "<" << tag << ">" << input << "</" << tag << ">";
}
/** @todo is it safe to use a string_view for both key and value */
using tag_attributes = std::vector<std::pair<std::string_view, std::string_view>>;
/**
* Wraps the given data in the specified tag.
*
* @param tag The tag ("b", "i", etc).
* @param attrs A map containing the attribute key-value pairs.
* @param attrs A vector containing the attribute key-value pairs.
* @param data The content to wrap with @a tag.
* Each argument must be writable to a stringstream.
*
*
* @note Special formatting characters in the input are not escaped.
* If such behavior is needed, it must be handled by the caller.
* If the concatenation of @a data results in an empty string,
* an empty string is returned in lieu of formatting tags.
*/
template<typename Value, typename... Args>
std::string tag(std::string_view tag, std::map<std::string_view, Value> attrs, Args&&... data)
template<typename... Args>
std::string tag(std::string_view tag, const tag_attributes& attrs, Args&&... data)
{
std::string input = (formatter() << ... << data);
if(input.empty()) return {};
std::stringstream outss;
outss << "<" << tag << " ";
std::stringstream ss;
ss << "<" << tag << " ";
for (const auto& [key, value] : attrs) {
outss << key << "='" << value << "' ";
ss << key << "='" << value << "' ";
}
outss << ">" << input << "</" << tag << ">";
return outss.str();
ss << ">" << input << "</" << tag << ">";
return ss.str();
}
/**
@ -95,7 +97,7 @@ std::string tag(std::string_view tag, std::map<std::string_view, Value> attrs, A
template<typename Value, typename... Args>
std::string span_attribute(std::string_view key, const Value& value, Args&&... data)
{
return tag("span", std::map{ std::pair{ key, value } }, std::forward<Args>(data)...);
return tag("span", {{ key, value }}, std::forward<Args>(data)...);
}
/**