diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-05-26 15:40:01 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-05-26 15:40:01 -0400 |
| commit | c142eedb1854395c4b31bbb4852ca5e10fbaea70 (patch) | |
| tree | 05f582c5129f7c82be2ae2b42317a5c68f1f770b /lib/sisu/v2/dal_numbering.rb | |
| parent | debian/changelog (2.3.5-1) (diff) | |
| parent | update: changelog, version (2.4.0) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/dal_numbering.rb')
| -rw-r--r-- | lib/sisu/v2/dal_numbering.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sisu/v2/dal_numbering.rb b/lib/sisu/v2/dal_numbering.rb index c8460ced..c62ff8d9 100644 --- a/lib/sisu/v2/dal_numbering.rb +++ b/lib/sisu/v2/dal_numbering.rb @@ -354,6 +354,10 @@ module SiSU_numbering end if defined? dob.ocn \ and dob.ocn + @segname=((dob.is=='heading'|| dob.is=='heading_insert') && dob.ln==4 && (defined? dob.name)) \ + ? (dob.name) \ + : @segname + tags["#{dob.ocn}"]={:segname=>@segname} ocn_html_seg[dob.ocn]=if dob.is =~/heading/ x=if dob.ln =~/[1-3]/ {:seg=>nil,:level=> dob.ln} @@ -367,9 +371,9 @@ module SiSU_numbering dob.tags=dob.tags.uniq if defined? dob.tags if defined? dob.tags \ and dob.tags.length > 0 - @segname=((dob.is=='heading'|| dob.is=='heading_insert') && dob.ln==4 && (defined? dob.name)) \ - ? (dob.name) \ - : @segname + #@segname=((dob.is=='heading'|| dob.is=='heading_insert') && dob.ln==4 && (defined? dob.name)) \ + #? (dob.name) \ + #: @segname dob.tags.each do |x| tags[x]={:ocn=>dob.ocn.to_s,:segname=>@segname} #@tags[x.to_s]=[dob.ocn.to_s,@segname.to_s] end |