[1/2] thrift git commit: THRIFT-2826 html:standalone sometimes ignored Client: HTML Patch: Jens Geyer

[je...@apache.org]

Repository: thrift
Updated Branches:
  refs/heads/master 565ea0c49 -> e38f1e2dc


THRIFT-2826 html:standalone sometimes ignored
Client: HTML
Patch: Jens Geyer


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/38f2a2ae
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/38f2a2ae
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/38f2a2ae

Branch: refs/heads/master
Commit: 38f2a2aed3eace2a9c6e715a2dd7a98a13c76e95
Parents: 565ea0c
Author: Jens Geyer <je...@apache.org>
Authored: Fri Nov 14 22:28:38 2014 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Fri Nov 14 22:30:16 2014 +0100

----------------------------------------------------------------------
 compiler/cpp/src/generate/t_html_generator.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/38f2a2ae/compiler/cpp/src/generate/t_html_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_html_generator.cc b/compiler/cpp/src/generate/t_html_generator.cc
index 5b368bb..b8dfa2a 100644
--- a/compiler/cpp/src/generate/t_html_generator.cc
+++ b/compiler/cpp/src/generate/t_html_generator.cc
@@ -693,7 +693,7 @@ int t_html_generator::print_type(t_type* ttype) {
   } else {
     string prog_name = ttype->get_program()->get_name();
     string type_name = ttype->get_name();
-    f_out_ << "<a href=\"" << prog_name << ".html#";
+    f_out_ << "<a href=\"" << make_file_link(prog_name+".html") << "#";
     if (ttype->is_typedef()) {
       f_out_ << "Typedef_";
     } else if (ttype->is_struct() || ttype->is_xception()) {

[2/2] thrift git commit: THRIFT-2824 Flag to disable html escaping doctext Client: HTML Patch: Craig Peterson

[je...@apache.org]

THRIFT-2824 Flag to disable html escaping doctext
Client: HTML
Patch: Craig Peterson

This closes #266

commit 0df9592deb6dce477600f923745d6cdb113592ae
 Author: Craig Peterson <cp...@ancestry.com>
 Date: 2014-11-14T19:12:49Z

adding flag to allow unescaped html in doectexts


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/e38f1e2d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/e38f1e2d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/e38f1e2d

Branch: refs/heads/master
Commit: e38f1e2dc2aa5a3c232c54400a5609074f7c2476
Parents: 38f2a2a
Author: Jens Geyer <je...@apache.org>
Authored: Fri Nov 14 21:54:48 2014 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Fri Nov 14 22:31:22 2014 +0100

----------------------------------------------------------------------
 compiler/cpp/src/generate/t_html_generator.cc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/e38f1e2d/compiler/cpp/src/generate/t_html_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_html_generator.cc b/compiler/cpp/src/generate/t_html_generator.cc
index b8dfa2a..a79ed50 100644
--- a/compiler/cpp/src/generate/t_html_generator.cc
+++ b/compiler/cpp/src/generate/t_html_generator.cc
@@ -64,6 +64,10 @@ class t_html_generator : public t_generator {
     iter = parsed_options.find("standalone");
     standalone_ = (iter != parsed_options.end());
 
+	iter = parsed_options.find("noescape");
+	unsafe_ = (iter != parsed_options.end());
+
+
     escape_.clear();
     escape_['&']  = "&amp;";
     escape_['<']  = "&lt;";
@@ -112,6 +116,7 @@ class t_html_generator : public t_generator {
   input_type input_type_;
   std::map<std::string, int> allowed_markup;
   bool standalone_;
+  bool unsafe_;
 };
 
 
@@ -399,7 +404,11 @@ std::string t_html_generator::make_file_link( std::string filename) {
  */
 void t_html_generator::print_doc(t_doc* tdoc) {
   if (tdoc->has_doc()) {
-    f_out_ << escape_html(tdoc->get_doc()) << "<br/>";
+	if (unsafe_) {
+      f_out_ << tdoc->get_doc() << "<br/>";
+    } else {
+      f_out_ << escape_html(tdoc->get_doc()) << "<br/>";
+    }
   }
 }
 
@@ -1079,4 +1088,5 @@ void t_html_generator::generate_service(t_service* tservice) {
 THRIFT_REGISTER_GENERATOR(html, "HTML",
 "    standalone:      Self-contained mode, includes all CSS in the HTML files.\n"
 "                     Generates no style.css file, but HTML files will be larger.\n"
+"    noescape:        Do not escape html in doc text.\n"
 )