jro_apps/redmine Commit - r5600:29f6dd2a9e77

PDF: import CJK patches and all languages use TCPDF (#8312)....

Toshi MARUYAMA -

r5600:29f6dd2a9e77

parent child

Context file:

r5600:29f6dd2a9e77

Collapse all files

lib/redmine/export/pdf.rb +2 -10

                   # Returns a PDF string of a list of issues
                   def issues_to_pdf(issues, project, query)
-                    if l(:general_pdf_encoding).upcase != 'UTF-8'
+                    pdf = ITCPDF.new(current_language)
-                      pdf = IFPDF.new(current_language)
-                    else
-                      pdf = ITCPDF.new(current_language)
-                    end
                     title = query.new_record? ? l(:label_issue_plural) : query.name
                     title = "#{project} - #{title}" if project
                     pdf.SetTitle(title)
                   # Returns a PDF string of a single issue
                   def issue_to_pdf(issue)
-                    if l(:general_pdf_encoding).upcase != 'UTF-8'
+                    pdf = ITCPDF.new(current_language)
-                      pdf = IFPDF.new(current_language)
-                    else
-                      pdf = ITCPDF.new(current_language)
-                    end
                     pdf.SetTitle("#{issue.project} - ##{issue.tracker} #{issue.id}")
                     pdf.alias_nb_pages
                     pdf.footer_date = format_date(Date.today)

lib/redmine/helpers/gantt.rb +1 -5

                   end if Object.const_defined?(:Magick)
                   def to_pdf
-                    if l(:general_pdf_encoding).upcase != 'UTF-8'
+                    pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
-                      pdf = ::Redmine::Export::PDF::IFPDF.new(current_language)
-                    else
-                      pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
-                    end
                     pdf.SetTitle("#{l(:label_gantt)} #{project}")
                     pdf.alias_nb_pages
                     pdf.footer_date = format_date(Date.today)

vendor/plugins/rfpdf/lib/fpdf/chinese.rb +26 -26

               end
               def GetStringWidth(s)
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		return GetMBStringWidth(s)
               	else
               		return super(s)
               def GetMBStringWidth(s)
               	#Multi-byte version of GetStringWidth()
               	l=0
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
               	nb=s.length
               	i=0
               	while(i<nb)
               			i+=2
               		end
               	end
-              	return l*@FontSize/1000
+              	return l*@font_size/1000
               end
               def MultiCell(w,h,txt,border=0,align='L',fill=0)
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		MBMultiCell(w,h,txt,border,align,fill)
               	else
               		super(w,h,txt,border,align,fill)
               def MBMultiCell(w,h,txt,border=0,align='L',fill=0)
               	#Multi-byte version of MultiCell()
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
               	if(w==0)
-              		w=@w-@rMargin-@x
+              		w=@w-@r_margin-@x
             		end
-              	wmax=(w-2*@cMargin)*1000/@FontSize
+              	wmax=(w-2*@c_margin)*1000/@font_size
               	s=txt.gsub("\r",'')
               	nb=s.length
               	if(nb>0 and s[nb-1]=="\n")
               		b+='B'
             		end
               	Cell(w,h,s[j,i-j],b,2,align,fill)
-              	@x=@lMargin
+              	@x=@l_margin
               end
               def Write(h,txt,link='')
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		MBWrite(h,txt,link)
               	else
               		super(h,txt,link)
               def MBWrite(h,txt,link)
               	#Multi-byte version of Write()
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
-              	w=@w-@rMargin-@x
+              	w=@w-@r_margin-@x
-              	wmax=(w-2*@cMargin)*1000/@FontSize
+              	wmax=(w-2*@c_margin)*1000/@font_size
               	s=txt.gsub("\r",'')
               	nb=s.length
               	sep=-1
               			j=i
               			l=0
               			if(nl==1)
-              				@x=@lMargin
+              				@x=@l_margin
-              				w=@w-@rMargin-@x
+              				w=@w-@r_margin-@x
-              				wmax=(w-2*@cMargin)*1000/@FontSize
+              				wmax=(w-2*@c_margin)*1000/@font_size
               			end
               			nl+=1
               			next
               		if(l>wmax)
               			#Automatic line break
               			if(sep==-1 or i==j)
-              				if(@x>@lMargin)
+              				if(@x>@l_margin)
               					#Move to next line
-              					@x=@lMargin
+              					@x=@l_margin
               					@y+=h
-              					w=@w-@rMargin-@x
+              					w=@w-@r_margin-@x
-              					wmax=(w-2*@cMargin)*1000/@FontSize
+              					wmax=(w-2*@c_margin)*1000/@font_size
               					i+=1
               					nl+=1
               					next
               			j=i
               			l=0
               			if(nl==1)
-              				@x=@lMargin
+              				@x=@l_margin
-              				w=@w-@rMargin-@x
+              				w=@w-@r_margin-@x
-              				wmax=(w-2*@cMargin)*1000/@FontSize
+              				wmax=(w-2*@c_margin)*1000/@font_size
               			end
               			nl+=1
               		else
               	end
               	#Last chunk
               	if(i!=j)
-              		Cell(l/1000*@FontSize,h,s[j,i-j],0,0,'',0,link)
+              		Cell(l/1000*@font_size,h,s[j,i-j],0,0,'',0,link)
             		end
               end
               	end
               	# mqr=get_magic_quotes_runtime()
               	# set_magic_quotes_runtime(0)
-                @FontFiles.each_pair do |file, info|
+                @font_files.each_pair do |file, info|
               		#Font file embedding
               		newobj()
-              		@FontFiles[file]['n']=@n
+              		@font_files[file]['n']=@n
               		if(defined('FPDF_FONTPATH'))
               			file=FPDF_FONTPATH+file
             			end
               				end
               				file=font['file']
               				if(file)
-              					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@FontFiles[file]['n']+' 0 R'
+              					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@font_files[file]['n']+' 0 R'
               				end
               				out(s+'>>')
               				out('endobj')

vendor/plugins/rfpdf/lib/fpdf/japanese.rb +26 -26

               end
               def GetStringWidth(s)
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		return GetSJISStringWidth(s)
               	else
               		return super(s)
               def GetSJISStringWidth(s)
               	#SJIS version of GetStringWidth()
               	l=0
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
               	nb=s.length
               	i=0
               	while(i<nb)
               			i+=2
               		end
               	end
-              	return l*@FontSize/1000
+              	return l*@font_size/1000
               end
               def MultiCell(w,h,txt,border=0,align='L',fill=0)
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		SJISMultiCell(w,h,txt,border,align,fill)
               	else
               		super(w,h,txt,border,align,fill)
               def SJISMultiCell(w,h,txt,border=0,align='L',fill=0)
               	#Output text with automatic or explicit line breaks
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
               	if(w==0)
-              		w=@w-@rMargin-@x
+              		w=@w-@r_margin-@x
               	end
-              	wmax=(w-2*@cMargin)*1000/@FontSize
+              	wmax=(w-2*@c_margin)*1000/@font_size
               	s=txt.gsub("\r",'')
               	nb=s.length
               	if(nb>0 and s[nb-1]=="\n")
               		b+='B'
               	end
               	Cell(w,h,s[j,i-j],b,2,align,fill)
-              	@x=@lMargin
+              	@x=@l_margin
               end
               def Write(h,txt,link='')
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
              		SJISWrite(h,txt,link)
              	else
              		super(h,txt,link)
               def SJISWrite(h,txt,link)
               	#SJIS version of Write()
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
-              	w=@w-@rMargin-@x
+              	w=@w-@r_margin-@x
-              	wmax=(w-2*@cMargin)*1000/@FontSize
+              	wmax=(w-2*@c_margin)*1000/@font_size
               	s=txt.gsub("\r",'')
               	nb=s.length
               	sep=-1
               			l=0
               			if(nl==1)
               				#Go to left margin
-              				@x=@lMargin
+              				@x=@l_margin
-              				w=@w-@rMargin-@x
+              				w=@w-@r_margin-@x
-              				wmax=(w-2*@cMargin)*1000/@FontSize
+              				wmax=(w-2*@c_margin)*1000/@font_size
               			end
               			nl+=1
               			next
               		if(l>wmax)
               			#Automatic line break
               			if(sep==-1 or i==j)
-              				if(@x>@lMargin)
+              				if(@x>@l_margin)
               					#Move to next line
-              					@x=@lMargin
+              					@x=@l_margin
               					@y+=h
-              					w=@w-@rMargin-@x
+              					w=@w-@r_margin-@x
-              					wmax=(w-2*@cMargin)*1000/@FontSize
+              					wmax=(w-2*@c_margin)*1000/@font_size
               					i+=n
               					nl+=1
               					next
               			j=i
               			l=0
               			if(nl==1)
-              				@x=@lMargin
+              				@x=@l_margin
-              				w=@w-@rMargin-@x
+              				w=@w-@r_margin-@x
-              				wmax=(w-2*@cMargin)*1000/@FontSize
+              				wmax=(w-2*@c_margin)*1000/@font_size
               			end
               			nl+=1
               		else
               	end
               	#Last chunk
               	if(i!=j)
-              		Cell(l/1000*@FontSize,h,s[j,i-j],0,0,'',0,link)
+              		Cell(l/1000*@font_size,h,s[j,i-j],0,0,'',0,link)
               	end
               end
               	end
               	# mqr=get_magic_quotes_runtime()
               	# set_magic_quotes_runtime(0)
-                @FontFiles.each_pair do |file, info|
+                @font_files.each_pair do |file, info|
               		#Font file embedding
               		newobj()
-              		@FontFiles[file]['n']=@n
+              		@font_files[file]['n']=@n
               		if(defined('FPDF_FONTPATH'))
               			file=FPDF_FONTPATH+file
                 	end
                     	end
               				file=font['file']
               				if(file)
-              					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@FontFiles[file]['n']+' 0 R'
+              					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@font_files[file]['n']+' 0 R'
                     	end
               				out(s+'>>')
               				out('endobj')

vendor/plugins/rfpdf/lib/fpdf/korean.rb +26 -26

               end
               def GetStringWidth(s)
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		return GetMBStringWidth(s)
               	else
               		return super(s)
               def GetMBStringWidth(s)
               	#Multi-byte version of GetStringWidth()
               	l=0
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
               	nb=s.length
               	i=0
               	while(i<nb)
               			i+=2
               		end
               	end
-              	return l*@FontSize/1000
+              	return l*@font_size/1000
               end
               def MultiCell(w,h,txt,border=0,align='L',fill=0)
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		MBMultiCell(w,h,txt,border,align,fill)
               	else
               		super(w,h,txt,border,align,fill)
               def MBMultiCell(w,h,txt,border=0,align='L',fill=0)
               	#Multi-byte version of MultiCell()
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
               	if(w==0)
-              		w=@w-@rMargin-@x
+              		w=@w-@r_margin-@x
                 end
-              	wmax=(w-2*@cMargin)*1000/@FontSize
+              	wmax=(w-2*@c_margin)*1000/@font_size
               	s=txt.gsub("\r",'')
               	nb=s.length
               	if(nb>0 and s[nb-1]=="\n")
               		b+='B'
                 end
               	Cell(w,h,s[j,i-j],b,2,align,fill)
-              	@x=@lMargin
+              	@x=@l_margin
               end
               def Write(h,txt,link='')
-              	if(@CurrentFont['type']=='Type0')
+              	if(@current_font['type']=='Type0')
               		MBWrite(h,txt,link)
               	else
               		super(h,txt,link)
               def MBWrite(h,txt,link)
               	#Multi-byte version of Write()
-              	cw=@CurrentFont['cw']
+              	cw=@current_font['cw']
-              	w=@w-@rMargin-@x
+              	w=@w-@r_margin-@x
-              	wmax=(w-2*@cMargin)*1000/@FontSize
+              	wmax=(w-2*@c_margin)*1000/@font_size
               	s=txt.gsub("\r",'')
               	nb=s.length
               	sep=-1
               			j=i
               			l=0
               			if(nl==1)
-              				@x=@lMargin
+              				@x=@l_margin
-              				w=@w-@rMargin-@x
+              				w=@w-@r_margin-@x
-              				wmax=(w-2*@cMargin)*1000/@FontSize
+              				wmax=(w-2*@c_margin)*1000/@font_size
               			end
               			nl+=1
               			next
               		if(l>wmax)
               			#Automatic line break
               			if(sep==-1 or i==j)
-              				if(@x>@lMargin)
+              				if(@x>@l_margin)
               					#Move to next line
-              					@x=@lMargin
+              					@x=@l_margin
               					@y+=h
-              					w=@w-@rMargin-@x
+              					w=@w-@r_margin-@x
-              					wmax=(w-2*@cMargin)*1000/@FontSize
+              					wmax=(w-2*@c_margin)*1000/@font_size
               					i+=1
               					nl+=1
               					next
               			j=i
               			l=0
               			if(nl==1)
-              				@x=@lMargin
+              				@x=@l_margin
-              				w=@w-@rMargin-@x
+              				w=@w-@r_margin-@x
-              				wmax=(w-2*@cMargin)*1000/@FontSize
+              				wmax=(w-2*@c_margin)*1000/@font_size
               			end
               			nl+=1
               		else
               	end
               	#Last chunk
               	if(i!=j)
-              		Cell(l/1000*@FontSize,h,s[j,i-j],0,0,'',0,link)
+              		Cell(l/1000*@font_size,h,s[j,i-j],0,0,'',0,link)
                 end
               end
               	end
               	# mqr=get_magic_quotes_runtime()
               	# set_magic_quotes_runtime(0)
-                @FontFiles.each_pair do |file, info|
+                @font_files.each_pair do |file, info|
               		#Font file embedding
               		newobj()
-              		@FontFiles[file]['n']=@n
+              		@font_files[file]['n']=@n
               		if(defined('FPDF_FONTPATH'))
               			file=FPDF_FONTPATH+file
                   end
                       end
               				file=font['file']
               				if(file)
-              					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@FontFiles[file]['n']+' 0 R'
+              					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@font_files[file]['n']+' 0 R'
                       end
               				out(s+'>>')
               				out('endobj')

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages