Add support for package-description, package-description-type, and changes-type package manifest values

4 files changed, 31 insertions, 28 deletions

diff --git a/mod/mod-package-details.cxx b/mod/mod-package-details.cxx
index 13e6422..5cf0759 100644
--- a/mod/mod-package-details.cxx
+++ b/mod/mod-package-details.cxx
@@ -183,20 +183,20 @@ handle (request& rq, response& rs)
     //
     s << H2 << pkg->summary << ~H2;
 
-    if (const optional<string>& d = pkg->description)
+    if (const optional<typed_text>& d = pkg->package_description
+                                        ? pkg->package_description
+                                        : pkg->description)
     {
       const string id ("description");
       const string what (name.string () + " description");
 
       s << (full
             ? DIV_TEXT (*d,
-                        *pkg->description_type,
                         true /* strip_title */,
                         id,
                         what,
                         error)
             : DIV_TEXT (*d,
-                        *pkg->description_type,
                         true /* strip_title */,
                         options_->package_description (),
                         url (!full, squery, page, id),
diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx
index e47d9b4..3a8d8f4 100644
--- a/mod/mod-package-version-details.cxx
+++ b/mod/mod-package-version-details.cxx
@@ -189,20 +189,20 @@ handle (request& rq, response& rs)
 
   s << H2 << pkg->summary << ~H2;
 
-  if (const optional<string>& d = pkg->description)
+  if (const optional<typed_text>& d = pkg->package_description
+                                      ? pkg->package_description
+                                      : pkg->description)
   {
     const string id ("description");
     const string what (title + " description");
 
     s << (full
           ? DIV_TEXT (*d,
-                      *pkg->description_type,
                       true /* strip_title */,
                       id,
                       what,
                       error)
           : DIV_TEXT (*d,
-                      *pkg->description_type,
                       true /* strip_title */,
                       options_->package_description (),
                       url (!full, id),
@@ -886,19 +886,25 @@ handle (request& rq, response& rs)
     s << ~DIV;
   }
 
-  const string& ch (pkg->changes);
-
-  if (!ch.empty ())
+  if (const optional<typed_text>& c = pkg->changes)
   {
     const string id ("changes");
+    const string what (title + " changes");
 
     s << H3 << "Changes" << ~H3
       << (full
-          ? PRE_TEXT (ch, id)
-          : PRE_TEXT (ch,
+          ? DIV_TEXT (*c,
+                      false /* strip_title */,
+                      id,
+                      what,
+                      error)
+          : DIV_TEXT (*c,
+                      false /* strip_title */,
                       options_->package_changes (),
-                      url (!full, "changes"),
-                      id));
+                      url (!full, id),
+                      id,
+                      what,
+                      error));
   }
 
   s <<     ~DIV
diff --git a/mod/page.cxx b/mod/page.cxx
index a671346..331f919 100644
--- a/mod/page.cxx
+++ b/mod/page.cxx
@@ -953,14 +953,16 @@ namespace brep
   void DIV_TEXT::
   operator() (serializer& s) const
   {
-    switch (type_)
+    const string& t (text_.text);
+
+    switch (text_.type)
     {
     case text_type::plain:
       {
         // To keep things regular we wrap the preformatted text into <div>.
         //
         s << DIV(ID=id_, CLASS="plain");
-        serialize_pre_text (s, text_, length_, url_, "" /* id */);
+        serialize_pre_text (s, t, length_, url_, "" /* id */);
         s << ~DIV;
         break;
       }
@@ -980,9 +982,9 @@ namespace brep
         // calls to fail is the inability to allocate memory. Unfortunately,
         // instead of reporting the failure to the caller, the API issues
         // diagnostics to stderr and aborts the process. Let's decrease the
-        // probability of such an event by limiting the text size to 64K.
+        // probability of such an event by limiting the text size to 1M.
         //
-        if (text_.size () > 64 * 1024)
+        if (t.size () > 1024 * 1024)
         {
           print_error (what_ + " is too long");
           return;
@@ -1006,7 +1008,7 @@ namespace brep
 
             // Enable GitHub extensions in the parser, if requested.
             //
-            if (type_ == text_type::github_mark)
+            if (text_.type == text_type::github_mark)
             {
               auto add = [&parser] (const char* ext)
               {
@@ -1025,7 +1027,7 @@ namespace brep
               add ("autolink");
             }
 
-            cmark_parser_feed (parser.get (), text_.c_str (), text_.size ());
+            cmark_parser_feed (parser.get (), t.c_str (), t.size ());
 
             unique_ptr<cmark_node, void (*)(cmark_node*)> doc (
               cmark_parser_finish (parser.get ()),
diff --git a/mod/page.hxx b/mod/page.hxx
index 0a5d359..dc85230 100644
--- a/mod/page.hxx
+++ b/mod/page.hxx
@@ -591,16 +591,14 @@ namespace brep
   public:
     // Generate a full text element.
     //
-    DIV_TEXT (const string& t,
-              text_type tp,
+    DIV_TEXT (const typed_text& t,
               bool st,
               const string& id,
               const string& what,
               const basic_mark& diag)
         : text_ (t),
-          type_ (tp),
           strip_title_ (st),
-          length_ (t.size ()),
+          length_ (t.text.size ()),
           url_ (nullptr),
           id_ (id),
           what_ (what),
@@ -610,8 +608,7 @@ namespace brep
 
     // Generate a brief text element.
     //
-    DIV_TEXT (const string& t,
-              text_type tp,
+    DIV_TEXT (const typed_text& t,
               bool st,
               size_t l,
               const string& u,
@@ -619,7 +616,6 @@ namespace brep
               const string& what,
               const basic_mark& diag)
         : text_ (t),
-          type_ (tp),
           strip_title_ (st),
           length_ (l),
           url_ (&u),
@@ -633,8 +629,7 @@ namespace brep
     operator() (xml::serializer&) const;
 
   private:
-    const string& text_;
-    text_type type_;
+    const typed_text& text_;
     bool strip_title_;
     size_t length_;
     const string* url_; // Full page url.