From 25f7b4f374f665692f3af7a08bd671098843e522 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:02:55 -0400 Subject: v4 v5: version & changelog --- data/doc/sisu/CHANGELOG_v4 | 7 +++++++ data/doc/sisu/CHANGELOG_v5 | 7 +++++++ data/sisu/v4/v/version.yml | 6 +++--- data/sisu/v5/v/version.yml | 6 +++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 12d19140..3b11d941 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -23,6 +23,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 4.2.1.orig.tar.xz (2013-08-28:34/3) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.1 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.1-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz + sisu_4.2.1.orig.tar.xz + sisu_4.2.1-1.dsc + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 86274ec8..fd90371c 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -23,6 +23,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.0.14.orig.tar.xz (2013-08-28:34/3) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.14 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.14-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz + sisu_5.0.14.orig.tar.xz + sisu_5.0.14-1.dsc + %% 5.0.13.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1 diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml index 8ca5949d..b8b4ff72 100644 --- a/data/sisu/v4/v/version.yml +++ b/data/sisu/v4/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 4.2.0 -:date_stamp: 2013w33/7 -:date: "2013-08-25" +:version: 4.2.1 +:date_stamp: 2013w34/3 +:date: "2013-08-28" :project: SiSU diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 1435d3fd..50a3185d 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 5.0.13 -:date_stamp: 2013w33/7 -:date: "2013-08-25" +:version: 5.0.14 +:date_stamp: 2013w34/3 +:date: "2013-08-28" :project: SiSU -- cgit v1.2.3 From d78a0ecbb4a4bf03cc7c27755ed0b98cc4936695 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:09:09 -0400 Subject: v4 v5: config files (by filetype & filename) touched --- conf/sisu/rc/sisurc_by_fn.yml | 12 +++++++----- conf/sisu/rc/sisurc_by_ft.yml | 12 +++++++----- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ .../markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml | 2 +- .../markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/conf/sisu/rc/sisurc_by_fn.yml b/conf/sisu/rc/sisurc_by_fn.yml index fca18fd2..ce9a9109 100644 --- a/conf/sisu/rc/sisurc_by_fn.yml +++ b/conf/sisu/rc/sisurc_by_fn.yml @@ -49,16 +49,16 @@ show_output_on: 'filesystem_url' #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) flag: color: true # making colour default -c is toggle, and will now toggle colour off -# default: '-NQhewpotbxXyYv' # includes verbose; -m would in any event be run by default -# i: '-NQhewpoty' # -m run by default -# ii: '-NQhewpotbxXy' # -m run by default -# iii: '-NQhewpotbxXyY' # -m run by default +# default: '-NQdhewpotbxXyYv' # includes verbose; -m would in any event be run by default +# i: '-NQdhewpoty' # -m run by default +# ii: '-NQdhewpotbxXy' # -m run by default +# iii: '-NQdhewpotbxXyY' # -m run by default # iv: '-NQhewpotbxXYDy --update' # -m run by default # v: '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal default: - papersize: 'A4,letter' + papersize: 'a4,letter' #language: 'en' #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif' #texpdf_font_mono: 'Liberation Mono' #'Inconsolata' @@ -106,6 +106,8 @@ default: #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) output_dir_structure_by: filename +#% lingual: 'multi' | 'mono' (multi default) +#lingual: mono permission_set: zap: true diff --git a/conf/sisu/rc/sisurc_by_ft.yml b/conf/sisu/rc/sisurc_by_ft.yml index d3c250f7..3afdbdc6 100644 --- a/conf/sisu/rc/sisurc_by_ft.yml +++ b/conf/sisu/rc/sisurc_by_ft.yml @@ -49,16 +49,16 @@ show_output_on: 'filesystem_url' #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) flag: color: true # making colour default -c is toggle, and will now toggle colour off -# default: '-NQhewpotbxXyYv' # includes verbose; -m would in any event be run by default -# i: '-NQhewpoty' # -m run by default -# ii: '-NQhewpotbxXy' # -m run by default -# iii: '-NQhewpotbxXyY' # -m run by default +# default: '-NQdhewpotbxXyYv' # includes verbose; -m would in any event be run by default +# i: '-NQdhewpoty' # -m run by default +# ii: '-NQdhewpotbxXy' # -m run by default +# iii: '-NQdhewpotbxXyY' # -m run by default # iv: '-NQhewpotbxXYDy --update' # -m run by default # v: '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal default: - papersize: 'A4,letter' + papersize: 'a4,letter' #language: 'en' #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif' #texpdf_font_mono: 'Liberation Mono' #'Inconsolata' @@ -106,6 +106,8 @@ default: #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) output_dir_structure_by: filetype +#% lingual: 'multi' | 'mono' (multi default) +#lingual: mono permission_set: zap: true diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 3b11d941..8a50f45f 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz sisu_4.2.1.orig.tar.xz sisu_4.2.1-1.dsc +* config files (by filetype & filename) touched + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index fd90371c..2bc960a6 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz sisu_5.0.14.orig.tar.xz sisu_5.0.14-1.dsc +* config files (by filetype & filename) touched + %% 5.0.13.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1 diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml index 9bcc416e..bf88977f 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml +++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml @@ -97,7 +97,7 @@ db: #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) output_dir_structure_by: filename #% lingual: 'multi' | 'mono' (multi default) -#lingual: multi +#lingual: mono permission_set: zap: true diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml index bf34d249..0963780c 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml +++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml @@ -97,7 +97,7 @@ db: #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) output_dir_structure_by: filetype #% lingual: 'multi' | 'mono' (multi default) -#lingual: multi +#lingual: mono permission_set: zap: true -- cgit v1.2.3 From 93255d4caf9af195458c48f4159fadc18d03e223 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:10:49 -0400 Subject: v4 v5: manifest, output organised by, info, minor touch --- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ lib/sisu/v4/manifest.rb | 5 +++-- lib/sisu/v5/manifest.rb | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 8a50f45f..9ccf61f4 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz * config files (by filetype & filename) touched +* manifest, output organised by, info, minor touch + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 2bc960a6..cd4d5f89 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz * config files (by filetype & filename) touched +* manifest, output organised by, info, minor touch + %% 5.0.13.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1 diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb index eb888387..d86830e4 100644 --- a/lib/sisu/v4/manifest.rb +++ b/lib/sisu/v4/manifest.rb @@ -841,10 +841,11 @@ WOK '..' else '..' end + output_organised_by="(output organised by #{@env.output_dir_structure.by?})" harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \ && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \ - ? %{

.: other document manifests: [authors] [topics]

} - : '' + ? %{

.: other document manifests: [authors] [topics] #{output_organised_by}

} + : %{

#{output_organised_by}

} manifest_title=%{

#{@translate.manifest_description}

#{harvest}} @manifest[:html] <<< diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb index 95112a7a..a8e6bb25 100644 --- a/lib/sisu/v5/manifest.rb +++ b/lib/sisu/v5/manifest.rb @@ -841,10 +841,11 @@ WOK '..' else '..' end + output_organised_by="(output organised by #{@env.output_dir_structure.by?})" harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \ && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \ - ? %{

.: other document manifests: [authors] [topics]

} - : '' + ? %{

.: other document manifests: [authors] [topics] #{output_organised_by}

} + : %{

#{output_organised_by}

} manifest_title=%{

#{@translate.manifest_description}

#{harvest}} @manifest[:html] <<< -- cgit v1.2.3 From b749d20315b0d32a80755a89d69f5a0c133956a1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:12:39 -0400 Subject: v4 v5: vim syntax, sisu.vim, fix typo * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" --- data/doc/sisu/CHANGELOG_v4 | 3 +++ data/doc/sisu/CHANGELOG_v5 | 3 +++ data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 9ccf61f4..2f004ba7 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -34,6 +34,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz * manifest, output organised by, info, minor touch +* vim syntax, sisu.vim, fix typo + * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index cd4d5f89..f405b03f 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -34,6 +34,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz * manifest, output organised by, info, minor touch +* vim syntax, sisu.vim, fix typo + * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" + %% 5.0.13.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1 diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim index 87d8c973..7666b75f 100644 --- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,7 +1,7 @@ " SiSU Vim syntax file " SiSU Maintainer: Ralph Amissah -" SiSU Markup: SiSU (sisu-4.2.0) -" Last Change: 2013-08-25 +" SiSU Markup: SiSU (sisu-4.2.1) +" Last Change: 2013-08-28 " URL: "(originally looked at Ruby Vim by Mirko Nasato) @@ -23,7 +23,7 @@ if !exists("sisu_no_identifiers") syn match sisu_break contains=@NoSpell " \\\\\( \|$\)\|
\|
" syn match sisu_control contains=@NoSpell "^\(-\\\\-\|=\\\\=\|-\.\.-\|<:p[bn]>\)\s*$" syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$" - syn match sisu_markail contains=@NoSpell "^--[+~-]#\s*$" + syn match sisu_marktail contains=@NoSpell "^--[+~-]#\s*$" syn match sisu_marktail "[~-]#" syn match sisu_control "\"" syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)" -- cgit v1.2.3 From d2ad46d7b764f5f15a6a25e2ab3fdd66cd036f22 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:14:10 -0400 Subject: v4 v5: pdf (latex) tables, bugfix (fasttrack) --- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ lib/sisu/v4/texpdf_format.rb | 3 ++- lib/sisu/v5/texpdf_format.rb | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 2f004ba7..078bc2bb 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz * vim syntax, sisu.vim, fix typo * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" +* pdf (latex) tables, bugfix + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index f405b03f..650a7044 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz * vim syntax, sisu.vim, fix typo * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" +* pdf (latex) tables, bugfix + %% 5.0.13.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1 diff --git a/lib/sisu/v4/texpdf_format.rb b/lib/sisu/v4/texpdf_format.rb index c154fc2b..b010bb08 100644 --- a/lib/sisu/v4/texpdf_format.rb +++ b/lib/sisu/v4/texpdf_format.rb @@ -116,7 +116,8 @@ module SiSU_TeX_Pdf "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{show_ocn}}\\end{tiny}}}" #ocn object citation numbering end def table_special_characters(r) - r=r.gsub(/#{Mx[:tc_p]}|$/u,'&'). + r=r.gsub(/#{Mx[:tc_p]}/mu,'&'). + gsub(/#{Mx[:tc_c]}/m,'\\\\\\'). gsub(/%/,'\%'). gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\begin{bfseries}\1 \end{bfseries}'). gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\emph{\1}'). diff --git a/lib/sisu/v5/texpdf_format.rb b/lib/sisu/v5/texpdf_format.rb index 9e71e128..172dfa56 100644 --- a/lib/sisu/v5/texpdf_format.rb +++ b/lib/sisu/v5/texpdf_format.rb @@ -116,7 +116,8 @@ module SiSU_TeX_Pdf "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{show_ocn}}\\end{tiny}}}" #ocn object citation numbering end def table_special_characters(r) - r=r.gsub(/#{Mx[:tc_p]}|$/u,'&'). + r=r.gsub(/#{Mx[:tc_p]}/mu,'&'). + gsub(/#{Mx[:tc_c]}/m,'\\\\\\'). gsub(/%/,'\%'). gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\begin{bfseries}\1 \end{bfseries}'). gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\emph{\1}'). -- cgit v1.2.3 From cd0e55b3d89d978d37e90b0b4d6a97d97760ca85 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:15:48 -0400 Subject: v4 v5: odf:odt, footnotes, fix --- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ lib/sisu/v4/odf.rb | 8 ++++---- lib/sisu/v5/odf.rb | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 078bc2bb..c4d71251 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -39,6 +39,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz * pdf (latex) tables, bugfix +* odf:odt, footnotes, fix + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 650a7044..b4117ebd 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -39,6 +39,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz * pdf (latex) tables, bugfix +* odf:odt, footnotes, fix + %% 5.0.13.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1 diff --git a/lib/sisu/v4/odf.rb b/lib/sisu/v4/odf.rb index acc44ab3..adaaea87 100644 --- a/lib/sisu/v4/odf.rb +++ b/lib/sisu/v4/odf.rb @@ -119,7 +119,6 @@ module SiSU_ODF begin pre @data=markup(@dal_array) - post publish ensure unless @md.opt.cmd =~/[MV]/ #check maintenance flag @@ -173,6 +172,7 @@ module SiSU_ODF SiSU_ODF_Format::Tags.new.set_bookmark_tag(dob) end def heading(dob,p_num) + dob=footnote(dob) m=/#{$1}/ breakpage='' if @md.fns \ @@ -351,6 +351,7 @@ module SiSU_ODF dob end def normal(dob,p_num) #P1 - P3 + dob=footnote(dob) dob.obj=dob.obj.gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1'). #http ftp matches escaped, no decoration gsub(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, @@ -431,6 +432,7 @@ module SiSU_ODF dob.obj.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/).each_with_index do |parablock,i| set_ref=(i==0) ? "#{p_num[:set_ref]}#{set_bookmark_tag(dob)}" : '' parablock=group_clean(parablock) + parablock=footnote(parablock) parray << %{#{set_ref}#{parablock}} if parablock =~/\S+/ end dob.obj=parray.join \ @@ -506,6 +508,7 @@ module SiSU_ODF end def table(dob,p_num) # if dob.is ==:table + dob=footnote(dob) #check table=SiSU_ODF_Format::Table.new(@md,dob,p_num) dob=table.table end @@ -542,7 +545,6 @@ module SiSU_ODF #p_num=SiSU_ODF_Format::ParagraphNumber.new(dob.ocn).set_ref_and_display end end - dob=footnote(dob) if dob.is==:heading @@odf[:body] << heading(dob,p_num).obj << @br*2 if SiSU_Env::ProcessingSettings.new(md).build.toc? @@ -731,8 +733,6 @@ WOK x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/ @@odf[:head] << x end - def post - end def publish content=[] br_pg=' ' diff --git a/lib/sisu/v5/odf.rb b/lib/sisu/v5/odf.rb index 21243e6f..f52d98e1 100644 --- a/lib/sisu/v5/odf.rb +++ b/lib/sisu/v5/odf.rb @@ -119,7 +119,6 @@ module SiSU_ODF begin pre @data=markup(@dal_array) - post publish ensure unless @md.opt.cmd =~/[MV]/ #check maintenance flag @@ -173,6 +172,7 @@ module SiSU_ODF SiSU_ODF_Format::Tags.new.set_bookmark_tag(dob) end def heading(dob,p_num) + dob=footnote(dob) m=/#{$1}/ breakpage='' if @md.fns \ @@ -351,6 +351,7 @@ module SiSU_ODF dob end def normal(dob,p_num) #P1 - P3 + dob=footnote(dob) dob.obj=dob.obj.gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1'). #http ftp matches escaped, no decoration gsub(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/, @@ -431,6 +432,7 @@ module SiSU_ODF dob.obj.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/).each_with_index do |parablock,i| set_ref=(i==0) ? "#{p_num[:set_ref]}#{set_bookmark_tag(dob)}" : '' parablock=group_clean(parablock) + parablock=footnote(parablock) parray << %{#{set_ref}#{parablock}} if parablock =~/\S+/ end dob.obj=parray.join \ @@ -506,6 +508,7 @@ module SiSU_ODF end def table(dob,p_num) # if dob.is ==:table + dob=footnote(dob) #check table=SiSU_ODF_Format::Table.new(@md,dob,p_num) dob=table.table end @@ -542,7 +545,6 @@ module SiSU_ODF #p_num=SiSU_ODF_Format::ParagraphNumber.new(dob.ocn).set_ref_and_display end end - dob=footnote(dob) if dob.is==:heading @@odf[:body] << heading(dob,p_num).obj << @br*2 if SiSU_Env::ProcessingSettings.new(md).build.toc? @@ -731,8 +733,6 @@ WOK x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/ @@odf[:head] << x end - def post - end def publish content=[] br_pg=' ' -- cgit v1.2.3 From 349169b7fb76b63431080552d02bff5e3d29d9ea Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:17:23 -0400 Subject: v4 v5: dal, text blocks, tuning --- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ lib/sisu/v4/dal_doc_str.rb | 35 +++++++++++++++++++++++++++++------ lib/sisu/v4/dal_misc_arrange.rb | 6 ++++-- lib/sisu/v5/dal_doc_str.rb | 35 +++++++++++++++++++++++++++++------ lib/sisu/v5/dal_misc_arrange.rb | 6 ++++-- 6 files changed, 70 insertions(+), 16 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index c4d71251..d84e0dab 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -41,6 +41,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz * odf:odt, footnotes, fix +* dal, text blocks, tuning + %% 4.2.0.orig.tar.xz (2013-08-25:33/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index b4117ebd..b43e6e70 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz * vim syntax, sisu.vim, fix typo * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" +* dal, text blocks, tuning + * pdf (latex) tables, bugfix * odf:odt, footnotes, fix diff --git a/lib/sisu/v4/dal_doc_str.rb b/lib/sisu/v4/dal_doc_str.rb index 6c588a8a..e7d9917b 100644 --- a/lib/sisu/v4/dal_doc_str.rb +++ b/lib/sisu/v4/dal_doc_str.rb @@ -194,7 +194,7 @@ module SiSU_DAL_DocumentStructureExtract end t_o=t_o.gsub(/(?:\n\s*\n)+/m,"\n") if @@flag[:code]==:off if t_o !~/^(?:code|poem|alt|group|block)\{|^\}(?:code|poem|alt|group|block)|^(?:table\{|\{table)[ ~]/ \ - and t_o !~/^[`]{3}\s+(?:code|poem|alt|group|block)|^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/ \ + and t_o !~/^[`]{3}\s+(?:code|poem|alt|group|block|table)|^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/ \ and @@flag[:code]==:off \ and @@flag[:poem]==:off \ and @@flag[:group]==:off \ @@ -391,7 +391,7 @@ module SiSU_DAL_DocumentStructureExtract h={ obj: 'alt text start' } #introduce a counter t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) tuned_file << t_o - elsif t_o =~/^(?:table\{|\{table)[ ~]/ + elsif t_o =~/^(?:table\{|[`]{3}\s+table|\{table)[ ~]/ h={ obj: 'table start' } #introduce a counter ins=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) tuned_file << ins @@ -409,15 +409,15 @@ module SiSU_DAL_DocumentStructureExtract heading=false end @h={ head_: heading, cols: cols, widths: col, idx: idx } - elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+/ + elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+c\d+/ @@flag[:table]=:tics @rows='' case t_o - when /table\{~h\s+c(\d+);\s+(.+)/ + when /^[`]{3}\s+table~h\s+c(\d+);\s+(.+)/ cols=$1 col=$2.scan(/\d+/) heading=true - when /table\{\s+c(\d+);\s+(.+)/ + when /^[`]{3}\s+table\s+c(\d+);\s+(.+)/ cols=$1 col=$2.scan(/\d+/) heading=false @@ -425,7 +425,7 @@ module SiSU_DAL_DocumentStructureExtract @h={ head_: heading, cols: cols, widths: col, idx: idx } elsif t_o=~/^\{table(?:~h)?(?:\s+\d+;?)?\}\n.+\Z/m m1,m2,hd=nil,nil,nil - tbl=/^\{table(?:~h)?(?:\s+\d+;?)?\}\n(.+)\Z/m.match(t_o)[1] #two table representations should be consolidated as one + tbl=/^\{table(?:~h)?(?:\s+\d+;?)?\}\n(.+)\Z/m.match(t_o)[1] hd=((t_o =~/^\{table~h/) ? true : false) tbl,tags=extract_tags(tbl) rws=tbl.split(/\n/) @@ -452,6 +452,29 @@ module SiSU_DAL_DocumentStructureExtract h={ obj: 'table end' } #introduce a counter t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) t_o + elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+/ + m1,m2,hd=nil,nil,nil + h=case t_o + when /^[`]{3}\s+table~h\s+(.+?)\n(.+)\Z/m #two table representations should be consolidated as one + m1,tbl,hd=$1,$2,true + when /^[`]{3}\s+table\s+(.+?)\n(.+)\Z/m #two table representations should be consolidated as one + m1,tbl,hd=$1,$2,false + else nil + end + tbl,tags=extract_tags(tbl) + col=m1.scan(/\d+/) + rws=tbl.split(/\n/) + rows='' + rws.each do |r| + r=r.gsub(/\s*\|\s*/m,"#{Mx[:tc_p]}") #r.gsub!(/\|/m,"#{Mx[:tc_p]}") + rows += r + Mx[:tc_c] + end + h={ head_: hd, cols: col.length, widths: col, obj: rows, idx: idx, tags: tags } + t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil? + tuned_file << t_o + h={ obj: 'table end' } #introduce a counter + t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) + t_o elsif t_o=~/^\{table(?:~h)?\s+/ m1,m2,hd=nil,nil,nil h=case t_o diff --git a/lib/sisu/v4/dal_misc_arrange.rb b/lib/sisu/v4/dal_misc_arrange.rb index ab4f3ea4..e6cc72db 100644 --- a/lib/sisu/v4/dal_misc_arrange.rb +++ b/lib/sisu/v4/dal_misc_arrange.rb @@ -78,8 +78,10 @@ module SiSU_DAL_MiscArrangeText block_open,block_close,text=nil,nil,nil if para =~/\A[`]{3}\s+.+?\n.+?\n[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*\Z/m block_open,text,block_close=/\A([`]{3}\s+.+?)\n(.+?)\n([`]{3}(\s+[~-][#]|\s+\~\{.+?\}\~)?)\s*\Z/m.match(para)[1..3] - para=[] - para << block_open << text << block_close + ((para=~/^[`]{3}\s+table(?:~h)?\s+/) \ + and (para !~/^[`]{3}\s+table(?:~h)?\s+c\d+/)) \ + ? para + : (para=[]; para << block_open << text << block_close) elsif para =~/\A[`]{3}\s+.+?\n.*?\Z/m #look at, study block_open,text=/\A([`]{3}(?:\s+.+?))\n(.*?)\Z/m.match(para)[1,2] para=[] diff --git a/lib/sisu/v5/dal_doc_str.rb b/lib/sisu/v5/dal_doc_str.rb index d3f65bff..612d2905 100644 --- a/lib/sisu/v5/dal_doc_str.rb +++ b/lib/sisu/v5/dal_doc_str.rb @@ -194,7 +194,7 @@ module SiSU_DAL_DocumentStructureExtract end t_o=t_o.gsub(/(?:\n\s*\n)+/m,"\n") if @@flag[:code]==:off if t_o !~/^(?:code|poem|alt|group|block)\{|^\}(?:code|poem|alt|group|block)|^(?:table\{|\{table)[ ~]/ \ - and t_o !~/^[`]{3}\s+(?:code|poem|alt|group|block)|^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/ \ + and t_o !~/^[`]{3}\s+(?:code|poem|alt|group|block|table)|^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/ \ and @@flag[:code]==:off \ and @@flag[:poem]==:off \ and @@flag[:group]==:off \ @@ -391,7 +391,7 @@ module SiSU_DAL_DocumentStructureExtract h={ obj: 'alt text start' } #introduce a counter t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) tuned_file << t_o - elsif t_o =~/^(?:table\{|\{table)[ ~]/ + elsif t_o =~/^(?:table\{|[`]{3}\s+table|\{table)[ ~]/ h={ obj: 'table start' } #introduce a counter ins=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) tuned_file << ins @@ -409,15 +409,15 @@ module SiSU_DAL_DocumentStructureExtract heading=false end @h={ head_: heading, cols: cols, widths: col, idx: idx } - elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+/ + elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+c\d+/ @@flag[:table]=:tics @rows='' case t_o - when /table\{~h\s+c(\d+);\s+(.+)/ + when /^[`]{3}\s+table~h\s+c(\d+);\s+(.+)/ cols=$1 col=$2.scan(/\d+/) heading=true - when /table\{\s+c(\d+);\s+(.+)/ + when /^[`]{3}\s+table\s+c(\d+);\s+(.+)/ cols=$1 col=$2.scan(/\d+/) heading=false @@ -425,7 +425,7 @@ module SiSU_DAL_DocumentStructureExtract @h={ head_: heading, cols: cols, widths: col, idx: idx } elsif t_o=~/^\{table(?:~h)?(?:\s+\d+;?)?\}\n.+\Z/m m1,m2,hd=nil,nil,nil - tbl=/^\{table(?:~h)?(?:\s+\d+;?)?\}\n(.+)\Z/m.match(t_o)[1] #two table representations should be consolidated as one + tbl=/^\{table(?:~h)?(?:\s+\d+;?)?\}\n(.+)\Z/m.match(t_o)[1] hd=((t_o =~/^\{table~h/) ? true : false) tbl,tags=extract_tags(tbl) rws=tbl.split(/\n/) @@ -452,6 +452,29 @@ module SiSU_DAL_DocumentStructureExtract h={ obj: 'table end' } #introduce a counter t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) t_o + elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+/ + m1,m2,hd=nil,nil,nil + h=case t_o + when /^[`]{3}\s+table~h\s+(.+?)\n(.+)\Z/m #two table representations should be consolidated as one + m1,tbl,hd=$1,$2,true + when /^[`]{3}\s+table\s+(.+?)\n(.+)\Z/m #two table representations should be consolidated as one + m1,tbl,hd=$1,$2,false + else nil + end + tbl,tags=extract_tags(tbl) + col=m1.scan(/\d+/) + rws=tbl.split(/\n/) + rows='' + rws.each do |r| + r=r.gsub(/\s*\|\s*/m,"#{Mx[:tc_p]}") #r.gsub!(/\|/m,"#{Mx[:tc_p]}") + rows += r + Mx[:tc_c] + end + h={ head_: hd, cols: col.length, widths: col, obj: rows, idx: idx, tags: tags } + t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil? + tuned_file << t_o + h={ obj: 'table end' } #introduce a counter + t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) + t_o elsif t_o=~/^\{table(?:~h)?\s+/ m1,m2,hd=nil,nil,nil h=case t_o diff --git a/lib/sisu/v5/dal_misc_arrange.rb b/lib/sisu/v5/dal_misc_arrange.rb index ab4f3ea4..e6cc72db 100644 --- a/lib/sisu/v5/dal_misc_arrange.rb +++ b/lib/sisu/v5/dal_misc_arrange.rb @@ -78,8 +78,10 @@ module SiSU_DAL_MiscArrangeText block_open,block_close,text=nil,nil,nil if para =~/\A[`]{3}\s+.+?\n.+?\n[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*\Z/m block_open,text,block_close=/\A([`]{3}\s+.+?)\n(.+?)\n([`]{3}(\s+[~-][#]|\s+\~\{.+?\}\~)?)\s*\Z/m.match(para)[1..3] - para=[] - para << block_open << text << block_close + ((para=~/^[`]{3}\s+table(?:~h)?\s+/) \ + and (para !~/^[`]{3}\s+table(?:~h)?\s+c\d+/)) \ + ? para + : (para=[]; para << block_open << text << block_close) elsif para =~/\A[`]{3}\s+.+?\n.*?\Z/m #look at, study block_open,text=/\A([`]{3}(?:\s+.+?))\n(.*?)\Z/m.match(para)[1,2] para=[] -- cgit v1.2.3 From 3f912866187fd5bdaf2a6428aad074044e1e2060 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 28 Aug 2013 18:19:02 -0400 Subject: v5: dal, grouped text with fontface spanning newlines, partial solution, test * merge into v4 after testing --- data/doc/sisu/CHANGELOG_v5 | 4 +++- lib/sisu/v5/dal_syntax.rb | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index b43e6e70..e7a27cc6 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -37,7 +37,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz * vim syntax, sisu.vim, fix typo * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#" -* dal, text blocks, tuning +* dal + * grouped text with fontface spanning newlines, partial solution, test + * text blocks, tuning * pdf (latex) tables, bugfix diff --git a/lib/sisu/v5/dal_syntax.rb b/lib/sisu/v5/dal_syntax.rb index 7852ab85..f6d01d22 100644 --- a/lib/sisu/v5/dal_syntax.rb +++ b/lib/sisu/v5/dal_syntax.rb @@ -308,16 +308,41 @@ module SiSU_DAL_Syntax end dob end + def fontface_lines(dob,leader) + while (dob.obj =~/#{Mx[:br_nl]}/ \ + and dob.obj =~/(?:#{leader})([*!\/_#])\{(.+?)\}\1/m) \ + and $2 =~/#{Mx[:br_nl]}/ + dob=if dob.obj =~/#{Mx[:br_nl]}/ \ + and dob.obj =~/(#{leader})([*!\/_#])\{(.+?)\}\2/m + lead,fce,txt=$1,$2,$3 + dob=if txt =~/#{Mx[:br_nl]}/ + lead_break=if dob.obj =~/^#{Mx[:br_nl]}/ + dob.obj=dob.obj.sub(/^#{Mx[:br_nl]}/,'') + Mx[:br_nl] + else '' + end + txt="#{lead_break}#{fce}\{" + txt.split(Mx[:br_nl]).join("\}#{fce}#{Mx[:br_nl]}#{fce}\{") + "\}#{fce}" + dob.obj=dob.obj.sub(/(?:^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\>)([*!\/_#])\{.+?\}\1/m,"#{lead}#{txt}") + dob + else dob + end + end + dob + end + dob + end def fontface(dob) - dob.obj=dob.obj.gsub(/(^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\>)\*\{(.+?)\}\*/m, + leader=/^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\>/ + dob=fontface_lines(dob,leader) + dob.obj=dob.obj.gsub(/(#{leader})\*\{(.+?)\}\*/m, "\\1#{@emph[:o]}\\2#{@emph[:c]}"). #emphasis - gsub(/(^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\>)!\{(.+?)\}!/m, + gsub(/(#{leader})!\{(.+?)\}!/m, "\\1#{Mx[:fa_bold_o]}\\2#{Mx[:fa_bold_c]}"). #bold - gsub(/(^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\(|\>)\/\{(.+?)\}\//m, + gsub(/(#{leader})\/\{(.+?)\}\//m, "\\1#{Mx[:fa_italics_o]}\\2#{Mx[:fa_italics_c]}"). #italics - gsub(/(^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\>)_\{(.+?)\}_/m, + gsub(/(#{leader})_\{(.+?)\}_/m, "\\1#{Mx[:fa_underscore_o]}\\2#{Mx[:fa_underscore_c]}"). #underscore - gsub(/(^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|\>)#\{(.+?)\}#/m, + gsub(/(#{leader})#\{(.+?)\}#/m, "\\1#{Mx[:fa_monospace_o]}\\2#{Mx[:fa_monospace_c]}"). #monospace gsub(/(^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}]|\(|\>)\"\{(.+?)\}\"/m, "\\1#{Mx[:fa_cite_o]}\\2#{Mx[:fa_c_o]}cite#{Mx[:fa_c]}"). #cite /blockquote? -- cgit v1.2.3