summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-12-17 04:19:35 +0000
committerRalph Amissah <ralph@amissah.com>2010-12-17 04:46:13 +0000
commitff4ceb260ae3931072810a0ada124841d3b8e032 (patch)
treea736b8a7c4d7ce046d23f3cc834619e374f9bf68
parentdal_syntax, sisu syntax modification (insist on curly braces) (diff)
downloadsisu-ff4ceb260ae3931072810a0ada124841d3b8e032.zip
sisu-ff4ceb260ae3931072810a0ada124841d3b8e032.tar.xz
document objects: page break; object separator (introduced & used, adjust later)
* object separator introduced (requested Cory Doctorow, implementation not discussed) * dal_syntax, object separator syntax (<:---> or <:ols>) * constants, object separator * vim syntax highlighting, match object separator * document objects: page break; object separator (introduced & used) * dal, page break and object separator objects * represent page break and object separator: plaintext, html, epub, odf, texpdf (adjust later)
-rw-r--r--CHANGELOG_v216
-rw-r--r--data/doc/sisu/v2/CHANGELOG16
-rw-r--r--data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim3
-rw-r--r--data/sisu/v2/v/version.yml4
-rw-r--r--lib/sisu/v2/constants.rb1
-rw-r--r--lib/sisu/v2/dal_doc_str.rb8
-rw-r--r--lib/sisu/v2/dal_syntax.rb1
-rw-r--r--lib/sisu/v2/epub_format.rb5
-rw-r--r--lib/sisu/v2/epub_segments.rb3
-rw-r--r--lib/sisu/v2/html_format.rb7
-rw-r--r--lib/sisu/v2/html_scroll.rb2
-rw-r--r--lib/sisu/v2/html_segments.rb3
-rw-r--r--lib/sisu/v2/odf.rb19
-rw-r--r--lib/sisu/v2/odf_format.rb14
-rw-r--r--lib/sisu/v2/plaintext.rb12
-rw-r--r--lib/sisu/v2/texpdf.rb6
16 files changed, 98 insertions, 22 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index dfb374e..1f48644 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.10.orig.tar.gz (2010-12-13:50/1)
+%% 2.7.10.orig.tar.gz (2010-12-16:50/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
sisu_2.7.10.orig.tar.gz
sisu_2.7.10-1.dsc
@@ -20,11 +20,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
* dal_syntax, (sisu syntax)
* enforce use of curly braces in markup, remove single word markup without
- curly braces;
+ curly braces;
(requested fix, Ben Armstrong (live-manual), problematic for technical
writing)
* removed some undocumented alternative markup attributes
+ * object separator introduced
+ (requested Cory Doctorow, implementation not discussed)
+ * dal_syntax, object separator syntax (<:---> or <:ols>)
+ * constants, object separator
+ * vim syntax highlighting, match object separator
+
+ * document objects: page break; object separator
+ (introduced & used)
+ * dal, page break and object separator objects
+ * represent page break and object separator: plaintext, html, epub, odf,
+ texpdf (adjust later)
+
%% 2.7.9.orig.tar.gz (2010-12-09:49/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 47b3ce1..e1f2d14 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.10.orig.tar.gz (2010-12-13:50/1)
+%% 2.7.10.orig.tar.gz (2010-12-16:50/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
sisu_2.7.10.orig.tar.gz
sisu_2.7.10-1.dsc
@@ -20,11 +20,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.10.orig.tar.gz
* dal_syntax, (sisu syntax)
* enforce use of curly braces in markup, remove single word markup without
- curly braces;
+ curly braces;
(requested fix, Ben Armstrong (live-manual), problematic for technical
writing)
* removed some undocumented alternative markup attributes
+ * object separator introduced
+ (requested Cory Doctorow, implementation not discussed)
+ * dal_syntax, object separator syntax (<:---> or <:ols>)
+ * constants, object separator
+ * vim syntax highlighting, match object separator
+
+ * document objects: page break; object separator
+ (introduced & used)
+ * dal, page break and object separator objects
+ * represent page break and object separator: plaintext, html, epub, odf,
+ texpdf (adjust later)
+
%% 2.7.9.orig.tar.gz (2010-12-09:49/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 2071fa5..1f7e94b 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,6 +1,6 @@
"SiSU Vim syntax file
"SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-"SiSU Markup: SiSU (sisu-2.6.8, 2010-10-25)
+"SiSU Markup: SiSU (sisu-2.7.10, 2010-12-16)
"(originally looked at Ruby Vim by Mirko Nasato)
if version < 600
@@ -18,6 +18,7 @@ if !exists("sisu_no_identifiers")
syn match sisu_mark_endnote "\~^"
syn match sisu_break contains=@NoSpell "<br>\|<br />"
syn match sisu_control contains=@NoSpell "<:p[bn]>"
+ syn match sisu_control contains=@NoSpell "<:\(ols\|---\)>"
syn match sisu_marktail "[~-]#"
syn match sisu_control "\""
syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 390ceee..3af00be 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.7.10
-:date_stamp: 2010w50/1
+:version: 2.7.16
+:date_stamp: 2010w50/4
:date: "2010-12-10"
:project: SiSU
diff --git a/lib/sisu/v2/constants.rb b/lib/sisu/v2/constants.rb
index 9367e9c..6c949d5 100644
--- a/lib/sisu/v2/constants.rb
+++ b/lib/sisu/v2/constants.rb
@@ -93,6 +93,7 @@ Mx[:nbsp]= '░' #'▭ '
Mx[:br_line]= '▌' #lB ▌ 9612 #'┘' #'¶'
Mx[:br_paragraph]= '█' #FB █ 9608 # PP ∥ 8741 #'▐' #'┘' #'¶' #FB █ 9608 lB ▌ 9612 RB ▐ 9616
Mx[:br_nl]= '』' # '┘'
+Mx[:obj_ln_sep]= 'obj_ln_sep'; Hx[:obj_ln_sep]= {:obj=>Mx[:obj_ln_sep]} # line sep
Mx[:br_page]= 'break_page'; Hx[:br_page]= {:obj=>Mx[:br_page]} # newpage
Mx[:br_page_new]= 'break_page_new'; Hx[:br_page_new]= {:obj=>Mx[:br_page_new]} # clearpage
Mx[:br_endnotes]= "#{Mx[:mk_o]}ENDNOTES#{Mx[:mk_c]}"
diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb
index f1282df..bca3cf7 100644
--- a/lib/sisu/v2/dal_doc_str.rb
+++ b/lib/sisu/v2/dal_doc_str.rb
@@ -182,11 +182,13 @@ module SiSU_document_structure_extract
SiSU_document_structure::Object_para.new.paragraph(h)
else nil
end
- when /^(?:<?:p[bn]>?)\s*$/
- if t_o =~/^(?:<?:pn>?)\s*$/
+ when /^<?:p[bn]>?\s*$/
+ if t_o =~/^<?:pn>?\s*$/
SiSU_document_structure::Object_layout.new.break(Hx[:br_page_new])
else SiSU_document_structure::Object_layout.new.break(Hx[:br_page])
end
+ when /^<?:(?:ols|---)>?\s*$/
+ SiSU_document_structure::Object_layout.new.break(Hx[:obj_ln_sep])
else #paragraph
image=image_test(t_o)
note=endnote_test?(t_o)
@@ -784,7 +786,7 @@ module SiSU_document_structure_extract
@o_array=[]
node=ocn=ocn_dv=ocn_sp=ocnh=ocnh1=ocnh2=ocnh3=ocnh4=ocnh5=ocnh6=ocno=ocnp=ocnt=ocnc=ocng=ocni=ocnm=ocnu=ocnk=nm=0 # h heading, o other, t table, g group, i image
node_count_flag=false
- regex_exclude_ocn_and_node = /#{Rx[:meta]}|^@\S+?:\s|^4~endnotes|^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|^\^~ |<:e[:_]\d+?>|^#{Mx[:fa_o]}p[bn]#{Mx[:fa_c]}|^<:\#|<:- |<[:!]!4|<hr width|#{Mx[:br_endnotes]}/i #ocn here #&nbsp; added with Tune.code #¡
+ regex_exclude_ocn_and_node = /#{Rx[:meta]}|^@\S+?:\s|^4~endnotes|^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|^\^~ |<:e[:_]\d+?>|^<:\#|<:- |<[:!]!4|<hr width|#{Mx[:br_endnotes]}/i #ocn here #&nbsp; added with Tune.code #¡
parent=node1=node2=node3=node4=node5=node6=nil
data.each do |dob|
h={}
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb
index ead284c..47c7f8d 100644
--- a/lib/sisu/v2/dal_syntax.rb
+++ b/lib/sisu/v2/dal_syntax.rb
@@ -377,7 +377,6 @@ module SiSU_Syntax
dob.obj.gsub!(/(^|[#{Mx[:gl_c]}#{Mx[:lnk_c]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}(\s])(_(?:https?|ftp):\/\/\S+?\.[^>< ]+?)([,.;'"]?)(?=[\s#{Mx[:en_a_c]}#{Mx[:en_b_c]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}]|$)/m,
%{\\1#{Mx[:url_o]}\\2#{Mx[:url_c]}\\3})
end
- dob.obj.gsub!(/<:?p([nb])>/,"#{Mx[:fa_o]}p\\1#{Mx[:fa_c]}") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:<br>|<br \/>)\s*_([12])\s+/,'<br><:i\1> ')
dob=fontface(dob)
dob.obj.gsub!(/<[:e]\s+(.+?)!?>/,
"#{Mx[:en_a_o]}\\1#{Mx[:en_a_c]}") #not tested
diff --git a/lib/sisu/v2/epub_format.rb b/lib/sisu/v2/epub_format.rb
index e016b01..5b452f8 100644
--- a/lib/sisu/v2/epub_format.rb
+++ b/lib/sisu/v2/epub_format.rb
@@ -1744,6 +1744,11 @@ WOK
end
para_form_css('p','norm')
end
+ def break
+ @txt.gsub!(/#{Mx[:br_page_new]}|#{Mx[:br_page]}/,'<hr /><br />')
+ @txt.gsub!(/#{Mx[:obj_ln_sep]}/,'<hr style="width:30%" /><br />')
+ para_form_css('p','norm')
+ end
def format(tag,attrib)
para_form_css(tag,attrib)
end
diff --git a/lib/sisu/v2/epub_segments.rb b/lib/sisu/v2/epub_segments.rb
index 4edcc93..a09aebe 100644
--- a/lib/sisu/v2/epub_segments.rb
+++ b/lib/sisu/v2/epub_segments.rb
@@ -357,7 +357,6 @@ WOK
end
def markup(dob)
@debug=[]
- dob.obj.gsub!(/(?:\s*#{Mx[:br_page]}\s*|\s*#{Mx[:br_page_new]}\s*)+/m,'')
format_head_seg=SiSU_EPUB_Format::Head_seg.new(@md)
if dob.is =~/(?:heading|para)/ #extend as necessary FIX
@p_num=SiSU_EPUB_Format::Paragraph_number.new(@md,dob.ocn)
@@ -392,6 +391,8 @@ WOK
sto.code
elsif dob.is=='table'
sto.table
+ elsif dob.is=='break'
+ sto.break
end
if @md.flag_separate_endnotes # may need to revisit, check
dob.obj.gsub!(/"\s+href="#note_ref(\d+)">/,%{" href=\"endnotes#{Sfx[:epub_xhtml]}#note_ref\\1">}) #endnote- twice #removed file type
diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb
index 8074a7e..a59f82a 100644
--- a/lib/sisu/v2/html_format.rb
+++ b/lib/sisu/v2/html_format.rb
@@ -299,7 +299,7 @@ WOK
#{@vz.banner_band}
</td>
<td width="75%" align="center">
- #{doc_types}
+ #{doc_types}
</td>
<td width="5%" align="right">
&nbsp;#{firstseg}&nbsp;
@@ -1023,6 +1023,11 @@ WOK
end
para_form_css('p','norm')
end
+ def break
+ @txt.gsub!(/#{Mx[:br_page_new]}|#{Mx[:br_page]}/,'<hr /><br />')
+ @txt.gsub!(/#{Mx[:obj_ln_sep]}/,'<hr style="width:30%" /><br />')
+ para_form_css('p','norm')
+ end
def format(tag,attrib)
para_form_css(tag,attrib)
end
diff --git a/lib/sisu/v2/html_scroll.rb b/lib/sisu/v2/html_scroll.rb
index 049eb92..bc6b481 100644
--- a/lib/sisu/v2/html_scroll.rb
+++ b/lib/sisu/v2/html_scroll.rb
@@ -174,6 +174,8 @@ module SiSU_HTML_scroll
sto.code
elsif dob.is=='table'
sto.table
+ elsif dob.is=='break'
+ sto.break
end
if dob =~/<a name="n\d+">/ \
and dob =~/^(?:\^~\d+\s|<!e[:_]\d+!>)/ # hmmm re-adjusted 200507, for alt endnote which should again be matched ^~ ... not in response to problem though
diff --git a/lib/sisu/v2/html_segments.rb b/lib/sisu/v2/html_segments.rb
index a516d80..c1649a8 100644
--- a/lib/sisu/v2/html_segments.rb
+++ b/lib/sisu/v2/html_segments.rb
@@ -357,7 +357,6 @@ module SiSU_HTML_seg
end
def markup(dob)
@debug=[]
- dob.obj.gsub!(/(?:\s*#{Mx[:br_page]}\s*|\s*#{Mx[:br_page_new]}\s*)+/m,'')
format_head_seg=SiSU_HTML_Format::Head_seg.new(@md)
if dob.is !~/meta/
if dob.is =~/(?:heading|para)/ #extend as necessary FIX
@@ -398,6 +397,8 @@ module SiSU_HTML_seg
sto.code
elsif dob.is=='table'
sto.table
+ elsif dob.is=='break'
+ sto.break
end
if @md.flag_separate_endnotes
dob.obj.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type
diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb
index 769870e..d19945c 100644
--- a/lib/sisu/v2/odf.rb
+++ b/lib/sisu/v2/odf.rb
@@ -411,6 +411,18 @@ module SiSU_ODF
end
dob
end
+ def obj_break(dob)
+ if dob.is =='break'
+ br=SiSU_ODF_format::Format_obj_break.new(@md,dob)
+ if dob.obj==Mx[:br_page] \
+ or dob.obj==Mx[:br_page_new]
+ dob=br.br_page
+ elsif dob.obj==Mx[:obj_ln_sep]
+ dob=br.obj_sep
+ end
+ end
+ dob
+ end
def odf_structure(md,dob)
@md,@dob=md,dob
dob=if dob.is !='code'
@@ -431,6 +443,8 @@ module SiSU_ODF
@@odf[:body] << code(dob).obj << @br*2
elsif dob.is=='table' #elsif dob.obj =~ /<!Th?¡/u
@@odf[:body] << table(dob).obj << @br*2
+ elsif dob.is=='break'
+ @@odf[:body] << obj_break(dob).obj << @br*2
else
@@odf[:body] << normal(dob).obj << @br*2 # main text, contents, body KEEP
end
@@ -492,8 +506,6 @@ module SiSU_ODF
dob.obj
end
dob.obj.gsub!(/#{Mx[:br_line]}/,'<br />')
- dob.obj.gsub!(/#{Mx[:br_page]}|#{Mx[:br_page_new]}/,
- '<text:p text:style-name="P8"> </text:p>')
dob.obj.gsub!(/&#169;/,'©') #too arbitrary
dob.obj.gsub!(/.+?<-#>/,'') # remove dummy headings (used by html) #check
dob.obj.gsub!(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,
@@ -517,7 +529,6 @@ module SiSU_ODF
dob.obj.gsub!(/\\copy(?:right)?\b/,'&#169;')
dob.obj.gsub!(/\\trademark\b|\\tm\b/,'&#174;')
dob.obj.gsub!(/\44/,'&#36;') #$ watch
- dob.obj.gsub!(/#{Mx[:br_page]}|#{Mx[:br_page_new]}/,'') # remove page breaks
dob.obj.gsub!(/<a href=".+?">(.+?)<\/a>/,'\1')
dob.obj.gsub!(/#{Mx[:mk_o]}name#\S+?#{Mx[:mk_c]}/,'') # remove name links
wordlist=dob.obj.scan(/\S+/)
@@ -528,7 +539,7 @@ module SiSU_ODF
if defined? dob.ocn and dob.ocn =~/\d+/
@p_num=SiSU_ODF_format::Paragraph_number.new(dob.ocn)
end
- if dob.is=~/heading|para|group|verse|code|table/ # extend, include other types
+ if dob.is=~/heading|para|group|verse|code|table|break/ # extend, include other types
odf_structure(@md,dob)
end
dob.obj.gsub!(/<!.+!>/,' ') if dob.obj ## Clean Prepared Text
diff --git a/lib/sisu/v2/odf_format.rb b/lib/sisu/v2/odf_format.rb
index 384b46b..77b5bbb 100644
--- a/lib/sisu/v2/odf_format.rb
+++ b/lib/sisu/v2/odf_format.rb
@@ -197,6 +197,20 @@ module SiSU_ODF_format
@dob
end
end
+ class Format_obj_break
+ def initialize(md,t_o)
+ @md,@t_o=md,t_o
+ end
+ def br_page
+ @t_o.obj='<text:p text:style-name="P8"> </text:p>'
+ @t_o
+ end
+ def obj_sep #center later
+ sep='--- '
+ @t_o.obj=%{<text:p text:style-name="P1">#{sep*20}</text:p>}
+ @t_o
+ end
+ end
class XML
end
end
diff --git a/lib/sisu/v2/plaintext.rb b/lib/sisu/v2/plaintext.rb
index e919af7..ba14697 100644
--- a/lib/sisu/v2/plaintext.rb
+++ b/lib/sisu/v2/plaintext.rb
@@ -328,13 +328,12 @@ WOK
dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _> _<
dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _<_<
end
- dob.obj.gsub!(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}/,'') # remove page breaks
dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1')
dob.obj.gsub!(/<a href=".+?">(.+?)<\/a>/m,'\1')
dob.obj.gsub!(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'') # remove name links
dob.obj.gsub!(/&nbsp;|#{Mx[:nbsp]}/,' ') # decide on
dob.obj.gsub!(/(?:^|[^_\\])#{Mx[:lnk_o]}(\S+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/,' [ \1 ]') #"[ #{dir.url.images_local}\/\\1 ]")
- dob.obj.gsub!(/(?:^|[^_\\])#{Mx[:lnk_o]}(\S+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,' [ \1 ]') #"[ #{dir.url.images_local}\/\\1 ]")
+ dob.obj.gsub!(/(?:^|[^_\\])#{Mx[:lnk_o]}(\S+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,' [ \1 ]')
dob.obj.gsub!(/(?:^|[^_\\])\{\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*\}\S+/,'[image: "\1"]')
wordlist=dob.obj.scan(/\S+/)
if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
@@ -350,6 +349,15 @@ WOK
or dob.is=='code' \
or dob.is=='table'
@plaintext[:body] << dob.obj << @br
+ elsif dob.is=='break'
+ sp=' '
+ ln='-'
+ @plaintext[:body] <<=if dob.obj==Mx[:br_page] \
+ or dob.obj==Mx[:br_page_new]
+ "#{@br}#{ln*40}#{@br*2}"
+ elsif dob.obj ==Mx[:obj_ln_sep]
+ "#{@br}#{sp*20}* * *#{@br*2}"
+ end # following empty line (@br) missing, fix
end
dob='' if (dob.obj =~/<a name="n\d+">/ \
and dob.obj =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote
diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb
index 3a868cd..a1a2813 100644
--- a/lib/sisu/v2/texpdf.rb
+++ b/lib/sisu/v2/texpdf.rb
@@ -72,7 +72,7 @@ module SiSU_TeX
@@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}\\\\hspace\\\{0mm\\\}\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/
@@n=@@tableheader=@@rights=nil
@@date ||=SiSU_Env::Info_date.new
- class Source #Songsheet #<SiSU_Param::MyFiles
+ class Source
require 'pstore'
require "#{SiSU_lib}/sysenv" # sysenv.rb
include SiSU_Env
@@ -146,7 +146,7 @@ module SiSU_TeX
end
end
private
- class LaTeX_to_pdf #<Songsheet
+ class LaTeX_to_pdf
require 'fileutils'
include FileUtils #::Verbose
@@n_lpdf||=0 #change
@@ -344,6 +344,7 @@ module SiSU_TeX
elsif dob.is =='break'
if dob.obj==Mx[:br_page]; dob.tmp='\newpage'
elsif dob.obj==Mx[:br_page_new]; dob.tmp='\clearpage'
+ elsif dob.obj==Mx[:obj_ln_sep]; dob.tmp='\parasep'
end
elsif dob.is=='comment' \
or dob.is=='meta'
@@ -571,6 +572,7 @@ module SiSU_TeX
\\definecolor{Light}{gray}{.92}
\\newcommand{\\Codeblock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1}
\\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1}
+\\newcommand{\\parasep}{\\\\ \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\\\}
% \\sloppy
\\begin{document}
WOK