From 9a2448e9a3ba42bd9e84828908c0517379517d6d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 15 Feb 2011 20:44:41 -0500 Subject: css, fix css paths for xhtml, xml dom & xml sax --- lib/sisu/v3/sysenv.rb | 23 ++++++++++++++++++++++- lib/sisu/v3/xhtml.rb | 4 ++-- lib/sisu/v3/xml.rb | 4 ++-- lib/sisu/v3/xml_dom.rb | 4 ++-- 4 files changed, 28 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index c3d16778..a7105d69 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -2911,7 +2911,7 @@ WOK '/' end end - def html_scroll_css + def default_output_css if @env.output_dir_structure.by_language_code? '../../' elsif @env.output_dir_structure.by_filetype? @@ -2920,6 +2920,15 @@ WOK '../' end end + def html_scroll_css + default_output_css + end + def xhtml_css + default_output_css + end + def xml_css + default_output_css + end def html_seg_css if @env.output_dir_structure.by_language_code? '../../../' @@ -3877,6 +3886,18 @@ WOK def xhtml_epub %{ } end + def epub + xhtml_epub + end + def xhtml + %{} + end + def xml_sax + %{} + end + def xml_dom + %{} + end end class Create_site < Info_env require "#{SiSU_lib}/css" # css.rb diff --git a/lib/sisu/v3/xhtml.rb b/lib/sisu/v3/xhtml.rb index 8710f2da..b1855653 100644 --- a/lib/sisu/v3/xhtml.rb +++ b/lib/sisu/v3/xhtml.rb @@ -353,11 +353,11 @@ WOK rdf=SiSU_XML_tags::RDF.new(@md) dir=SiSU_Env::Info_env.new @@xml[:head],@@xml[:body]=[],[] - css=SiSU_Env::CSS_select.new(@md).xhtml + css=SiSU_Env::CSS_stylesheet.new(@md) encoding=(@sys.locale =~/utf-?8/i) ? '' : '' @@xml[:open] =< +#{css.xhtml} #{rdf.comment_xml} WOK diff --git a/lib/sisu/v3/xml.rb b/lib/sisu/v3/xml.rb index 5dfd6e7b..a3767177 100644 --- a/lib/sisu/v3/xml.rb +++ b/lib/sisu/v3/xml.rb @@ -392,13 +392,13 @@ WOK rdf=SiSU_XML_tags::RDF.new(@md) dir=SiSU_Env::Info_env.new @@xml[:head],@@xml[:body]=[],[] - css=SiSU_Env::CSS_select.new(@md).xml_sax + css=SiSU_Env::CSS_stylesheet.new(@md) encoding=if @sys.locale =~/utf-?8/i; '' else '' end @@xml[:open] =< +#{css.xml_sax} #{rdf.comment_xml} WOK diff --git a/lib/sisu/v3/xml_dom.rb b/lib/sisu/v3/xml_dom.rb index 0fe44836..726e48d5 100644 --- a/lib/sisu/v3/xml_dom.rb +++ b/lib/sisu/v3/xml_dom.rb @@ -467,13 +467,13 @@ WOK def pre rdf=SiSU_XML_tags::RDF.new(@md) dir=SiSU_Env::Info_env.new - css=SiSU_Env::CSS_select.new(@md).xml_dom + css=SiSU_Env::CSS_stylesheet.new(@md) encoding=if @sys.locale =~/utf-?8/i; '' else '' end @@xml[:open] =< +#{css.xml_dom} #{rdf.comment_xml} WOK -- cgit v1.2.3