diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-07-31 15:48:14 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-07-31 15:48:14 +0100 |
| commit | 05111719bf8168fc3becc3e3a19beac97c539a40 (patch) | |
| tree | 166186b1d9af85b00f80733d54c9131eeefe8c2d | |
| parent | Updated sisu-0.56.0 (diff) | |
| parent | endnote,url regex matching, refinement - still a limitation in mixed use of s... (diff) | |
Merge branch 'upstream' into debian/sid
| -rw-r--r-- | CHANGELOG | 14 | ||||
| -rw-r--r-- | lib/sisu/v0/dal_syntax.rb | 3 |
2 files changed, 13 insertions, 4 deletions
@@ -6,11 +6,19 @@ 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 - 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 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 |