Changeset 7cfad2e713662f0eeea22b5c5d19c6a9596c4413

Timestamp:

10/25/09 14:24:51 (4 years ago)

Author:

Benjamin Herr <ben@…>

git-author:

Benjamin Herr <ben@0x539.de> / 2009-01-16T21:27:01Z+0100

Parents:

ded2b4e54b49492e039d814453f12549e56ad518

Children:

63ca8047cee68d8fa40d41e4a02e1c38aad3726a

git-committer:

Benjamin Herr <ben@0x539.de> / 2009-10-25T14:24:51Z+0100

Message:

htmlexport: added "written by" tooltips, fixed (validation) warnings

Files:

• code/commands/file-commands.cpp (modified) (10 diffs)

code/commands/file-commands.cpp

@@ -226 +226 @@
 #include <ctime>
 #include <cstring>
+#include <cmath>
 
 #include <gtkmm/textbuffer.h>
@@ -242 +243 @@
   line_counter = 0;
         xmlpp::Element* last_node = content;
-        last_node->add_child("div")->set_attribute("class", "line_no");
-
-        //Glib::RefPtr<Gtk::TextBuffer> buffer(
-        //      Glib::wrap(
+        last_node->add_child("span")->set_attribute("class", "line_no");
+
         GtkTextBuffer* buffer = GTK_TEXT_BUFFER(document.get_text_buffer());
         InfTextGtkBuffer* inf_buffer
@@ -251 +250 @@
                                 inf_session_get_buffer(INF_SESSION(document.get_session())));
 
-        guint user_id;
-        bool user_active = false;
+        InfTextUser* user = 0;
 
         GtkTextIter begin;
@@ -260 +258 @@
                 return;
 
-        // TODO: I just made this use the Gtk+ API instead of Gtkmm at like 2 am,
-        //       surely there are a bunch of segfaults/memleaks lurking
         for (;;) {
                 GtkTextIter next = begin;
@@ -282 +278 @@
 
                                 // drop author <span/> for a moment for the line number <span/>
-                                if (user_active)
+                                if (user)
                                         last_node = last_node->get_parent();
                                 last_node
-                                  ->add_child("div")
+                                  ->add_child("span")
                                   ->set_attribute("class", "line_no");
-                                if (user_active) {
+                                if (user) {
                                         last_node = last_node->add_child("span");
                                         last_node->set_attribute(
                                                 "class",
-                                                Glib::ustring::compose("user_%1", user_id));
+                                                Glib::ustring::compose("user_%1",
+                                                                       inf_user_get_id(INF_USER(user))));
+                                        last_node->set_attribute(
+                                          "title",
+                                          Glib::ustring::compose(_("written by: %1"),
+                                                                 inf_user_get_name(INF_USER(user))));
                                 }
                         }
@@ -307 +308 @@
 
                 // check author, insert new <span/> if necessary
-                InfTextUser* user
+                InfTextUser* new_user
                         = inf_text_gtk_buffer_get_author(inf_buffer, &next);
 
-                if (user) {
-                        guint new_id = inf_user_get_id(INF_USER(user));
-                        if (!user_active || new_id != user_id) {
-                                if (user_active)
+                if (new_user) {
+                        guint new_id = inf_user_get_id(INF_USER(new_user));
+                        if (!user || user != new_user) {
+                                if (user)
                                         last_node = last_node->get_parent();
 
@@ -320 +321 @@
                                         "class",
                                         Glib::ustring::compose("user_%1", new_id));
+                                last_node->set_attribute(
+                                  "title",
+                                  Glib::ustring::compose(_("written by: %1"),
+                                                         inf_user_get_name(INF_USER(new_user))));
                         }
 
-                        user_id = new_id;
-                        user_active = true;
+                        user = new_user;
                         users.insert(user);
                 } else {
-                        if (user_active)
+                        if (user)
                                 last_node = last_node->get_parent();
-                        user_active = false;
+                        user = 0;
                 }
         }
@@ -381 +385 @@
                 guint id = inf_user_get_id(INF_USER(*i));
                 gdouble hue = inf_text_user_get_hue(*i);
-                if (hue == 1)
-                        hue = 0;
+                hue = std::fmod(hue, 1);
 
                 Gdk::Color c;
                 c.set_hsv(360.0 * hue, 0.35, 1.0);
                 gchar const* name = inf_user_get_name(INF_USER(*i));
-                // TODO: figure out if we can get "written by <name>" tooltips easily
                 unsigned int rgb =
                           ((c.get_red()   & 0xff00) << 8)
@@ -411 +413 @@
 void export_html(DocWindow& document, const Glib::ustring& output_path) {
         xmlpp::Document output;
+
+  output.set_internal_subset("html",
+    "-//W3C//DTD XHTML 1.1//EN",
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd");
+
         xmlpp::Element
                 * root      = output.create_root_node("html", "http://www.w3.org/1999/xhtml"),
@@ -478 +485 @@
           static_cast<unsigned int>(std::log(line_counter)/std::log(10))+1));
 
-        output.write_to_file(output_path);
+        output.write_to_file(output_path, "utf-8");
 }