diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-05-12 20:54:28 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-05-12 20:54:28 -0400 |
| commit | b28cf1c5cf4be19a5869ddfabf83e0b81f778860 (patch) | |
| tree | 004e84eaa25da24d6bcc77d58a88bdee5aaf7a19 | |
| parent | syntax hilighting, includes with files in subdirectories fix (diff) | |
v5 v6: composite, fix includes, provide extra newline after inserted comment
* (Closes: #744360) [n|u] sisu: includes do not work properly
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 3 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 3 | ||||
| -rw-r--r-- | lib/sisu/v5/composite.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v6/composite.rb | 2 | ||||
| -rw-r--r-- | sisu.org | 8 |
5 files changed, 15 insertions, 3 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 9cae41da..12c16c8a 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -40,6 +40,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * ao_syntax, address possible manual use of url delimiters「」 +* composite, fix includes, provide extra newline after inserted comment + (Closes: #744360) "includes do not work properly" + * added sisu.org emacs:evil:org mode notes related to sisu development %% 5.3.4.orig.tar.xz (2014-02-14:06/5) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index a412da59..92e8413e 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -30,6 +30,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * ao_syntax, address possible manual use of url delimiters「」 +* composite, fix includes, provide extra newline after inserted comment + (Closes: #744360) "includes do not work properly" + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/composite.rb index 9e7ccb5c..cd281e26 100644 --- a/lib/sisu/v5/composite.rb +++ b/lib/sisu/v5/composite.rb @@ -132,7 +132,7 @@ module SiSU_Assemble def insertion(fni,insert_array) file={ prepared: [], images: [] } rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ - file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" + file[:prepared] << "\n% |#{fni}|@|^|>>ok\n\n" @code_flag=false insert_array.each do |i| @code_flag=if i =~/^code\{/ then true diff --git a/lib/sisu/v6/composite.rb b/lib/sisu/v6/composite.rb index ebbd14f6..02e9543e 100644 --- a/lib/sisu/v6/composite.rb +++ b/lib/sisu/v6/composite.rb @@ -132,7 +132,7 @@ module SiSU_Assemble def insertion(fni,insert_array) file={ prepared: [], images: [] } rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ - file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" + file[:prepared] << "\n% |#{fni}|@|^|>>ok\n\n" @code_flag=false insert_array.each do |i| @code_flag=if i =~/^code\{/ then true @@ -1005,7 +1005,7 @@ no level 1: *** DBT Outstanding bugs -- Normal bugs; Unclassified (2 bugs) :debian:dbt:normal: <https://bugs.debian.org/cgi-bin/pkgreport.cgi?src=sisu> -**** TODO [#B] #744360 [n|u] sisu: includes do not work properly :processing:fix: +**** DONE (5.3.5::6.0.5) [#B] #744360 [n|u] sisu: includes do not work properly :processing:fix: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744360> From: Daniel Baumann <daniel.baumann@progress-technologies.net> @@ -1047,6 +1047,12 @@ makes ':B~ bar' being ignored in the output (pdf) entirely. Regards, Daniel +***** NOTES/COMMENTS + +it appears both give faulty text, though in different ways + +fixed + **** TODO [#B] #744378 [n|u] sisu: --no-manifest not working anymore <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744378> |