From 4cde4b1e014cf10e9ac3eaa64842faedf613f2d6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 24 Jul 2014 20:49:32 -0400 Subject: v5 v6: version & changelog (& rakefile) --- data/doc/sisu/CHANGELOG_v5 | 7 +++++++ data/doc/sisu/CHANGELOG_v6 | 7 +++++++ data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make | 2 +- data/sisu/v5/v/version.yml | 6 +++--- data/sisu/v6/v/version.yml | 6 +++--- rbuild | 4 ++-- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 89a25da3..c4dad5e6 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -31,6 +31,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.5.4.orig.tar.xz (2014-07-24:29/4) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.4 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.4-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.4.orig.tar.xz + sisu_5.5.4.orig.tar.xz + sisu_5.5.4-1.dsc + %% 5.5.3.orig.tar.xz (2014-07-23:29/3) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.3 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.3-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 7628fd67..3d09b917 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -21,6 +21,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 6.1.4.orig.tar.xz (2014-07-24:29/4) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.4 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.4-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.4.orig.tar.xz + sisu_6.1.4.orig.tar.xz + sisu_6.1.4-1.dsc + %% 6.1.3.orig.tar.xz (2014-07-23:29/3) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.3 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.3-1 diff --git a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make index 9bb0b2fa..3a4c8b9f 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make +++ b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make @@ -3,7 +3,7 @@ :breaks: new=C; break=1 :bold: /Debian|Ruby|SiSU/ :italics: /Linux|GPL|GPLv3|LaTeX|PostgreSQL|SQLite|SQL|Vim|ascii|plaintext|UTF-?8|HTML|XHTML|XML|EPUB|OpenDocument|ODF|ODT|PDF|pgSQL|TeXinfo|YAML|YML|OCN|object citation system|object citation numbering|granular search|Dublin Core/ - :substitute: /${sisu_stable}/,'5.5.1' /${sisu_dev}/,'6.1.1' /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*' + :substitute: /${sisu_stable}/,'5.5.4' /${sisu_dev}/,'6.1.4' /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*' :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index cb6a11a3..612f2f08 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.5.3 -:date_stamp: 2014w29/3 -:date: "2014-07-23" +:version: 5.5.4 +:date_stamp: 2014w29/4 +:date: "2014-07-24" diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml index ce0764ed..dc90817a 100644 --- a/data/sisu/v6/v/version.yml +++ b/data/sisu/v6/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 6.1.3 -:date_stamp: 2014w29/3 -:date: "2014-07-23" +:version: 6.1.4 +:date_stamp: 2014w29/4 +:date: "2014-07-24" diff --git a/rbuild b/rbuild index ed867d94..317af7f4 100644 --- a/rbuild +++ b/rbuild @@ -37,8 +37,8 @@ #require 'mkmf' #create_makefile("sisu") #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file) -SiSU_version_next_stable = '5.5.3' #% set version -SiSU_version_next_unstable = '6.1.3' #% set version +SiSU_version_next_stable = '5.5.4' #% set version +SiSU_version_next_unstable = '6.1.4' #% set version #% rake file SiSU_version_generic_next_stable = '5.4.x' SiSU_version_generic_next_unstable = '6.0.x' -- cgit v1.2.3 From 2907137b4402a01c36730dfa834363c4d4b4122f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 24 Jul 2014 20:51:43 -0400 Subject: v5 v6: ao_numbering, auto name segment, tweak to make behave as intended * further testing required --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 3 +++ lib/sisu/v5/ao_numbering.rb | 20 ++++++++++---------- lib/sisu/v5/constants.rb | 5 +++-- lib/sisu/v6/ao_numbering.rb | 20 ++++++++++---------- lib/sisu/v6/constants.rb | 5 +++-- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index c4dad5e6..74c4def0 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.4.orig.tar.xz sisu_5.5.4.orig.tar.xz sisu_5.5.4-1.dsc +* ao_numbering, auto name segment, tweak to make behave as intended + (further testing required) + %% 5.5.3.orig.tar.xz (2014-07-23:29/3) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.3 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.3-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 3d09b917..290d86cb 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.4.orig.tar.xz sisu_6.1.4.orig.tar.xz sisu_6.1.4-1.dsc +* ao_numbering, auto name segment, tweak to make behave as intended + (further testing required) + %% 6.1.3.orig.tar.xz (2014-07-23:29/3) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.3 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.3-1 diff --git a/lib/sisu/v5/ao_numbering.rb b/lib/sisu/v5/ao_numbering.rb index a8304fa3..b4ff7f0b 100644 --- a/lib/sisu/v5/ao_numbering.rb +++ b/lib/sisu/v5/ao_numbering.rb @@ -301,8 +301,8 @@ module SiSU_AO_Numbering @tuned_file=@tuned_file.flatten end def leading_zeros_fixed_width_number(possible_seg_name) - if possible_seg_name =~/^([0-9]+?\.|[0-9]+)$/m #!~/[.,:-]+/ - possible_seg_name=possible_seg_name. + if possible_seg_name.to_s =~/^([0-9]+?\.|[0-9]+)$/m #!~/[.,:-]+/ + possible_seg_name=possible_seg_name.to_s. gsub(/\.$/,'') nl=possible_seg_name.to_s.length zero='0' @@ -324,31 +324,31 @@ module SiSU_AO_Numbering possible_seg_name=possible_seg_name. gsub(/\.$/,'') end - chosen_seg_name=if possible_seg_name =~/^[0-9]+[.]?$/m \ + chosen_seg_name=if possible_seg_name.to_s =~/^[0-9]+[.]?$/m \ and possible_seg_name.to_i <= heading_num_is.to_i \ and lv == '1' prefix + leading_zeros_fixed_width_number(possible_seg_name) - elsif possible_seg_name =~/^[0-9]+[.,:-]*$/m \ + elsif possible_seg_name.to_s =~/^[0-9]+[.,:-]*$/m \ and lv == '1' - possible_seg_name=possible_seg_name. + possible_seg_name=possible_seg_name.to_s. gsub(/(?:[:,-]|\W)/,'.'). gsub(/\.$/,'') prefix + possible_seg_name - elsif possible_seg_name =~ + elsif possible_seg_name.to_s =~ /^[0-9]+[.,:-][0-9]+[.,:-]*$/m \ and lv == '2' - possible_seg_name=possible_seg_name. + possible_seg_name=possible_seg_name.to_s. gsub(/(?:[:,-]|\W)/,'.'). gsub(/\.$/,'') prefix + possible_seg_name - elsif possible_seg_name =~ + elsif possible_seg_name.to_s =~ /^[0-9]+[.,:-][0-9]+[.,:-][0-9][\d.,:-]*$/m \ and lv == '3' - possible_seg_name=possible_seg_name. + possible_seg_name=possible_seg_name.to_s. gsub(/(?:[:,-]|\W)/,'.'). gsub(/\.$/,'') prefix + possible_seg_name - else 'x'*lv.to_i + possible_seg_name.to_s + else Mx[:segname_prefix_auto_num_other]*lv.to_i + possible_seg_name.to_s end @chosen_seg_names << chosen_seg_name if @chosen_seg_names.compact.uniq.length == @chosen_seg_names.compact.length #checks that all auto given seg names are unique diff --git a/lib/sisu/v5/constants.rb b/lib/sisu/v5/constants.rb index d242ef1d..55c3ff2a 100644 --- a/lib/sisu/v5/constants.rb +++ b/lib/sisu/v5/constants.rb @@ -104,8 +104,9 @@ Xx={ html_relative1: '※', } Mx={ - segname_prefix_auto_num_extract: 's', - segname_prefix_auto_num_provide: 's_', + segname_prefix_auto_num_extract: 'c', + segname_prefix_auto_num_provide: 's', + segname_prefix_auto_num_other: 'x', ocn_id_char: 'o', note: 'note_', note_ref: 'noteref_', diff --git a/lib/sisu/v6/ao_numbering.rb b/lib/sisu/v6/ao_numbering.rb index 1c5c326e..a96df577 100644 --- a/lib/sisu/v6/ao_numbering.rb +++ b/lib/sisu/v6/ao_numbering.rb @@ -301,8 +301,8 @@ module SiSU_AO_Numbering @tuned_file=@tuned_file.flatten end def leading_zeros_fixed_width_number(possible_seg_name) - if possible_seg_name =~/^([0-9]+?\.|[0-9]+)$/m #!~/[.,:-]+/ - possible_seg_name=possible_seg_name. + if possible_seg_name.to_s =~/^([0-9]+?\.|[0-9]+)$/m #!~/[.,:-]+/ + possible_seg_name=possible_seg_name.to_s. gsub(/\.$/,'') nl=possible_seg_name.to_s.length zero='0' @@ -324,31 +324,31 @@ module SiSU_AO_Numbering possible_seg_name=possible_seg_name. gsub(/\.$/,'') end - chosen_seg_name=if possible_seg_name =~/^[0-9]+[.]?$/m \ + chosen_seg_name=if possible_seg_name.to_s =~/^[0-9]+[.]?$/m \ and possible_seg_name.to_i <= heading_num_is.to_i \ and lv == '1' prefix + leading_zeros_fixed_width_number(possible_seg_name) - elsif possible_seg_name =~/^[0-9]+[.,:-]*$/m \ + elsif possible_seg_name.to_s =~/^[0-9]+[.,:-]*$/m \ and lv == '1' - possible_seg_name=possible_seg_name. + possible_seg_name=possible_seg_name.to_s. gsub(/(?:[:,-]|\W)/,'.'). gsub(/\.$/,'') prefix + possible_seg_name - elsif possible_seg_name =~ + elsif possible_seg_name.to_s =~ /^[0-9]+[.,:-][0-9]+[.,:-]*$/m \ and lv == '2' - possible_seg_name=possible_seg_name. + possible_seg_name=possible_seg_name.to_s. gsub(/(?:[:,-]|\W)/,'.'). gsub(/\.$/,'') prefix + possible_seg_name - elsif possible_seg_name =~ + elsif possible_seg_name.to_s =~ /^[0-9]+[.,:-][0-9]+[.,:-][0-9][\d.,:-]*$/m \ and lv == '3' - possible_seg_name=possible_seg_name. + possible_seg_name=possible_seg_name.to_s. gsub(/(?:[:,-]|\W)/,'.'). gsub(/\.$/,'') prefix + possible_seg_name - else 'x'*lv.to_i + possible_seg_name.to_s + else Mx[:segname_prefix_auto_num_other]*lv.to_i + possible_seg_name.to_s end @chosen_seg_names << chosen_seg_name if @chosen_seg_names.compact.uniq.length == @chosen_seg_names.compact.length #checks that all auto given seg names are unique diff --git a/lib/sisu/v6/constants.rb b/lib/sisu/v6/constants.rb index 87611bf9..2a5e124c 100644 --- a/lib/sisu/v6/constants.rb +++ b/lib/sisu/v6/constants.rb @@ -104,8 +104,9 @@ Xx={ html_relative1: '※', } Mx={ - segname_prefix_auto_num_extract: 's', - segname_prefix_auto_num_provide: 's_', + segname_prefix_auto_num_extract: 'c', + segname_prefix_auto_num_provide: 's', + segname_prefix_auto_num_other: 'x', ocn_id_char: 'o', note: 'note_', note_ref: 'noteref_', -- cgit v1.2.3