From e54d00b5d0e4c974619dd919697894825e6ecdc4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 29 Nov 2010 13:37:21 -0500
Subject: html & css: ocn (object numbers) now link to themselves
* jumps to top of browser
* provides link url
(requested, Ben Armstrong (live-manual))
---
CHANGELOG_v2 | 38 +++++++++++++++++++++-----------------
data/doc/sisu/v2/CHANGELOG | 38 +++++++++++++++++++++-----------------
data/sisu/v2/v/version.yml | 4 ++--
lib/sisu/v2/css.rb | 4 ++++
lib/sisu/v2/html_format.rb | 2 +-
5 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index f18f250c..ef79bea5 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.9.orig.tar.gz (2010-11-11:45/4)
+%% 2.7.9.orig.tar.gz (2010-11-29:48/1)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
sisu_2.7.9.orig.tar.gz
sisu_2.7.9-1.dsc
@@ -21,7 +21,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
[debian freeze, fix]
* texpdf, use of monospace in headings causes table of contents breakage, fix
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
+
+ * html & css, ocn (object numbers) now link to themselves, clicking on one
+ places that object at the top of the browser and provides its url
+ (requested, Ben Armstrong (live-manual))
%% 2.7.8.orig.tar.gz (2010-10-25:43/1)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
@@ -46,21 +50,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
* internal links
* dal, exclude parentheses and square brackets from matching
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* html, remove space between link & following punctuation, parentheses &/or
square brackets
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* epub, remove space between link & following punctuation, parentheses &/or
square brackets
* html
* remove "copy @" mark
- (requested, Daniel Baumann)
+ (requested, Daniel Baumann (live-manual))
* segments, title banner (including "copy @" mark) configurable, boolean,
true/false (default false)
- (requested off option, Daniel Baumann)
+ (requested off option, Daniel Baumann (live-manual))
* quick ref links_guide configurable, boolean, true/false (default false)
- (requested off option, Daniel Baumann)
+ (requested off option, Daniel Baumann (live-manual))
* config.yml
* html, seg title banner, boolean true/false setting (commented out,
@@ -78,7 +82,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
* numbered codeblocks, fix, where codeblock opens with code{#
(requested fix needed by debian-live:live-manual, Ben Armstrong, Mark
- Schneider & Daniel Baumann)
+ Schneider & Daniel Baumann (live-manual))
* dal changes as required, flag markup request and number
* constants, provide vertical line symbol, use to separate numbered
codeblock from code
@@ -86,11 +90,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
* texpdf, first space following a bullet should be fixed width, fix
(used \enspace (0.5em))
- (requested fix and suggested latex solution, Ben Armstrong)
+ (requested fix and suggested latex solution, Ben Armstrong (live-manual))
* texpdf, bullet text, hanging indent, fix works for regular text (not
grouped text)
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* texpdf, codeblocks do not permit empty lines, fix
@@ -105,7 +109,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
[debian freeze, fix]
* texpdf, codeblocks, code-line continuation backslash dropped, fix
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* shared_metadata, odf, url characters to not match
@@ -140,7 +144,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
[debian freeze, fix]
* image scaling, requested fixes
- (behaviour testing & request by Mark Schneider)
+ (behaviour testing & request by Mark Schneider (live-manual))
* texpdf, scaling of images (below the set maximum size), fix
* odf:odt, incorporation and scaling of images, fix
* html (html_tune) scaling of images, fix
@@ -178,7 +182,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
[debian freeze, fix]
* hub, test whether user name set, fix
- (requested fix, provided by Ben Armstrong)
+ (requested fix, provided by Ben Armstrong (live-manual))
* epub, fix breakage where angle brackets used in used metadata header
@@ -199,12 +203,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
* texpdf
* provide line-break-points for long directory names
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* a5, increase headheight (11pt from 8pt)
* shared_metadata
* odt, fix breakage where angle brackets used in metadata headers
- (requested fix, Daniel Baumann)
+ (requested fix, Daniel Baumann (live-manual))
* a typo fix
* param, a few fixes (checks, aliases, typo)
@@ -290,7 +294,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
* html_format, epub_format: subtoc, footnote content bug (fix)
* odf: lt (<), gt (>) fix for codeblocks; & fix, messy
- (requested fix, Daniel Baumann)
+ (requested fix, Daniel Baumann (live-manual))
* epub_format, removed some title & author info, check
@@ -440,7 +444,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
sisu-pdf, sisu-html, sisu-odf, sisu-epub, sisu-txt, sisu-pg, sisu-sqlite
* monospace
- (requested feature Daniel Baumann)
+ (requested feature Daniel Baumann (live-manual))
* dal_syntax, constants, introduce #{ monospace }# tag
* monospace font for codeblocks and #{ monospace }# tag
* vim syntax, recognize #{ monospace }# tag
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 07deff41..6a96149c 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.9.orig.tar.gz (2010-11-11:45/4)
+%% 2.7.9.orig.tar.gz (2010-11-29:48/1)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
sisu_2.7.9.orig.tar.gz
sisu_2.7.9-1.dsc
@@ -21,7 +21,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
[debian freeze, fix]
* texpdf, use of monospace in headings causes table of contents breakage, fix
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
+
+ * html & css, ocn (object numbers) now link to themselves, clicking on one
+ places that object at the top of the browser and provides its url
+ (requested, Ben Armstrong (live-manual))
%% 2.7.8.orig.tar.gz (2010-10-25:43/1)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
@@ -46,21 +50,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
* internal links
* dal, exclude parentheses and square brackets from matching
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* html, remove space between link & following punctuation, parentheses &/or
square brackets
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* epub, remove space between link & following punctuation, parentheses &/or
square brackets
* html
* remove "copy @" mark
- (requested, Daniel Baumann)
+ (requested, Daniel Baumann (live-manual))
* segments, title banner (including "copy @" mark) configurable, boolean,
true/false (default false)
- (requested off option, Daniel Baumann)
+ (requested off option, Daniel Baumann (live-manual))
* quick ref links_guide configurable, boolean, true/false (default false)
- (requested off option, Daniel Baumann)
+ (requested off option, Daniel Baumann (live-manual))
* config.yml
* html, seg title banner, boolean true/false setting (commented out,
@@ -78,7 +82,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
* numbered codeblocks, fix, where codeblock opens with code{#
(requested fix needed by debian-live:live-manual, Ben Armstrong, Mark
- Schneider & Daniel Baumann)
+ Schneider & Daniel Baumann (live-manual))
* dal changes as required, flag markup request and number
* constants, provide vertical line symbol, use to separate numbered
codeblock from code
@@ -86,11 +90,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
* texpdf, first space following a bullet should be fixed width, fix
(used \enspace (0.5em))
- (requested fix and suggested latex solution, Ben Armstrong)
+ (requested fix and suggested latex solution, Ben Armstrong (live-manual))
* texpdf, bullet text, hanging indent, fix works for regular text (not
grouped text)
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* texpdf, codeblocks do not permit empty lines, fix
@@ -105,7 +109,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
[debian freeze, fix]
* texpdf, codeblocks, code-line continuation backslash dropped, fix
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* shared_metadata, odf, url characters to not match
@@ -140,7 +144,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
[debian freeze, fix]
* image scaling, requested fixes
- (behaviour testing & request by Mark Schneider)
+ (behaviour testing & request by Mark Schneider (live-manual))
* texpdf, scaling of images (below the set maximum size), fix
* odf:odt, incorporation and scaling of images, fix
* html (html_tune) scaling of images, fix
@@ -178,7 +182,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
[debian freeze, fix]
* hub, test whether user name set, fix
- (requested fix, provided by Ben Armstrong)
+ (requested fix, provided by Ben Armstrong (live-manual))
* epub, fix breakage where angle brackets used in used metadata header
@@ -199,12 +203,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
* texpdf
* provide line-break-points for long directory names
- (requested fix, Ben Armstrong)
+ (requested fix, Ben Armstrong (live-manual))
* a5, increase headheight (11pt from 8pt)
* shared_metadata
* odt, fix breakage where angle brackets used in metadata headers
- (requested fix, Daniel Baumann)
+ (requested fix, Daniel Baumann (live-manual))
* a typo fix
* param, a few fixes (checks, aliases, typo)
@@ -290,7 +294,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
* html_format, epub_format: subtoc, footnote content bug (fix)
* odf: lt (<), gt (>) fix for codeblocks; & fix, messy
- (requested fix, Daniel Baumann)
+ (requested fix, Daniel Baumann (live-manual))
* epub_format, removed some title & author info, check
@@ -440,7 +444,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
sisu-pdf, sisu-html, sisu-odf, sisu-epub, sisu-txt, sisu-pg, sisu-sqlite
* monospace
- (requested feature Daniel Baumann)
+ (requested feature Daniel Baumann (live-manual))
* dal_syntax, constants, introduce #{ monospace }# tag
* monospace font for codeblocks and #{ monospace }# tag
* vim syntax, recognize #{ monospace }# tag
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 5b067620..601713a3 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
:version: 2.7.9
-:date_stamp: 2010w45/4
-:date: "2010-11-11"
+:date_stamp: 2010w48/1
+:date: "2010-11-29"
:project: SiSU
diff --git a/lib/sisu/v2/css.rb b/lib/sisu/v2/css.rb
index 38913431..9856c0d0 100644
--- a/lib/sisu/v2/css.rb
+++ b/lib/sisu/v2/css.rb
@@ -261,6 +261,10 @@ WOK
color: #000000;
background-color: #f9f9aa;
}
+ a.lnkocn:link {
+ color: #777777;
+ text-decoration: none;
+ }
/*
a:hover {
border-bottom: 2px solid #777777;
diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb
index c4758c5f..89ee812f 100644
--- a/lib/sisu/v2/html_format.rb
+++ b/lib/sisu/v2/html_format.rb
@@ -82,7 +82,7 @@ module SiSU_HTML_Format
else
ocn_class='ocn'
@ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}"><a name="#{@ocn}">\\1</a></label>})
+ %{<label class="#{ocn_class}"><a name="#{@ocn}" href="##{@ocn}" class="lnk#{ocn_class}">\\1</a></label>})
end
end
def name
--
cgit v1.2.3