diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/html_format.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v5/html_manifest.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/xhtml_epub2_format.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v6/html_format.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v6/html_manifest.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v6/xhtml_epub2_format.rb | 6 |
8 files changed, 16 insertions, 12 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 986932b9..235d4db5 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.0.orig.tar.xz sisu_5.7.0.orig.tar.xz sisu_5.7.0-1.dsc +* html, epub, set document body language + * html_format, label, re: object number object names * constants, remove ocn html leader (resulting hashtag #1 instead of #o1) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 50f3c72e..b41d171f 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.0.orig.tar.xz sisu_6.3.0.orig.tar.xz sisu_6.3.0-1.dsc +* html, epub, set document body language + * html_format, label, re: object number object names * constants, remove ocn html leader (resulting hashtag #1 instead of #o1) diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/v5/html_format.rb index 3cfa9268..75bacdc2 100644 --- a/lib/sisu/v5/html_format.rb +++ b/lib/sisu/v5/html_format.rb @@ -421,7 +421,7 @@ WOK #{rdf.metatag_html} #{@stylesheet.css_head} </head> -#{@vz.color_body} +<body lang="#{@md.opt.lng}"> <a name="top" id="top"></a>} end def concordance @@ -823,7 +823,7 @@ WOK #{rdf.metatag_html} #{@stylesheet.css_head_seg} </head> -#{@vz.color_body} +<body lang="#{@md.opt.lng}"> <a name="top" id="top"></a>} end def title_banner(title,subtitle,creator) diff --git a/lib/sisu/v5/html_manifest.rb b/lib/sisu/v5/html_manifest.rb index d2c1360f..de629d61 100644 --- a/lib/sisu/v5/html_manifest.rb +++ b/lib/sisu/v5/html_manifest.rb @@ -901,7 +901,7 @@ SiSU manifest: #{@md.title.full} <link rel="shortcut icon" href="#{@f.path_rel_links.html_scroll_css}_sisu/image_sys/rb7.ico" /> #{@stylesheet.css_head} </head> -<body lang="en" xml:lang="en"> +<body lang="#{@md.opt.lng}"> #{format_head_toc.seg_head_navigation_band(:manifest)} WOK if make.build.manifest_minitoc? diff --git a/lib/sisu/v5/xhtml_epub2_format.rb b/lib/sisu/v5/xhtml_epub2_format.rb index 751aa32b..4004a446 100644 --- a/lib/sisu/v5/xhtml_epub2_format.rb +++ b/lib/sisu/v5/xhtml_epub2_format.rb @@ -1330,7 +1330,7 @@ application/epub+zip <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> #{@css.xhtml_epub} </head> - #{@vz.color_body} + <body lang="#{@md.opt.lng}"> <div class="content"> <div class="substance"> <label class="ocn"><a href="#o#{dob.ocn}" class="lnkocn">#{dob.ocn}</a></label> @@ -1753,7 +1753,7 @@ output_epub_cont_seg.close <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> #{@css.xhtml_epub} </head> - #{@vz.color_body}} + <body lang="#{@md.opt.lng}">} end def concordance if @md.concord_make @@ -1837,7 +1837,7 @@ output_epub_cont_seg.close <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> #{@css.xhtml_epub} </head> - #{@vz.color_body}} + <body lang="#{@md.opt.lng}">} end def endnote_mark %{ diff --git a/lib/sisu/v6/html_format.rb b/lib/sisu/v6/html_format.rb index 61fedba1..a8e3fa28 100644 --- a/lib/sisu/v6/html_format.rb +++ b/lib/sisu/v6/html_format.rb @@ -422,7 +422,7 @@ WOK #{rdf.metatag_html} #{@stylesheet.css_head} </head> -#{@vz.color_body} +<body lang="#{@md.opt.lng}"> <a name="top" id="top"></a>} end def concordance @@ -824,7 +824,7 @@ WOK #{rdf.metatag_html} #{@stylesheet.css_head_seg} </head> -#{@vz.color_body} +<body lang="#{@md.opt.lng}"> <a name="top" id="top"></a>} end def title_banner(title,subtitle,creator) diff --git a/lib/sisu/v6/html_manifest.rb b/lib/sisu/v6/html_manifest.rb index 1ac7f4d4..3cc41b10 100644 --- a/lib/sisu/v6/html_manifest.rb +++ b/lib/sisu/v6/html_manifest.rb @@ -901,7 +901,7 @@ SiSU manifest: #{@md.title.full} <link rel="shortcut icon" href="#{@f.path_rel_links.html_scroll_css}_sisu/image_sys/rb7.ico" /> #{@stylesheet.css_head} </head> -<body lang="en" xml:lang="en"> +<body lang="#{@md.opt.lng}"> #{format_head_toc.seg_head_navigation_band(:manifest)} WOK if make.build.manifest_minitoc? diff --git a/lib/sisu/v6/xhtml_epub2_format.rb b/lib/sisu/v6/xhtml_epub2_format.rb index d654937e..73c5a1ab 100644 --- a/lib/sisu/v6/xhtml_epub2_format.rb +++ b/lib/sisu/v6/xhtml_epub2_format.rb @@ -1330,7 +1330,7 @@ application/epub+zip <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> #{@css.xhtml_epub} </head> - #{@vz.color_body} + <body lang="#{@md.opt.lng}"> <div class="content"> <div class="substance"> <label class="ocn"><a href="#o#{dob.ocn}" class="lnkocn">#{dob.ocn}</a></label> @@ -1753,7 +1753,7 @@ output_epub_cont_seg.close <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> #{@css.xhtml_epub} </head> - #{@vz.color_body}} + <body lang="#{@md.opt.lng}">} end def concordance if @md.concord_make @@ -1837,7 +1837,7 @@ output_epub_cont_seg.close <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> #{@css.xhtml_epub} </head> - #{@vz.color_body}} + <body lang="#{@md.opt.lng}">} end def endnote_mark %{ |