From 5eb77a9b2e3558ef1d7393b60d3acd2b8d97912b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 26 Jul 2011 20:08:59 -0400 Subject: v3: param, cleanup setting of auto endotes --- data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v3/param.rb | 13 ++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 7bcc728f..ff837c06 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -23,6 +23,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.14.orig.tar.gz * sysenv, avoid creation of spurious directories in output tree (an image copy section removed, re-implement correctly later) + * param, cleanup setting of auto endnotes + * urls, --concordance %% 3.0.13.orig.tar.gz (2011-06-26:25/7) diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index 22b711df..2d2c22c0 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -1172,17 +1172,8 @@ module SiSU_Param when /^\^~\s+\S/; @en[:note] +=1 #% processing end end - if para =~/~\{|\^~ |~\^|<:ee>|\{.+?\[[1-6]\]\}\S+?\.ss[tm]/m; @flag_auto_endnotes,@flag_endnotes=true,true - end - unless @flag_auto_endnotes - if para =~/^(4~endnotes\b|<:ee>)/ - @flag_separate_endnotes=true - @flag_endnotes=true - end - end - if para =~/^(?:4~endnotes|<:ee>)/; @flag_separate_endnotes_make=false - end - if para =~/\s*.+/; @flag_endnotes=true + if para =~/~\{|\^~ |~\^|\{.+?\[[1-6]\]\}\S+?\.ss[tm]/m + @flag_auto_endnotes,@flag_endnotes=true,true end if para =~/^(?:table\{|\{table)/i; @flag_tables=true end -- cgit v1.2.3