maruku 0.2.10 → 0.2.11

data/bin/marutex

@@ -23,8 +23,8 @@ if File.basename($0) =~ /^marutex/
 		File.open(filename,'w') do |f| f.puts latex end
 
 		# run twice for cross references
-		system "pdflatex '#{job}'"
-		system "pdflatex '#{job}'"
+		system "pdflatex '#{job}'  '-output-directory=#{dir}' "
+		system "pdflatex '#{job}' '-output-directory=#{dir}' "
 		
 #		system "open #{job}.pdf"
 	end

data/docs/maruku.md

@@ -197,7 +197,8 @@ to transform to HTML.
 [^1]: "a different philosophy" stands for "ugly" `:-)`
 
 The in-memory representation makes it very easy to export
-to various formats (altough, for, now)
+to various formats (at the moment HTML and LaTeX/PDF; 
+the next is pretty-printed Markdown).
 
 Other improvements over Bluecloth:
 
@@ -420,23 +421,39 @@ produces:
 
 * * *
 
-Other Features
+@ #features
+Other Features 
 --------------
 
 ### Automatic generation of the table of contents ###
 
-If you create a list, and the set the `toc` attribute, when rendering
+If you create a list, and then set the `toc` attribute, when rendering
 Maruku will create an auto-generated table of contents.
 
 	@ toc
-	* This will become a table of contents
+	* This will become a table of contents (this text will be scraped).
 
 You can see an example of this at the beginning of this document.
 
 ### This header contains *emphasis* **strong text** and `code` ####
 
-Note that this header contains formatting and it still works, also
-in the table of contents.
+Note that this header contains formatting and it still works, also in the table of contents.
+
+And [This is a *link* with **all** ***sort*** of `weird stuff`](#features) in the text.
+
+### Use HTML entities ###
+
+If you want to use HTML entities, go on! We will take care
+of the translation to LaTeX:
+
+Entity      | Result
+------------|----------
+`©`    |  ©
+`£`   |  £
+`a b`  |  a b
+`λ`  |  λ
+`—`   |  —
+
 
 TODO list
 --------------------------
@@ -473,8 +490,8 @@ I would love to have an equivalent in Ruby.
 
 Maybe something like this:
   
-	This is a paragraph. The second line of this paragraph has
-	the last element {with meta data}@ class: important_span
+	This is a paragraph. Really, a normal paragraph. The second 
+	line of this  paragraph has the last element {with meta data}@   class: important_span
 	and the paragraph continues...
 
 So the idea is:
@@ -486,13 +503,6 @@ So the idea is:
   3. Closing brace and at-symbol `}@`.
   4. Attributes specification like the block-level metadata.
 
-Other examples:
-
-	Lorem ipsum dolor sit amet, consectetuer adipiscing 
-	elit. Donec sit amet sapien vitae augue {interdum hendrerit.}@  id: special
-	Maecenas tempor ultrices nisl. Praesent laoreet tortor sit
-	amet est. Praesent in nisl eu libero sodales bibendum.
-
 Or, we could allow metadata specified **after the text**.
 In the following, three fragments are marked as "special", 
 and, after their containing block-level elements, their 

data/lib/maruku.rb

@@ -19,10 +19,13 @@
 # Structures definition
 require 'maruku/structures'
 
-# Code for parsing block-level elements
+# Code for parsing whole Markdown documents
+require 'maruku/parse_doc'
+
+# Code for parsing Markdown block-level elements
 require 'maruku/parse_block'
 
-# Code for parsing span-level elements
+# Code for parsing Markdown span-level elements
 require 'maruku/parse_span'
 
 # Ugly things kept in a closet
@@ -41,6 +44,7 @@ require 'maruku/to_html'
 # Exporting to latex
 require 'maruku/to_latex'
 require 'maruku/to_latex_strings'
+require 'maruku/to_latex_entities'
 
 # Exporting to text: strips all formatting (not complete)
 require 'maruku/to_s'

data/lib/maruku/parse_block.rb

@@ -17,89 +17,6 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class Maruku
-	def initialize(s=nil)
-		@node_type = :document
-		@doc       = self
-
-		@refs = {}
-		@footnotes = {}
-		@abbreviations = {}
-		
-		parse_doc(s) if s 
-	end
-		
-	def parse_doc(s)
-		# setup initial stack
-		@stack = []
-		
-		@meta = parse_email_headers(s)
-		lines =  split_lines(@meta[:data])
-		@children = parse_lines_as_markdown(lines)
-		
-		self.search_abbreviations
-		self.substitute_markdown_inside_raw_html
-		
-		toc = create_toc
-
-		# use title if not set
-		if not self.meta[:title] and toc.header_element
-			title = toc.header_element.to_s
-			self.meta[:title]  = title
-			puts "Set document title to #{title}"
-		end
-		
-		# save for later use
-		self.toc = toc
-		
-		#puts toc.inspect
-	end
-
-	def search_abbreviations
-		@abbreviations.each do |abbrev, title|
-#		puts "#{abbrev} => #{title}"
-			self.map_match(Regexp.new(Regexp.escape(abbrev))) {
-				e = create_md_element(:abbreviation)
-				e.children = [abbrev.dup]
-				e.meta[:title] = title.dup if title
-				e
-			}
-		end
-	end
-	
-	# (PHP Markdown extra) Search for elements that have
-	# markdown=1 or markdown=block defined
-	def substitute_markdown_inside_raw_html
-		self.each_element(:raw_html) do |e|
-			doc = e.meta[:parsed_html]
-			if doc # valid html
-				# parse block-level markdown elements in these HTML tags
-				block_tags = ['div']
-				# use xpath to find elements with 'markdown' attribute
-				doc.elements.to_a( "//*[attribute::markdown]" ).each do |e|
-					# should we parse block-level or span-level?
-					parse_blocks = (e.attributes['markdown'] == 'block') || 
-					               block_tags.include?(e.name)
-					# remove 'markdown' attribute
-					e.delete_attribute 'markdown'
-					# Select all text elements of e
-					e.texts.each do |original_text|
-#						puts "parse_blocks = #{parse_blocks} found = #{original_text} "
-						s = original_text.to_s.strip # XXX
-						el = create_md_element(:dummy,
-						 	parse_blocks ? parse_text_as_markdown(s) :
-						                  parse_lines_as_span(s) )
-						el.children_to_html.each do |x|
-							e.insert_before(original_text, x)
-						end
-						e.delete(original_text)
-					end
-					
-				end
-			end
-		end
-	end
-
-
 	# Splits the string and calls parse_lines_as_markdown
 	def parse_text_as_markdown(text)
 		lines =  split_lines(text)
@@ -317,7 +234,7 @@ class Maruku
 			read_indented_content(indentation, break_list, item_type)
 
 		# add first line
-			# Strip first '*' or '-' from first line
+			# Strip first '*', '-', '+' from first line
 			stripped = first[indentation, first.size-1]
 		lines.unshift stripped
 		
@@ -507,6 +424,7 @@ class Maruku
 				stuff.split.each do |couple|
 #					puts "found #{couple}"
 					k, v = couple.split('=')
+					v ||= ""
 					if v[0,1]=='"' then v = v[1, v.size-2] end
 #					puts "key:_#{k}_ value=_#{v}_"
 					hash[k.to_sym] = v
@@ -595,15 +513,15 @@ class Maruku
 
 		want_paragraph = false
 
-		raise "Bug!Bug" if not cur_line
-					
+		raise "Chunky Bacon!" if not cur_line
+
 		# one optional empty
 		if cur_line_node_type == :empty
 			want_my_paragraph = true
 			shift_line
 		end
 		
-		raise "Bug!Bug" if cur_line_node_type != :definition
+		raise "Chunky Bacon!" if cur_line_node_type != :definition
 		
 		# Read one or more definitions
 		definitions = []

data/lib/maruku/parse_doc.rb

@@ -0,0 +1,102 @@
+#   Copyright (C) 2006  Andrea Censi  <andrea (at) rubyforge.org>
+#
+# This file is part of Maruku.
+# 
+#   Maruku is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   Maruku is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with Maruku; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+class Maruku
+	def initialize(s=nil)
+		@node_type = :document
+		@doc       = self
+
+		@refs = {}
+		@footnotes = {}
+		@abbreviations = {}
+		
+		parse_doc(s) if s 
+	end
+		
+	def parse_doc(s)
+		# setup initial stack
+		@stack = []
+		
+		@meta = parse_email_headers(s)
+		lines =  split_lines(@meta[:data])
+		@children = parse_lines_as_markdown(lines)
+		
+		self.search_abbreviations
+		self.substitute_markdown_inside_raw_html
+		
+		toc = create_toc
+
+		# use title if not set
+		if not self.meta[:title] and toc.header_element
+			title = toc.header_element.to_s
+			self.meta[:title]  = title
+			puts "Set document title to #{title}"
+		end
+		
+		# save for later use
+		self.toc = toc
+		
+		#puts toc.inspect
+	end
+
+	def search_abbreviations
+		@abbreviations.each do |abbrev, title|
+#		puts "#{abbrev} => #{title}"
+			self.map_match(Regexp.new(Regexp.escape(abbrev))) {
+				e = create_md_element(:abbreviation)
+				e.children = [abbrev.dup]
+				e.meta[:title] = title.dup if title
+				e
+			}
+		end
+	end
+	
+	# (PHP Markdown extra) Search for elements that have
+	# markdown=1 or markdown=block defined
+	def substitute_markdown_inside_raw_html
+		self.each_element(:raw_html) do |e|
+			doc = e.meta[:parsed_html]
+			if doc # valid html
+				# parse block-level markdown elements in these HTML tags
+				block_tags = ['div']
+				# use xpath to find elements with 'markdown' attribute
+				doc.elements.to_a( "//*[attribute::markdown]" ).each do |e|
+					# should we parse block-level or span-level?
+					parse_blocks = (e.attributes['markdown'] == 'block') || 
+					               block_tags.include?(e.name)
+					# remove 'markdown' attribute
+					e.delete_attribute 'markdown'
+					# Select all text elements of e
+					e.texts.each do |original_text|
+#						puts "parse_blocks = #{parse_blocks} found = #{original_text} "
+						s = original_text.to_s.strip # XXX
+						el = create_md_element(:dummy,
+						 	parse_blocks ? parse_text_as_markdown(s) :
+						                  parse_lines_as_span(s) )
+						el.children_to_html.each do |x|
+							e.insert_before(original_text, x)
+						end
+						e.delete(original_text)
+					end
+					
+				end
+			end
+		end
+	end
+
+end

data/lib/maruku/parse_span.rb

@@ -267,6 +267,15 @@ class Maruku
 			e.meta[:email] = email
 			e
 		}
+		
+		# Detect HTML entitis
+		span.map_match(/&([\w\d]+);/) { |match| 
+			entity_name = match[1]
+
+			e = create_md_element(:entity, [])
+			e.meta[:entity_name] = entity_name
+			e
+		}
 
 
 		# And now the easy stuff

data/lib/maruku/string_utils.rb

@@ -102,17 +102,12 @@ class Maruku
 		case line_node_type(s)
 		when :ulist
 			i=0;
-			# skip whitespace
+			# skip whitespace if present
 			while s[i,1] =~ /\s/; i+=1 end
-			# skip indicator
+			# skip indicator (+, -, *)
 			i+=1
-			# skip whitespace
+			# skip optional whitespace
 			while s[i,1] =~ /\s/; i+=1 end
-						# 
-			# while i < s.size
-			# 	break if not [' ',"\t",'*','-'].include? s[i,1]
-			# 	i += 1
-			# end
 			return i
 		when :olist
 			i=0;
@@ -125,6 +120,9 @@ class Maruku
 			# skip whitespace
 			while s[i,1] =~ /\s/; i+=1 end
 			return i
+		else
+			$stderr.puts "Error: #{s} is not a list"
+			0
 		end
 	end
 
@@ -193,8 +191,8 @@ class Maruku
 		# line that were mistaken for raw_html
 		return :text if l=~EMailAddress or l=~ URL
 		return :raw_html if l =~ %r{^[ ]?[ ]?[ ]?</?\s*\w+}
-		return :ulist    if l =~ /^\s?([\*-\+])\s+.*\w+/
-		return :olist    if l =~ /^\s?\d\..*\w+/
+		return :ulist    if l =~ /^\s?([\*\-\+])\s+.*\w+/
+		return :olist    if l =~ /^\s?\d+\..*\w+/
 		return :empty    if l.strip.size == 0
 		return :header1  if l =~ /^(=)+/ 
 		return :header2  if l =~ /^([-\s])+$/ 
@@ -298,8 +296,10 @@ class String
 
 		# But if you surround an * or _ with spaces, 
 		# it’ll be treated as a literal asterisk or underscore.
-		gsub!(/\s\*(\s|$)/, [S+2].pack('c'))
-		gsub!(/\s_(\s|$)/,  [S+2].pack('c'))
+		escaped_ast = [S+2].pack('c')
+		gsub!(/(\s)\*(\s|$)/, '\1%s\2' % [escaped_ast] )
+		escaped_under =  [S+3].pack('c')
+		gsub!(/(\s)_(\s|$)/, '\1%s\2' % [escaped_under])
 		
 		self
 	end
@@ -315,6 +315,7 @@ class String
 		self
 	end
 
+	# Resubstitute '\<char>' as this was a code block
 	def it_was_a_code_block
 		s = ""; tmp =" "
 		each_byte do |b|

data/lib/maruku/to_html.rb

@@ -504,7 +504,10 @@ class MDElement
 	def to_html_head_cell; wrap_as_element('th') end
 	def to_html_cell; wrap_as_element('td') end
 	
-
+	def to_html_entity 
+		entity_name = @meta[:entity_name]
+		Text.new('&%s;' % [entity_name])
+	end
 end
 
 # We only want to output the children in Maruku::to_html

data/lib/maruku/to_latex.rb

@@ -90,7 +90,7 @@ class MDElement
 			g = g / 255.0 
 			b = b / 255.0 
 			
-			"\\#{command}[rgb]{#{r},#{g},#{b}}"
+			"\\#{command}[rgb]{%0.2f,%0.2f,%0.2f}" % [r,g,b]
 		else
 			"\\#{command}{#{s}}"
 		end

data/lib/maruku/to_latex_entities.rb

@@ -0,0 +1,301 @@
+require 'rexml/document'
+
+class MDElement
+	include REXML
+	
+	def to_latex_entity 
+		entity_name = @meta[:entity_name]
+		
+		MDElement.init_tables
+		
+		replace = @@entity_to_latex[entity_name]
+ 		if replace
+#			puts "#{entity_name} -> #{replace.inspect}"
+			return replace
+		else
+			$stderr.puts "Cannot translate #{entity_name}"
+			return entity_name
+		end
+	end
+	
+	
+	# create hash @@entity_to_latex
+	def MDElement.init_tables
+		## why can't I use a class variable?
+		if not $conversion_table_inited
+			doc = Document.new XML_TABLE
+			@@entity_to_latex = {}
+			doc.elements.each("//char") do |c| 
+				num =  c.attributes['num']
+				name =  c.attributes['name']
+				convert =  c.attributes['convertTo']
+				@@entity_to_latex["#{num}"] = convert
+				@@entity_to_latex["#{name}"] = convert
+			end
+#			puts @@entity_to_latex.inspect
+			$conversion_table_inited = true
+		end
+	end
+
+# The following is a conversion chart for html elements, courtesy of 
+# text2html 
+
+	XML_TABLE ="
+	<chars>
+	  <char num='913' name='Alpha' convertTo='$A$' />
+	  <char num='914' name='Beta' convertTo='$B$' />
+	  <char num='915' name='Gamma' convertTo='$\\Gamma$' />
+	  <char num='916' name='Delta' convertTo='$\\Delta$' />
+	  <char num='917' name='Epsilon' convertTo='$E$' />
+	  <char num='918' name='Zeta' convertTo='$Z$' />
+	  <char num='919' name='Eta' convertTo='$H$' />
+	  <char num='920' name='Theta' convertTo='$\\Theta$' />
+	  <char num='921' name='Iota' convertTo='$I$' />
+	  <char num='922' name='Kappa' convertTo='$K$' />
+	  <char num='923' name='Lambda' convertTo='$\\Lambda$' />
+	  <char num='924' name='Mu' convertTo='$M$' />
+	  <char num='925' name='Nu' convertTo='$N$' />
+	  <char num='926' name='Xi' convertTo='$\\Xi$' />
+	  <char num='927' name='Omicron' convertTo='$O$' />
+	  <char num='928' name='Pi' convertTo='$\\Pi$' />
+	  <char num='929' name='Rho' convertTo='$P$' />
+	  <char num='931' name='Sigma' convertTo='$\\Sigma$' />
+	  <char num='932' name='Tau' convertTo='$T$' />
+	  <char num='933' name='Upsilon' convertTo='$Y$' />
+	  <char num='934' name='Phi' convertTo='$\\Phi$' />
+	  <char num='935' name='Chi' convertTo='$X$' />
+	  <char num='936' name='Psi' convertTo='$\\Psi$' />
+	  <char num='937' name='Omega' convertTo='$\\Omega$' />
+	  <char num='945' name='alpha' convertTo='$\\alpha$' />
+	  <char num='946' name='beta' convertTo='$\\beta$' />
+	  <char num='947' name='gamma' convertTo='$\\gamma$' />
+	  <char num='948' name='delta' convertTo='$\\delta$' />
+	  <char num='949' name='epsilon' convertTo='$\\epsilon$' />
+	  <char num='950' name='zeta' convertTo='$\\zeta$' />
+	  <char num='951' name='eta' convertTo='$\\eta$' />
+	  <char num='952' name='theta' convertTo='$\\theta$' />
+	  <char num='953' name='iota' convertTo='$\\iota$' />
+	  <char num='954' name='kappa' convertTo='$\\kappa$' />
+	  <char num='955' name='lambda' convertTo='$\\lambda$' />
+	  <char num='956' name='mu' convertTo='$\\mu$' />
+
+	  <char num='957' name='nu' convertTo='$\\nu$' />
+	  <char num='958' name='xi' convertTo='$\\xi$' />
+	  <char num='959' name='omicron' convertTo='$o$' />
+	  <char num='960' name='pi' convertTo='$\\pi$' />
+	  <char num='961' name='rho' convertTo='$\\rho$' />
+	  <char num='963' name='sigma' convertTo='$\\sigma$' />
+	  <char num='964' name='tau' convertTo='$\\tau$' />
+	  <char num='965' name='upsilon' convertTo='$\\upsilon$' />
+	  <char num='966' name='phi' convertTo='$\\phi$' />
+
+	  <char num='967' name='chi' convertTo='$\\chi$' />
+	  <char num='968' name='psi' convertTo='$\\psi$' />
+	  <char num='969' name='omega' convertTo='$\\omega$' />
+	  <char num='962' name='sigmaf' convertTo='$\\varsigma$' />
+	  <char num='977' name='thetasym' convertTo='$\\vartheta$' />
+	  <char num='982' name='piv' convertTo='$\\varpi$' />
+	  <char num='8230' name='hellip' convertTo='\\ldots' />
+	  <char num='8242' name='prime' convertTo='$\\prime$' />
+	  <char num='8254' name='oline' convertTo='-' />
+
+	  <char num='8260' name='frasl' convertTo='/' />
+	  <char num='8472' name='weierp' convertTo='$\\wp$' />
+	  <char num='8465' name='image' convertTo='$\\Im$' />
+	  <char num='8476' name='real' convertTo='$\\Re$' />
+	  <char num='8501' name='alefsym' convertTo='$\\aleph$' />
+	  <char num='8226' name='bull' convertTo='$\\bullet$' />
+	  <char num='8482' name='trade' convertTo='$^{\\rm TM}$' /> <!-- \texttrademark -->
+	  <char num='8592' name='larr' convertTo='$\\leftarrow$' />
+
+	  <char num='8594' name='rarr' convertTo='$\\rightarrow$' />
+	  <char num='8593' name='uarr' convertTo='$\\uparrow$' />
+	  <char num='8595' name='darr' convertTo='$\\downarrow$' />
+	  <char num='8596' name='harr' convertTo='$\\leftrightarrow$' />
+	  <char num='8629' name='crarr' convertTo='$\\hookleftarrow$' />
+	  <char num='8657' name='uArr' convertTo='$\\Uparrow$' />
+	  <char num='8659' name='dArr' convertTo='$\\Downarrow$' />
+	  <char num='8656' name='lArr' convertTo='$\\Leftarrow$' />
+	  <char num='8658' name='rArr' convertTo='$\\Rightarrow$' />
+
+	  <char num='8660' name='hArr' convertTo='$\\Leftrightarrow$' />
+	  <char num='8704' name='forall' convertTo='$\\forall$' />
+	  <char num='8706' name='part' convertTo='$\\partial$' />
+	  <char num='8707' name='exist' convertTo='$\\exists$' />
+	  <char num='8709' name='empty' convertTo='$\\emptyset$' />
+	  <char num='8711' name='nabla' convertTo='$\\nabla$' />
+	  <char num='8712' name='isin' convertTo='$\\in$' />
+	  <char num='8715' name='ni' convertTo='$\\ni$' />
+	  <char num='8713' name='notin' convertTo='$\\notin$' />
+
+	  <char num='8721' name='sum' convertTo='$\\sum$' />
+	  <char num='8719' name='prod' convertTo='$\\prod$' />
+	  <char num='8722' name='minus' convertTo='$-$' />
+	  <char num='8727' name='lowast' convertTo='$\\ast$' />
+	  <char num='8730' name='radic' convertTo='$\\surd$' />
+	  <char num='8733' name='prop' convertTo='$\\propto$' />
+	  <char num='8734' name='infin' convertTo='$\\infty$' />
+	  <char num='8736' name='ang' convertTo='$\\angle$' />
+	  <char num='8743' name='and' convertTo='$\\wedge$' />
+
+	  <char num='8744' name='or' convertTo='$\\vee$' />
+	  <char num='8745' name='cup' convertTo='$\\cup$' />
+	  <char num='8746' name='cap' convertTo='$\\cap$' />
+	  <char num='8747' name='int' convertTo='$\\int$' />
+	  <char num='8756' name='there4' convertTo='$\\therefore$' /> <!-- only AMS -->
+	  <char num='8764' name='sim' convertTo='$\\sim$' />
+	  <char num='8776' name='asymp' convertTo='$\\approx$' />
+	  <char num='8773' name='cong' convertTo='$\\cong$' />
+
+	  <char num='8800' name='ne' convertTo='$\\neq$' />
+	  <char num='8801' name='equiv' convertTo='$\\equiv$' />
+	  <char num='8804' name='le' convertTo='$\\leq$' />
+	  <char num='8805' name='ge' convertTo='$\\geq$' />
+	  <char num='8834' name='sub' convertTo='$\\subset$' />
+	  <char num='8835' name='sup' convertTo='$\\supset$' />
+	  <char num='8838' name='sube' convertTo='$\\subseteq$' />
+	  <char num='8839' name='supe' convertTo='$\\supseteq$' />
+	  <char num='8836' name='nsub' convertTo='$\\nsubset$' /> <!-- only AMS -->
+
+	  <char num='8853' name='oplus' convertTo='$\\oplus$' />
+	  <char num='8855' name='otimes' convertTo='$\\otimes$' />
+	  <char num='8869' name='perp' convertTo='$\\perp$' />
+	  <char num='8901' name='sdot' convertTo='$\\cdot$' />
+	  <char num='8968' name='rceil' convertTo='$\\rceil$' />
+	  <char num='8969' name='lceil' convertTo='$\\lceil$' />
+	  <char num='8970' name='lfloor' convertTo='$\\lfloor$' />
+	  <char num='8971' name='rfloor' convertTo='$\\rfloor$' />
+	  <char num='9001' name='rang' convertTo='$\\rangle$' />
+
+	  <char num='9002' name='lang' convertTo='$\\langle$' />
+	  <char num='9674' name='loz' convertTo='$\\lozenge$' /> <!-- only AMS -->
+	  <char num='9824' name='spades' convertTo='$\\spadesuit$' />
+	  <char num='9827' name='clubs' convertTo='$\\clubsuit$' />
+	  <char num='9829' name='hearts' convertTo='$\\heartsuit$' />
+	  <char num='9830' name='diams' convertTo='$\\diamondsuit$' />                                     
+	  <char num='38' name='amp' convertTo='\\@AMP' />    
+	  <char num='34' name='quot' convertTo='@DOUBLEQUOT' />
+	  <char num='169' name='copy' convertTo='\\copyright' />
+
+	  <char num='60' name='lt' convertTo='$@LT$' />
+	  <char num='62' name='gt' convertTo='$@GT$' />
+	  <char num='338' name='OElig' convertTo='\\OE' />
+	  <char num='339' name='oelig' convertTo='\\oe' />
+	  <char num='352' name='Scaron' convertTo='\\v{S}' />
+	  <char num='353' name='scaron' convertTo='\\v{s}' />
+	  <char num='376' name='Yuml' convertTo='\\\"Y' />
+	  <char num='710' name='circ' convertTo='\\textasciicircum' />
+	  <char num='732' name='tilde' convertTo='\\textasciitilde' />
+
+	  <char num='8211' name='ndash' convertTo='--' />
+	  <char num='8212' name='mdash' convertTo='---' />
+	  <char num='8216' name='lsquo' convertTo='`' />
+	  <char num='8217' name='rsquo' convertTo='@QUOT' />
+	  <char num='8220' name='ldquo' convertTo='``' />
+	  <char num='8221' name='rdquo' convertTo='@QUOT@QUOT' />
+	  <char num='8224' name='dagger' convertTo='\\dag' />
+	  <char num='8225' name='Dagger' convertTo='\\ddag' />
+	  <char num='8240' name='permil' convertTo='\\permil' /> <!-- wasysym package -->
+
+	  <char num='8364' name='euro' convertTo='\\euro' /> <!-- eurosym package -->
+	  <char num='8249' name='lsaquo' convertTo='\\guilsinglleft' />
+	  <char num='8250' name='rsaquo' convertTo='\\guilsinglright' />
+<!--	  <char num='160' name='nbsp' convertTo='\\nolinebreak' />-->
+	  <char num='160' name='nbsp' convertTo='~' />
+	  <char num='161' name='iexcl' convertTo='\\textexclamdown' />
+	  <char num='163' name='pound' convertTo='\\pounds' />
+	  <char num='164' name='curren' convertTo='\\currency' /> <!-- wasysym package -->
+	  <char num='165' name='yen' convertTo='\\textyen' /> <!-- textcomp -->
+
+	  <char num='166' name='brvbar' convertTo='\\brokenvert' /> <!-- wasysym -->
+	  <char num='167' name='sect' convertTo='\\S' />
+	  <char num='171' name='laquo' convertTo='\\guillemotleft' />
+	  <char num='187' name='raquo' convertTo='\\guillemotright' />
+	  <char num='174' name='reg' convertTo='\\textregistered' />
+	  <char num='170' name='ordf' convertTo='\\textordfeminine' />
+	  <char num='172' name='not' convertTo='$\\neg$' />
+	  <char num='176' name='deg' convertTo='$\\degree$' /> <!-- mathabx -->
+
+	  <char num='177' name='plusmn' convertTo='$\\pm$' />
+	  <char num='180' name='acute' convertTo='@QUOT' />
+	  <char num='181' name='micro' convertTo='$\\mu$' />
+	  <char num='182' name='para' convertTo='\\P' />
+	  <char num='183' name='middot' convertTo='$\\cdot$' />
+	  <char num='186' name='ordm' convertTo='\\textordmasculine' />
+	  <char num='162' name='cent' convertTo='\\cent' /> <!-- wasysym -->
+	  <char num='185' name='sup1' convertTo='$^1$' />
+
+	  <char num='178' name='sup2' convertTo='$^2$' />
+	  <char num='179' name='sup3' convertTo='$^3$' />
+	  <char num='189' name='frac12' convertTo='$\\frac{1}{2}$' />
+	  <char num='188' name='frac14' convertTo='$\\frac{1}{4}$' />
+	  <char num='190' name='frac34' convertTo='$\\frac{3}{4}' />
+	  <char num='192' name='Agrave' convertTo='\\`A' />
+	  <char num='193' name='Aacute' convertTo='\\@QUOTA' />
+	  <char num='194' name='Acirc' convertTo='\\^A' />
+	  <char num='195' name='Atilde' convertTo='\\~A' />
+
+	  <char num='196' name='Auml' convertTo='\\@DOUBLEQUOTA' />
+	  <char num='197' name='Aring' convertTo='\\AA' />
+	  <char num='198' name='AElig' convertTo='\\AE' />
+	  <char num='199' name='Ccedil' convertTo='\\cC' />
+	  <char num='200' name='Egrave' convertTo='\\`E' />
+	  <char num='201' name='Eacute' convertTo='\\@QUOTE' />
+	  <char num='202' name='Ecirc' convertTo='\\^E' />
+	  <char num='203' name='Euml' convertTo='\\@DOUBLEQUOTE' />
+	  <char num='204' name='Igrave' convertTo='\\`I' />
+	  <char num='205' name='Iacute' convertTo='\\@QUOTI' />
+	  <char num='206' name='Icirc' convertTo='\\^I' />
+	  <char num='207' name='Iuml' convertTo='\\\"I' />
+	  <char num='208' name='ETH' convertTo='$\\eth$' /> <!-- AMS -->
+	  <char num='209' name='Ntilde' convertTo='\\~N' />    
+	  <char num='210' name='Ograve' convertTo='\\`O' />
+	  <char num='211' name='Oacute' convertTo='\\@QUOTO' />
+	  <char num='212' name='Ocirc' convertTo='\\^O' />
+	  <char num='213' name='Otilde' convertTo='\\~O' />
+	  <char num='214' name='Ouml' convertTo='\\@DOUBLEQUOTO' />
+	  <char num='215' name='times' convertTo='$\\times$' />
+	  <char num='216' name='Oslash' convertTo='\\O' />
+	  <char num='217' name='Ugrave' convertTo='\\`U' />
+	  <char num='218' name='Uacute' convertTo='\\@QUOTU' />
+	  <char num='219' name='Ucirc' convertTo='\\^U' />
+	  <char num='220' name='Uuml' convertTo='\\@DOUBLEQUOTU' />
+	  <char num='221' name='Yacute' convertTo='\\@QUOTY' />
+	  <char num='222' name='THORN' convertTo='\\Thorn' />    <!-- wasysym -->
+	  <char num='223' name='szlig' convertTo='\\ss' />
+	  <char num='224' name='agrave' convertTo='\\`a' />
+	  <char num='225' name='aacute' convertTo='\\@QUOTa' />
+	  <char num='226' name='acirc' convertTo='\\^a' />
+	  <char num='227' name='atilde' convertTo='\\~a' />
+	  <char num='228' name='auml' convertTo='\\@DOUBLEQUOTa' />
+	  <char num='229' name='aring' convertTo='\\aa' />
+	  <char num='230' name='aelig' convertTo='\\ae' />
+	  <char num='231' name='ccedil' convertTo='\\cc' />
+	  <char num='232' name='egrave' convertTo='\\`e' />
+	  <char num='233' name='eacute' convertTo='\\@QUOTe' />
+	  <char num='234' name='ecirc' convertTo='\\^e' />
+	  <char num='235' name='euml' convertTo='\\@DOUBLEQUOTe' />    
+	  <char num='236' name='igrave' convertTo='\\`i' />
+	  <char num='237' name='iacute' convertTo='\\@QUOTi' />
+	  <char num='238' name='icirc' convertTo='\\^i' />
+	  <char num='239' name='iuml' convertTo='\\@DOUBLEQUOTi' />
+	  <char num='240' name='eth' convertTo='$\\eth$' /> <!-- -->
+	  <char num='241' name='ntilde' convertTo='\\~n' />
+	  <char num='242' name='ograve' convertTo='\\`o' />
+	  <char num='243' name='oacute' convertTo='\\@QUOTo' />
+	  <char num='244' name='ocirc' convertTo='\\^o' />
+	  <char num='245' name='otilde' convertTo='\\~o' />
+	  <char num='246' name='ouml' convertTo='\\@DOUBLEQUOTo' />
+	  <char num='247' name='divide' convertTo='$\\divide$' />       
+	  <char num='248' name='oslash' convertTo='\\o' /> 
+	  <char num='249' name='ugrave' convertTo='\\`u' />
+	  <char num='250' name='uacute' convertTo='\\@QUOTu' />
+	  <char num='251' name='ucirc' convertTo='\\^u' />
+	  <char num='252' name='uuml' convertTo='\\@DOUBLEQUOTu' />
+	  <char num='253' name='yacute' convertTo='\\@QUOTy' />
+	  <char num='254' name='thorn' convertTo='\\thorn' /> <!-- wasysym -->
+	  <char num='255' name='yuml' convertTo='\\@DOUBLEQUOTy' />                  
+	</chars>"
+
+end
+