Changeset 1f344e6fc38e168234f6c370d06711930d5f9cd5

Timestamp:

10/25/09 22:56:41 (4 years ago)

Author:

Benjamin Herr <ben@…>

Parents:

78495c93fb3e39a9deb182aad5a6a5a79f86e5f6

Children:

b24d6e3f35e707fb850b2b22d7a9fe58cab8ad9f

git-committer:

Benjamin Herr <ben@0x539.de> / 2009-10-25T22:56:41Z+0100

Message:

htmlexport: avoid generating <span/>s with no classes for tagless chunks

Files:

• code/operations/operation-export-html.cpp (modified) (2 diffs)

code/operations/operation-export-html.cpp

@@ -142 +142 @@
                 while(!gtk_text_iter_is_end(&begin))
                 {
-                        last_node = last_node->add_child("span");
-
                         // add current tags as classes for CSS formatting
                         // (both for author of text and syntax highlighting)
                         Glib::ustring classes = get_current_tags(tags, &begin);
                         if(!classes.empty())
+                        {
+                                last_node = last_node->add_child("span");
                                 last_node->set_attribute("class", classes);
 
-                        // add mouseover "written by" popup
-                        InfTextUser* new_user
-                                = inf_text_gtk_buffer_get_author(
-                                        inf_buffer,
-                                        &begin);
-                        if(new_user)
-                        {
-                                last_node->set_attribute(
-                                        "title",
-                                        uprintf(_("written by: %s"),
+                                // add mouseover "written by" popup
+                                // this only needs to happen when there are tags,
+                                // because the presence of an author implies a tag
+                                InfTextUser* user
+                                        = inf_text_gtk_buffer_get_author(
+                                                inf_buffer,
+                                                &begin);
+                                if(user)
+                                {
+                                        char const* user_name =
                                                 inf_user_get_name(
-                                                        INF_USER(new_user))));
-                                users.insert(new_user);
+                                                        INF_USER(user));
+                                        last_node->set_attribute(
+                                                "title",
+                                                uprintf(_("written by: %s"),
+                                                        user_name));
+                                        users.insert(user);
+                                }
                         }
 
@@ -206 +211 @@
                         }
                         g_free(text);
-                        last_node = last_node->get_parent();
+
+                        // if we do not have any tags, we did not add classes
+                        // and consequently did not go into a new span
+                        if(!classes.empty())
+                                last_node = last_node->get_parent();
 
                         begin = next;