From 9c64fde5c6736be55b30703cd4bed031195a6db5 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 31 Jul 2007 01:58:08 +0100
Subject: sisu 0.56.0 + md5s
---
CHANGELOG | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a1f61f66..d56859ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,9 +8,9 @@ Reverse Chronological:
%% sisu_0.56.0.orig.tar.gz (2007-07-31:31/2)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.0.orig.tar.gz
- sisu_0.56.0.orig.tar.gz
- sisu_0.56.0-1.dsc
- sisu_0.56.0-1.diff.gz
+ 66cf639776d75a30377f9f94d5c1c492 1271730 sisu_0.56.0.orig.tar.gz
+ 5018746e3bed9bc100a38b80a988ac65 606 sisu_0.56.0-1.dsc
+ a92042ff94487f516315a722348db633 142363 sisu_0.56.0-1.diff.gz
* same as 0.55.7 - use version number to flag (small) change to db structure
rebuilt with more significant version number to flag the likely need to
--
cgit v1.2.3
From c54fc5e3e12125b2f0ffc2cdbca6174eb46d6621 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 31 Jul 2007 15:40:02 +0100
Subject: endnote,url regex matching, refinement - still a limitation in mixed
use of shortcut
---
CHANGELOG | 8 ++++++++
lib/sisu/v0/dal_syntax.rb | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index d56859ed..b7f3df00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,14 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.56.1.orig.tar.gz (2007-07-31:31/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.1.orig.tar.gz
+ sisu_0.56.1.orig.tar.gz
+ sisu_0.56.1-1.dsc
+ sisu_0.56.1-1.diff.gz
+
+ * dal, endnote / url matching refinement
+
%% sisu_0.56.0.orig.tar.gz (2007-07-31:31/2)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.0.orig.tar.gz
66cf639776d75a30377f9f94d5c1c492 1271730 sisu_0.56.0.orig.tar.gz
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb
index 4fb0f5d3..23067ea6 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v0/dal_syntax.rb
@@ -236,8 +236,9 @@ module Syntax
line.gsub!(/\\\!/,'!') #escaped special character
line.gsub!(/(?:^| )\*~([a-z0-9._-]+)/i,' <:name#\1>') #html name marker <a name="\\1"></a>
line.gsub!(/^([56]~)(\S+)(.+)/,'\1\2 \3 <:name#\2>') #html name marker <a name="\\1"></a>, however at present takes you to correct position within sub-toc, will nneed to clean from sub-toc leaving in main body only
+ ##reversed, watch
+ line.gsub!(/(^| )\{~\^ (.+?)\s*\}((?:https?|ftp):\S+?)([;,.]?(?=\s[^~]|$))/,'\1{ \2 }\3\4 ~{ \3 }~ ') #text url endnote url shortcut {~^ [text] }http://url is { [text] }http://url ~{ http://url }~ [plus adjustment for commas] #means for this class, non-object, un-numbered ~# will not work # shortcut should not be used in conjunction with rebgular matches
line.gsub!(/(^| )\{~\^ (.+?)\s*\}((?:https?|ftp):\S+)\s+~\{(.+?)\}~/,'\1{ \2 }\3 ~{ \3 \4 }~') # watch
- line.gsub!(/(^| )\{~\^ (.+?)\s*\}((?:https?|ftp):\S+?)(,?)?(?:\s|$)/,'\1{ \2 }\3\4 ~{ \3 }~ ') #text url endnote url shortcut {~^ [text] }http://url is { [text] }http://url ~{ http://url }~ [plus adjustment for commas]
line.gsub!(/<:?br>/,'<br />') #xml requires
# depreciated -->
line.gsub!(/(^|\s+|['"]| |[\(\[\{]|\>)e\{(.+?)\}e/,'\1<b>\2</b>') #emphasis
--
cgit v1.2.3