summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-12-08 18:18:02 +0000
committerRalph Amissah <ralph@amissah.com>2010-12-08 18:18:10 +0000
commitca5f35171c87e9903f204213694c6635dec78cb0 (patch)
tree5ba3d13a4086a15e254b91ad4c19f4e13fafd4df
parentdocument manifest link (plaintext, odf) (diff)
downloadsisu-ca5f35171c87e9903f204213694c6635dec78cb0.zip
sisu-ca5f35171c87e9903f204213694c6635dec78cb0.tar.xz
dal, multiline-match to permit line-wrap on bullet text (and headings)
(requested fix, Ben Armstrong (live-manual))
-rw-r--r--CHANGELOG_v26
-rw-r--r--data/doc/sisu/v2/CHANGELOG6
-rw-r--r--data/sisu/v2/v/version.yml4
-rw-r--r--lib/sisu/v2/dal_doc_str.rb10
4 files changed, 17 insertions, 9 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index b7a1f9d..37ef801 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.9.orig.tar.gz (2010-12-07:49/2)
+%% 2.7.9.orig.tar.gz (2010-12-08:49/3)
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
@@ -20,6 +20,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
[debian freeze, fix]
+ * dal, bulleted text (and headings), multiline match, to permit line-wrapped
+ paragraphs
+ (requested fix, Ben Armstrong (live-manual))
+
* texpdf, use of monospace in headings causes table of contents breakage, fix
(requested fix, Ben Armstrong (live-manual))
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 2b21fb1..6a687fc 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-12-07:49/2)
+%% 2.7.9.orig.tar.gz (2010-12-08:49/3)
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
@@ -20,6 +20,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
[debian freeze, fix]
+ * dal, bulleted text (and headings), multiline match, to permit line-wrapped
+ paragraphs
+ (requested fix, Ben Armstrong (live-manual))
+
* texpdf, use of monospace in headings causes table of contents breakage, fix
(requested fix, Ben Armstrong (live-manual))
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index ff542dd..85592ab 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: 2010w49/2
-:date: "2010-12-07"
+:date_stamp: 2010w49/3
+:date: "2010-12-08"
:project: SiSU
diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb
index 6eb2ee6..f1282df 100644
--- a/lib/sisu/v2/dal_doc_str.rb
+++ b/lib/sisu/v2/dal_doc_str.rb
@@ -150,19 +150,19 @@ module SiSU_document_structure_extract
when /^:?([A-C1-6])\~/ #heading / lv
lv=$1
ln=ln_get(lv)
- t_o=if t_o=~/^:?[A-C1-6]\~\s+(.+)/
+ t_o=if t_o=~/^:?[A-C1-6]\~\s+(.+)/m
obj=$1
note=endnote_test?(obj)
obj,tags=extract_tags(obj)
h={:lv=>lv,:ln=>ln,:obj=>obj,:idx=>idx,:tags=>tags}
SiSU_document_structure::Object_heading.new.heading(h)
- elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/
+ elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/m
name,obj=$1,$2
note=endnote_test?(obj)
obj,tags=extract_tags(obj)
h={:lv=>lv,:name=>name,:obj=>obj,:idx=>idx,:autonum_=>false,:tags=>tags}
SiSU_document_structure::Object_heading.new.heading(h)
- elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/
+ elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/m
name,obj=$1,$2
note=endnote_test?(obj)
obj,tags=extract_tags(obj,name)
@@ -171,7 +171,7 @@ module SiSU_document_structure_extract
else nil
end
when /^(?:_[1-9]|_[1-9]?\*)\s+/ #indented and/or bullet paragraph
- t_o=if t_o=~/^(_(?:[1-9]?\*|[1-9])\s+)(.+)/
+ t_o=if t_o=~/^(_(?:[1-9]?\*|[1-9])\s+)(.+)/m
tst,obj=$1,$2
indent=indent_test(tst)
bullet=bullet_test(tst)
@@ -182,7 +182,7 @@ module SiSU_document_structure_extract
SiSU_document_structure::Object_para.new.paragraph(h)
else nil
end
- when /^(?:<?:p[bn]>?)\s*$/ #indented and/or bullet paragraph
+ when /^(?:<?:p[bn]>?)\s*$/
if t_o =~/^(?:<?:pn>?)\s*$/
SiSU_document_structure::Object_layout.new.break(Hx[:br_page_new])
else SiSU_document_structure::Object_layout.new.break(Hx[:br_page])