aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG20
-rw-r--r--conf/sisu/version.yml4
-rw-r--r--lib/sisu/v0/texpdf.rb2
-rw-r--r--lib/sisu/v0/texpdf_format.rb6
4 files changed, 18 insertions, 14 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9f6603d3..41a3f097 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,18 +9,18 @@ Reverse Chronological:
%% STABLE MANIFEST
-%% sisu_0.69.0.orig.tar.gz (2008-08-26:34/2)
+%% sisu_0.69.0.orig.tar.gz (2008-08-28:34/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
sisu_0.69.0.orig.tar.gz
sisu_0.69.0-1.dsc
sisu_0.69.0-1.diff.gz
- * html increased use of css, necessary to re-initialise sisu output directory
- with new css files [version number bump]
-
- sisu -CC
-
- * html css, use of mini table of contents
+ * html
+ * increased use of css, necessary to re-initialise sisu output directory
+ with new css files [version number bump]
+ sisu -CC
+ * html css, use of mini table of contents placed in left column for
+ segmented text
* texpdf
* pdf document typesetting dimensions
@@ -28,10 +28,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
* better representation of tilde
* removal of a maths package gives back typeface changes like bold
* landscape output, tables fixed
+ * paragraph alignment, assigned 0 width to required space, (removing space
+ at beginning of paragraph)
+ * footnote, number placement changed, and left alignment (ragged edges)
+ used
* middle layer, url representation changed, downstream code affected
- * internal greater use of passing of hash to formatting modules
+ * internal, greater use of passing of hash to formatting modules
%% sisu_0.68.0.orig.tar.gz (2008-07-22:29/2)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0.orig.tar.gz
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
index d9f5b0e2..70d4f342 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version.yml
@@ -1,5 +1,5 @@
---
:version: 0.69.0-beta
-:date_stamp: 2008w34/2
-:date: "2008-08-26"
+:date_stamp: 2008w34/4
+:date: "2008-08-28"
:project: SiSU
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb
index 19e0a119..f86d8729 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v0/texpdf.rb
@@ -72,7 +72,7 @@ module SiSU_TeX
@@tabular="{tabular}"
@@column_instruct=@@squigle_close=@@tex_line_mode=@@tex_word_mode=@@line_mode=''
@@tex_debug_counter=@@table_pagebreak_counter=@@tex_footnote_call_counter=@@tex_table_flag=@@tex_counter=@@tex_column=@@tex_columns=@@tex_columns=@@counting=0
- @@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}~\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/
+ @@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}\\\\hspace\\\{0mm\\\}\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/
#@@tex_pattern_margin_number="\\\\marginpar.+?\s+"
@@n=@@tableheader=@@rights=nil
@@date ||=SiSU_Env::Info_date.new
diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb
index 04dae4d8..c224d4aa 100644
--- a/lib/sisu/v0/texpdf_format.rb
+++ b/lib/sisu/v0/texpdf_format.rb
@@ -68,7 +68,7 @@ module SiSU_TeX_Pdf
@@sys=SiSU_Env::System_call.new
@@tex_backslash="\\\\"
@@tilde='\\\\\\~' #?? debug crazy
- @@tex_pattern_margin_number=/\\begin\{tiny\}~\\end\{tiny\}\{\\marginpar.+?\}\}\}/
+ @@tex_pattern_margin_number=/\\begin\{tiny\}\\hspace\{0mm\}\\end\{tiny\}\{\\marginpar.+?\}\}\}/
@@tableheader={
'a4' => { :p => 0, :l => 0 },
'a5' => { :p => 0, :l => 0 },
@@ -559,7 +559,7 @@ para
paranumber_display=if @md.markup.inspect =~/no_ocn/ \
or @md.mod.inspect =~/--no-ocn/
''
- else "\\begin{tiny}~\\end{tiny}{\\marginpar{\\begin{tiny}#@ocn\\end{tiny}}}" #ocn object citation numbering
+ else "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}#@ocn\\end{tiny}}}" #ocn object citation numbering
end
if @txt !~/^(?:#{Mx[:lv_o]}[1-6a-z-]:|#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}|<:.+?>|#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6})/
@txt.gsub!(/^\s*(.+)/m,"#{paranumber_display}\\1\n") #watch - in 1-6 is suspect
@@ -1189,7 +1189,7 @@ WOK
string.gsub!(/\#/,'\#')
string.gsub!(/\%/,'\%')
string.gsub!(/\~/,'\~') #revist, should not be necessary to mark remaining tildes
- if string !~/^\s*#{Mx[:lnk_o]}|#{Mx[:lnk_c]}image\s/
+ if string !~/^\s*#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}image\s/
string.gsub!(/_/,'\_')
end
string.gsub!(/\{/,'\{')