dal_syntax, sisu syntax modification (insist on curly braces)

* enforce use of curly braces in markup, remove single word markup without curly
  braces
  (requested fix, Ben Armstrong (live-manual), problematic for technical
  writing)
* also removed some undocumented alternative markup attributes

3 files changed, 26 insertions, 18 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index a719aa7e..dfb374e3 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,6 +12,19 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.7.10.orig.tar.gz (2010-12-13:50/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
+  sisu_2.7.10.orig.tar.gz
+  sisu_2.7.10-1.dsc
+  sisu_2.7.10-1.diff.gz
+
+  * dal_syntax, (sisu syntax)
+    * enforce use of curly braces in markup, remove single word markup without
+      curly braces; 
+      (requested fix, Ben Armstrong (live-manual), problematic for technical
+      writing)
+    * removed some undocumented alternative markup attributes
+
 %% 2.7.9.orig.tar.gz (2010-12-09:49/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 37af4a6e..47b3ce14 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,6 +12,19 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.7.10.orig.tar.gz (2010-12-13:50/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
+  sisu_2.7.10.orig.tar.gz
+  sisu_2.7.10-1.dsc
+  sisu_2.7.10-1.diff.gz
+
+  * dal_syntax, (sisu syntax)
+    * enforce use of curly braces in markup, remove single word markup without
+      curly braces; 
+      (requested fix, Ben Armstrong (live-manual), problematic for technical
+      writing)
+    * removed some undocumented alternative markup attributes
+
 %% 2.7.9.orig.tar.gz (2010-12-09:49/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
   97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb
index 0422d7b3..ead284ce 100644
--- a/lib/sisu/v2/dal_syntax.rb
+++ b/lib/sisu/v2/dal_syntax.rb
@@ -249,30 +249,12 @@ module SiSU_Syntax
         "\\1#{Mx[:fa_cite_o]}\\2#{Mx[:fa_c_o]}cite#{Mx[:fa_c]}")                                                                                                       #cite /blockquote?
       dob.obj.gsub!(/(^|[^\\])\^\{(.+?)\}\^/m,
         "\\1#{Mx[:fa_superscript_o]}\\2#{Mx[:fa_superscript_c]}")                                                                                                      #superscript
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|\(|\>|\S)9\{(.+?)\}9/m,
-        "\\1#{Mx[:fa_superscript_o]}\\2#{Mx[:fa_superscript_c]}")                                                                                                      #superscript
       dob.obj.gsub!(/(^|[^\\]),\{(.+?)\},/m,
         "\\1#{Mx[:fa_subscript_o]}\\2#{Mx[:fa_subscript_c]}")                                                                                                          #subscript
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)6\{(.+?)\}6/m,
-        "\\1#{Mx[:fa_subscript_o]}\\2#{Mx[:fa_subscript_c]}")                                                                                                          #subscript
       dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\+\{(.+?)\}\+/m,
         "\\1#{Mx[:fa_insert_o]}\\2#{Mx[:fa_insert_c]}")                                                                                                                #inserted text
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)v\{(.+?)\}v/m,
-        "\\1#{Mx[:fa_insert_o]}\\2#{Mx[:fa_insert_c]}")                                                                                                                #inserted text
       dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)-\{(.+?)\}-/m,
         "\\1#{Mx[:fa_strike_o]}\\2#{Mx[:fa_strike_c]}")                                                                                                                #strikethrough - deleted text
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)x\{(.+?)\}x/m,
-        "\\1#{Mx[:fa_strike_o]}\\2#{Mx[:fa_strike_c]}")                                                                                                                #deleted text
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\*(\S+?)\*/,
-        "\\1#{@emph[:o]}\\2#{@emph[:c]}")                                                                                                                              #emphasise single word, watch
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\!(\S+?)\!/,
-        "\\1#{Mx[:fa_bold_o]}\\2#{Mx[:fa_bold_c]}")                                                                                                                    #bold single word, watch
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\/([\(\)a-zA-Z0-9']+?)\/([^a-zA-Z0-9]|[ ,.;:'"~$]|$)/,
-        "\\1#{Mx[:fa_italics_o]}\\2#{Mx[:fa_italics_c]}\\3")                                                                                                           #italics single word, watch
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)_(\S+?)_([.,!'")]?(?:\s|$))/,
-        "\\1#{Mx[:fa_underscore_o]}\\2#{Mx[:fa_underscore_c]}\\3")                                                                                                     #underscore single word, watch (made more complicated by url decoration escape tag (_url))
-      dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+)-([^{]\S+?)-( |$)/,
-        "\\1#{Mx[:fa_strike_o]}\\2#{Mx[:fa_strike_c]}\\3")                                                                                                             #underscore single word, watch
       dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>|\d+)\^(\S+?)\^/,
         "\\1#{Mx[:fa_superscript_o]}\\2#{Mx[:fa_superscript_c]}")                                                                                                      #superscript single word, watch digit added
       dob