diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v2/dal_doc_str.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/epub_segments.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/html_scroll.rb | 8 | ||||
| -rw-r--r-- | lib/sisu/v2/html_segments.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 6 |
5 files changed, 6 insertions, 14 deletions
diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb index 88ddaec9..dc9a55b7 100644 --- a/lib/sisu/v2/dal_doc_str.rb +++ b/lib/sisu/v2/dal_doc_str.rb @@ -234,7 +234,7 @@ module SiSU_document_structure_extract @h={:head_=>heading,:cols=>cols,:widths=>col,:idx=>idx} elsif t_o=~/^\{table(?:~h)?(?:\s+\d+;?)?\}\n.+\Z/m m1,m2,hd=nil,nil,nil - tbl= /^\{table(?:~h)?(?:\s+\d+;?)?\}\n(.+)\Z/m.match(t_o)[1] #two table representations should be consolidated as one + tbl=/^\{table(?:~h)?(?:\s+\d+;?)?\}\n(.+)\Z/m.match(t_o)[1] #two table representations should be consolidated as one hd=((t_o =~/^\{table~h/) ? true : false) tbl,tags=extract_tags(tbl) rws=tbl.split(/\n/) diff --git a/lib/sisu/v2/epub_segments.rb b/lib/sisu/v2/epub_segments.rb index 6436612c..5f0b74d3 100644 --- a/lib/sisu/v2/epub_segments.rb +++ b/lib/sisu/v2/epub_segments.rb @@ -379,7 +379,7 @@ WOK end elsif dob.is =~/^(?:group|alt)$/ sto.para #fix this should be group type specific #FIX - elsif dob.is =~/^verse$/ + elsif dob.is=='verse' sto.verse elsif dob.is=='code' sto.code diff --git a/lib/sisu/v2/html_scroll.rb b/lib/sisu/v2/html_scroll.rb index 59a3ee42..a5ff9b00 100644 --- a/lib/sisu/v2/html_scroll.rb +++ b/lib/sisu/v2/html_scroll.rb @@ -147,13 +147,11 @@ module SiSU_HTML_scroll else sto.para end end - elsif dob.is =~/^(?:group|alt)$/m - sto.para #fix this should be group type specific #FIX - elsif dob.is =='group' + elsif dob.is=='group' sto.group - elsif dob.is =='alt' + elsif dob.is=='alt' sto.alt - elsif dob.is =='verse' + elsif dob.is=='verse' sto.verse elsif dob.is=='code' sto.code diff --git a/lib/sisu/v2/html_segments.rb b/lib/sisu/v2/html_segments.rb index 79aa699e..022a1d0c 100644 --- a/lib/sisu/v2/html_segments.rb +++ b/lib/sisu/v2/html_segments.rb @@ -373,7 +373,7 @@ module SiSU_HTML_seg sto.group elsif dob.is=='alt' sto.alt - elsif dob.is='verse' + elsif dob.is=='verse' sto.verse elsif dob.is=='code' sto.code diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 99d0beb1..ddb48bba 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1948,12 +1948,6 @@ WOK ? @rc['program_select']['odf_viewer'] \ : 'oowriter' #'odf-viewer','oowriter' end - def epub_viewer - ((defined? @rc['program_select']['epub_viewer']) \ - && @rc['program_select']['epub_viewer'] =~/\S\S+/) \ - ? @rc['program_select']['epub_viewer'] \ - : web_browser - end def manpage_generator ((defined? @rc['program_select']['man']) \ && @rc['program_select']['man'] =~/\S\S+/) \ |