aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2023-11-02 13:54:28 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2023-11-02 13:54:28 -0400
commitc1c85bc114f1d21713394f78e095f71f9b146831 (patch)
treee1772e25533af09579f2834656d284f77e9a0c88 /org
parentnix, set versions: sisu-7.3.1; ruby-3.1 (diff)
fixes for >= ruby-3.2 (nix ruby set ruby-3.3)
Diffstat (limited to 'org')
-rw-r--r--org/abstraction.org7
-rw-r--r--org/config_nix.org2
2 files changed, 5 insertions, 4 deletions
diff --git a/org/abstraction.org b/org/abstraction.org
index 477a5869..e5300c72 100644
--- a/org/abstraction.org
+++ b/org/abstraction.org
@@ -5730,11 +5730,12 @@ module SiSU_AO_MiscArrangeText
else
para
end
- para=if para =~/^(?:code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|poem|alt|group|block|table)\{|^\}(?:code|box|poem|alt|group|block|table)/m
+ para=if para.to_s =~/^(?:code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|poem|alt|group|block|table)\{|^\}(?:code|box|poem|alt|group|block|table)/m
curly_braces(para)
else
para
end
+ para.to_s
end
def prepare_text
data=@data
@@ -5746,7 +5747,7 @@ module SiSU_AO_MiscArrangeText
data[0]=data[0].gsub(/^(SiSU\s*[\d.]*)$/,'% \1').
gsub(/^(sisu-[\d.]+)$/,'% \1')
end
- data.each.map do |para|
+ data=data.each.map do |para|
para=conditional_headings(para)
markup_blocks(para)
end.flatten
@@ -6112,7 +6113,7 @@ module SiSU_AO_Numbering
when :extract then Mx[:segname_prefix_auto_num_extract]
else '_'*dob.lv.to_i #should not occur
end
- if possible_seg_name =~/^[0-9]+?\.$/m #!~/[.,:-]+/
+ if possible_seg_name.to_s =~/^[0-9]+?\.$/m #!~/[.,:-]+/
possible_seg_name=possible_seg_name.
gsub(/\.$/,'')
end
diff --git a/org/config_nix.org b/org/config_nix.org
index 79e163cc..ca7bfc12 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -429,7 +429,7 @@ with pkgs; [
#+NAME: ruby_current
#+BEGIN_SRC nix
-<<ruby_version_3_1>>
+<<ruby_version_3_3>>
#+END_SRC
*** ruby next