From 651c01a92dbbec65674fe3c73a6c82a936e73d91 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 26 May 2023 13:18:46 +0300
Subject: Add support for package-description, package-description-type, and
 changes-type package manifest values

---
 libbrep/package.cxx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'libbrep/package.cxx')

diff --git a/libbrep/package.cxx b/libbrep/package.cxx
index 152d1d8..e5e7767 100644
--- a/libbrep/package.cxx
+++ b/libbrep/package.cxx
@@ -60,9 +60,9 @@ namespace brep
            license_alternatives_type la,
            small_vector<string, 5> tp,
            small_vector<string, 5> kw,
-           optional<string> ds,
-           optional<text_type> dt,
-           string ch,
+           optional<typed_text> ds,
+           optional<typed_text> pds,
+           optional<typed_text> ch,
            optional<manifest_url> ur,
            optional<manifest_url> du,
            optional<manifest_url> su,
@@ -94,7 +94,7 @@ namespace brep
         topics (move (tp)),
         keywords (move (kw)),
         description (move (ds)),
-        description_type (move (dt)),
+        package_description (move (pds)),
         changes (move (ch)),
         url (move (ur)),
         doc_url (move (du)),
@@ -216,7 +216,17 @@ namespace brep
     for (const auto& k: keywords)
       k2 += ' ' + k;
 
-    return {move (k), move (k2), description ? *description : "", changes};
+    string d (description ? description->text : "");
+
+    if (package_description)
+    {
+      if (description)
+        d += ' ';
+
+      d += package_description->text;
+    }
+
+    return {move (k), move (k2), move (d), changes ? changes->text : ""};
   }
 
   // repository
-- 
cgit v1.1