1 files changed, 32 insertions, 34 deletions
diff --git a/lib/sisu/v6/texpdf_format.rb b/lib/sisu/v6/texpdf_format.rb
index 56bb1c0b..47829581 100644
--- a/lib/sisu/v6/texpdf_format.rb
+++ b/lib/sisu/v6/texpdf_format.rb
@@ -1009,30 +1009,50 @@ module SiSU_TeX_Pdf
         tex_head_paper_landscape(tex_head_paper_dimensions)
       end
     end
-    def tex_head_pdftex_dvi
-      color=case @layout
-      when :portrait
+    def hyperlinks_monochrome
       <<-WOK
   colorlinks=true,
   urlcolor=myblack,
   filecolor=myblack,
   linkcolor=myblack,
-        WOK
-      when :landscape
+      WOK
+    end
+    def hyperlinks_colored
       <<-WOK
   colorlinks=true,
   urlcolor=myblue,    % \\href{...}{...}   external url
-  filecolor=mygreen,  % \\href{...}     local file
+  filecolor=mygreen,  % \\href{...}        local file
   linkcolor=myred,    % \\href{...} and \\pageref{...}
-        WOK
+      WOK
+    end
+    def hyperlinks_color?
+      case @layout
+      when :portrait  then hyperlinks_monochrome
+        if @env.texpdf_hyperlinks(@md.opt.act[:pdf_hyperlink_colors]).portrait != :na
+          case @env.texpdf_hyperlinks(@md.opt.act[:pdf_hyperlink_colors]).portrait
+          when :color then hyperlinks_colored
+          when :mono  then hyperlinks_monochrome
+          else p __LINE__.to_s + ':error'
+          end
+        else               hyperlinks_monochrome
+        end
+      when :landscape
+        if @env.texpdf_hyperlinks(@md.opt.act[:pdf_hyperlink_colors]).landscape != :na
+          case @env.texpdf_hyperlinks(@md.opt.act[:pdf_hyperlink_colors]).landscape
+          when :color then hyperlinks_colored
+          when :mono  then hyperlinks_monochrome
+          else p __LINE__.to_s + ':error'
+          end
+        else               hyperlinks_colored
+        end
       end
-      if @layout == :portrait \
-      or @layout == :landscape
-        <<-WOK
+    end
+    def tex_head_pdftex
+      <<-WOK
 \\usepackage{alltt}
 \\usepackage{thumbpdf}
 \\usepackage[#{@tex2pdf},
-  #{color.strip}
+  #{hyperlinks_color?.strip}
   pdftitle={#{@txt}},
   pdfauthor={#{@author}},
   pdfsubject={#{@subject}},
@@ -1068,28 +1088,6 @@ module SiSU_TeX_Pdf
 \\usepackage{url}
 %\\usepackage{breakurl}
         WOK
-      elsif @txt =~/dvi/
-      <<-WOK
-\\usepackage{alltt}
-  #{color.strip}
-  pageanchor=true,
-  plainpages=true,
-  pagebackref,
-  bookmarks=true,
-  bookmarksopen=true,
-  plainpages=false,
-]
-{hyperref}
-\\usepackage[usenames]{color}
-\\definecolor{myblack}{rgb}{0,0,0}
-\\definecolor{myred}{rgb}{0.75,0,0}
-\\definecolor{mygreen}{rgb}{0,0.5,0}
-\\definecolor{myblue}{rgb}{0,0,0.5}
-\\definecolor{mywhite}{rgb}{1,1,1}
-\\usepackage{url}
-%\\usepackage{breakurl}
-        WOK
-      end
     end
     def tex_head_codeblock(codeblock_box_type)
       codeblock_box=if codeblock_box_type=='listings'
@@ -1127,7 +1125,7 @@ module SiSU_TeX_Pdf
       <<-WOK
 #{tex_head_paper}
 #{tex_head_encode}
-#{tex_head_pdftex_dvi}
+#{tex_head_pdftex}
 #{tex_head_misc}
 #{tex_head_codeblock(codeblock_box_type)}
 \\setcounter{secnumdepth}{2}