From 246249028ca362502f1aed56bc71aa3a4a71304d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 19 Mar 2015 17:48:58 -0400
Subject: c&d: ao regex matches, auto match possessives ending in 's
* header regex matches for bold & italics, auto match possessives
ending in 's
---
data/doc/sisu/CHANGELOG_v5 | 4 +++-
data/doc/sisu/CHANGELOG_v6 | 4 +++-
lib/sisu/current/ao_syntax.rb | 4 ++--
lib/sisu/develop/ao_syntax.rb | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 1a001213..ecb2a476 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -34,7 +34,7 @@ v2 branch is removed; it is available in sisu =< 3.3.2
--- HEAD ---
-** 5.8.0_pre_rel.orig.tar.xz (Open commit window: 2014-12-08; Pre-Release))
+** 5.8.0_pre_rel.orig.tar.xz (Open commits: 2014-12-08; Pre-Release 2015-03-23)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.8.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.8.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
@@ -100,6 +100,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
* sisu.org addition, modification, consider
+ * header regex matches for bold & italics auto match possessives ending in 's
+
** SiSU "UnFrozen" - prior to end of Debian Freeze
(upstream bugfix 5.7.2 intended for Jessie (packaged for Debian as 5.7.1-2)
was not accepted)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 06773a97..0a77a1f8 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -24,7 +24,7 @@ v2 branch is removed; it is available in sisu =< 3.3.2
--- HEAD ---
-** 6.4.0_pre_rel.orig.tar.xz (Open commit window: 2014-12-08; Pre-Release))
+** 6.4.0_pre_rel.orig.tar.xz (Open commits: 2014-12-08; Pre-Release 2015-03-23)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.4.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.4.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
@@ -120,6 +120,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
* sisu.org addition, modification, consider
+ * header regex matches for bold & italics auto match possessives ending in 's
+
** SiSU "UnFrozen" - prior to end of Debian Freeze
(upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
5.7.1-2) was not accepted)
diff --git a/lib/sisu/current/ao_syntax.rb b/lib/sisu/current/ao_syntax.rb
index 957a2c35..554daae5 100644
--- a/lib/sisu/current/ao_syntax.rb
+++ b/lib/sisu/current/ao_syntax.rb
@@ -88,8 +88,8 @@ module SiSU_AO_Syntax
@manmkp_ital=emph_italics \
? '[i/*]\\{.+?\\}[i/*]'
: '[i/]\\{.+?\\}[i/]'
- tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)}
- tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?}
+ tail_m_ital=%q{(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$)}
+ tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$))?}
bold_line=%{^!_\s.+?(?:#{Mx[:br_line]}|\n|$)}
#ital_line=%{^/_\s.+?(?:#{Mx[:br_line]}|\n|$)} #not implemented
@line_scan_ital=if defined? @md.italics_match_list[:str]
diff --git a/lib/sisu/develop/ao_syntax.rb b/lib/sisu/develop/ao_syntax.rb
index 1ffb7e67..5782f7d1 100644
--- a/lib/sisu/develop/ao_syntax.rb
+++ b/lib/sisu/develop/ao_syntax.rb
@@ -88,8 +88,8 @@ module SiSU_AO_Syntax
@manmkp_ital=emph_italics \
? '[i/*]\\{.+?\\}[i/*]'
: '[i/]\\{.+?\\}[i/]'
- tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)}
- tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?}
+ tail_m_ital=%q{(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$)}
+ tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$))?}
bold_line=%{^!_\s.+?(?:#{Mx[:br_line]}|\n|$)}
#ital_line=%{^/_\s.+?(?:#{Mx[:br_line]}|\n|$)} #not implemented
@line_scan_ital=if defined? @md.italics_match_list[:str]
--
cgit v1.2.3