asciidoctor-latex 1.5.0.dev → 1.5.0.1.dev

data/{try-out → examples}/xref-equations.adoc

@@ -25,4 +25,5 @@ Proin ac blandit magna, vel ultrices magna. Suspendisse non ligula lobortis, fau
 
 The first section is <<This is a test>>
 
-The professor harrumphed and said: I repeat, equation <<qq>> is very important.
+The professor harrumphed and said: I repeat,
+equation (<<qq>>) is very important.

data/lib/asciidoctor/latex/click_block.rb

@@ -36,8 +36,6 @@ module Asciidoctor::LaTeX
 
     def process parent, reader, attrs
 
-      warn "env: attributes = #{attrs}".yellow if $VERBOSE
-
       click_name = attrs["role"]
       original_title = attrs['title']
 

data/lib/asciidoctor/latex/converter.rb

@@ -157,90 +157,27 @@ module Asciidoctor::LaTeX
 
     def info node
 
-      attrs =  node.attributes
-
-      warn "\n   HTMLConverter, node: #{node.node_name}".red
-      # warn "   title: #{attrs['title']}".cyan
-      # warn "    role: #{attrs['role']}".cyan
-      # warn " options: #{attrs['options']}".cyan
+      warn "\n   HTMLConverter, node: #{node.node_name}".red if $VERBOSE
 
     end
 
     def environment node
 
-      # info node if $VERBOSE
-      options = node.attributes['options']
       attrs = node.attributes
 
-      warn "env role = #{attrs['role']}".yellow if $VERBOSE
-
-      if attrs['role'] == 'equation'
-        node.title = nil
-        number_part = '<td style="text-align:right">' + "(#{node.caption}) </td>"
-        number_part = ["+++ #{number_part} +++"]
-        equation_part = ['+++<td style="width:100%";>+++'] + ['\\['] + node.lines + ['\\]'] + ['+++</td>+++']
-        table_style='style="width:100%; border-collapse:collapse;border:0"  class="zero" '
-        row_style='style="border-collapse: collapse; border:0; font-size: 12pt; "'
-        if options['numbered']
-          node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + number_part + [TABLE_ROW_END]
+      case attrs['role']
+        when 'box'
+          handle_null(node)
+        when 'equation'
+          handle_equation(node)
+        when 'equationalign'
+          handle_equation_align(node)
+        when 'chem'
+          handle_chem(node)
+        when 'jsxgraph'
+          handle_jsxgraph(node)
         else
-          node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + [TABLE_ROW_END]
-        end
-      elsif attrs['role'] == 'equationalign'
-        warn "execting env role = #{attrs['role']}".yellow if $VERBOSE
-        node.title = nil
-        number_part = '<td style="text-align:right">' + "(#{node.caption}) </td>"
-        number_part = ["+++ #{number_part} +++"]
-        equation_part = ['+++<td style="width:100%";>+++'] + ['\\[\\begin{split}'] + node.lines + ['\\end{split}\\]'] + ['+++</td>+++']
-        table_style='style="width:100%; border-collapse:collapse;border:0"  class="zero" '
-        row_style='style="border-collapse: collapse; border:0; font-size: 12pt; "'
-        if options['numbered']
-          node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + number_part + [TABLE_ROW_END]
-        else
-          node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + [TABLE_ROW_END]
-        end
-      elsif node.attributes['role'] == 'chem'
-        node.title = nil
-        number_part = '<td style="text-align:right">' + "(#{node.caption}) </td>"
-        number_part = ["+++ #{number_part} +++"]
-        equation_part = ['+++<td style="width:100%;">+++'] + [' \\[\\ce{' + node.lines[0] + '}\\] '] + ['+++</td>+++']
-        table_style='class="zero" style="width:100%; border-collapse:collapse; border:0"'
-        row_style='class="zero" style="border-collapse: collapse; border:0; font-size: 10pt; "'
-        node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"]  + equation_part + number_part +['+++</tr></table>+++']
-      elsif attrs['role'] == 'jsxgraph'
-        if attrs['box'] == nil
-          attrs['box'] = 'box'
-        end
-        if attrs['width'] == nil
-          attrs['width'] = 450
-        end
-        if attrs['height'] == nil
-          attrs['height'] = 450
-        end
-        warn "jxxgraph attributes: #{attrs}".cyan if $VERBOSE
-        line_array = ["\n+++\n"]
-        # line_array += ["<link rel='stylesheet' type='text/css'  href='jsxgraph.css' />"]
-
-        line_array += ["<link rel='stylesheet' type='text/css'  href='http://jsxgraph.uni-bayreuth.de/distrib/jsxgraph.css' />"]
-        line_array += ['<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jsxgraph/0.99.3/jsxgraphcore.js"></script>']
-        line_array += ["<script src='http://jsxgraph.uni-bayreuth.de/distrib/GeonextReader.js' type='text/javascript'></script>"]
-        # line_array += ['<div id="box" class="jxgbox" style="width:500px; height:500px;"></div>']
-        line_array += ["<div id='#{attrs['box']}' class='jxgbox' style='width:" + "#{attrs['width']}" + "px; height:" + "#{attrs['height']}" +"px;'></div>"]
-        line_array += ['<script type="text/javascript">']
-
-        # line_array += ["<link rel='stylesheet' type='text/css' href='http://jsxgraph.uni-bayreuth.de/distrib/jsxgraph.css' />"]
-        # line_array += ["<script src='http://jsxgraph.uni-bayreuth.de/distrib/jsxgraphcore.js' type='text/javascript'></script>"]
-        # line_array += ["<script src='http://jsxgraph.uni-bayreuth.de/distrib/GeonextReader.js' type='text/javascript'></script>"]
-        # line_array += ["<div id='jxgbox' class='jxgbox' style='width:500px; height:500px;'></div>"]
-       #  line_array += ["<script type='text/javascript'>"]
-
-        line_array += node.lines
-        line_array += ['</script>']
-        line_array += ['<br/>']
-        line_array += ["\n+++\n"]
-        node.lines = line_array
-      else
-        node.lines = [ENV_CSS] + node.lines + [DIV_END]
+          handle_default(node)
       end
 
       node.attributes['roles'] = (node.roles + ['environment']) * ' '
@@ -249,7 +186,6 @@ module Asciidoctor::LaTeX
 
     def click node
 
-      # info node if $VERBOSE
       node.lines = [ENV_CSS] + node.lines + [DIV_END]
       node.attributes['roles'] = (node.roles + ['click']) * ' '
       self.open node
@@ -290,6 +226,83 @@ module Asciidoctor::LaTeX
       output
     end
 
+    def handle_equation(node)
+      options = node.attributes['options']
+      node.title = nil
+      number_part = '<td style="text-align:right">' + "(#{node.caption}) </td>"
+      number_part = ["+++ #{number_part} +++"]
+      equation_part = ['+++<td style="width:100%";>+++'] + ['\\['] + node.lines + ['\\]'] + ['+++</td>+++']
+      table_style='style="width:100%; border-collapse:collapse;border:0"  class="zero" '
+      row_style='style="border-collapse: collapse; border:0; font-size: 12pt; "'
+      if options['numbered']
+        node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + number_part + [TABLE_ROW_END]
+      else
+        node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + [TABLE_ROW_END]
+      end
+    end
+
+    def handle_equation_align(node)
+      options = node.attributes['options']
+      attrs = node.attributes
+      node.title = nil
+      number_part = '<td style="text-align:right">' + "(#{node.caption}) </td>"
+      number_part = ["+++ #{number_part} +++"]
+      equation_part = ['+++<td style="width:100%";>+++'] + ['\\[\\begin{split}'] + node.lines + ['\\end{split}\\]'] + ['+++</td>+++']
+      table_style='style="width:100%; border-collapse:collapse;border:0"  class="zero" '
+      row_style='style="border-collapse: collapse; border:0; font-size: 12pt; "'
+      if options['numbered']
+        node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + number_part + [TABLE_ROW_END]
+      else
+        node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"] + equation_part + [TABLE_ROW_END]
+      end
+    end
+
+    def handle_chem(node)
+      node.title = nil
+      number_part = '<td style="text-align:right">' + "(#{node.caption}) </td>"
+      number_part = ["+++ #{number_part} +++"]
+      equation_part = ['+++<td style="width:100%;">+++'] + [' \\[\\ce{' + node.lines[0] + '}\\] '] + ['+++</td>+++']
+      table_style='class="zero" style="width:100%; border-collapse:collapse; border:0"'
+      row_style='class="zero" style="border-collapse: collapse; border:0; font-size: 10pt; "'
+      node.lines =  ["+++<table #{table_style}><tr #{row_style}>+++"]  + equation_part + number_part +['+++</tr></table>+++']
+    end
+
+    def handle_jsxgraph(node)
+      attrs = node.attributes
+      if attrs['box'] == nil
+        attrs['box'] = 'box'
+      end
+      if attrs['width'] == nil
+        attrs['width'] = 450
+      end
+      if attrs['height'] == nil
+        attrs['height'] = 450
+      end
+      line_array = ["\n+++\n"]
+      # line_array += ["<link rel='stylesheet' type='text/css'  href='jsxgraph.css' />"]
+
+      line_array += ["<link rel='stylesheet' type='text/css'  href='http://jsxgraph.uni-bayreuth.de/distrib/jsxgraph.css' />"]
+      line_array += ['<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jsxgraph/0.99.3/jsxgraphcore.js"></script>']
+      line_array += ["<script src='http://jsxgraph.uni-bayreuth.de/distrib/GeonextReader.js' type='text/javascript'></script>"]
+      # line_array += ['<div id="box" class="jxgbox" style="width:500px; height:500px;"></div>']
+      line_array += ["<div id='#{attrs['box']}' class='jxgbox' style='width:" + "#{attrs['width']}" + "px; height:" + "#{attrs['height']}" +"px;'></div>"]
+      line_array += ['<script type="text/javascript">']
+
+      line_array += node.lines
+      line_array += ['</script>']
+      line_array += ['<br/>']
+      line_array += ["\n+++\n"]
+      node.lines = line_array
+    end
+
+    def handle_null(node)
+
+    end
+
+    def handle_default(node)
+      node.lines = [ENV_CSS] + node.lines + [DIV_END]
+    end
+
   end
 
 

data/lib/asciidoctor/latex/environment_block.rb

@@ -95,16 +95,8 @@ module Asciidoctor::LaTeX
 
     def process parent, reader, attrs
 
-      warn "env: attributes = #{attrs}".yellow if $VERBOSE
-
-      # Get orginal title if there is one
-      if attrs['title']
-        original_title =  attrs['title']
-        attrs['original_title'] = original_title
-      else
-        original_title = nil
-      end
-
+      original_title = attrs['title']
+      attrs['original_title'] = attrs['title']
 
       # Ensure that role is defined
       if attrs['role'] == nil
@@ -118,15 +110,19 @@ module Asciidoctor::LaTeX
         attrs['role'] = attrs['role'].gsub(/\\/, '')
       end
 
-      # Determine whether this is a numbered block
-      # FIXME: what if there are several options?
-      if attrs['options'].nil?
-        attrs['options'] = 'numbered'
-      elsif !(attrs['options'].include? 'no-number')
-        # attrs['options'] = 'numbered'
+      # Determine whether the block is numbered
+      # Use the option set if present (numbered, no+_number) otherwise
+      # use a default value, e.g. 'box' is not numbered, the others are numbered
+      if !(attrs['options'] =~ /no_number|numbered/)
+        if %w(box).include? role
+          attrs['options'] = 'no_number'
+        else
+          attrs['options'] = 'numbered'
+        end
       end
 
 
+      # Adjust title according to environment name
       env_name = role # roles.first # FIXME: roles.first is probably best
       if %w(equation equationalign chem).include? role
         attrs['title'] = env_name
@@ -134,51 +130,73 @@ module Asciidoctor::LaTeX
         attrs['title'] = 'Listing'
       elsif role == 'jsxgraph'
         attrs['title'] = 'JSXGraph'
+      elsif role == 'box'
+        attrs['title'] = ''
       else
         attrs['title'] = env_name.capitalize
       end
       env_title = attrs['title']
 
 
+      # Creat the block
       if attrs['role'] == 'code'
         block = create_block parent, :listing, reader.lines, attrs
       else
         block = create_block parent, :environment, reader.lines, attrs
       end
 
-      warn "document.references".blue + " #{parent.document.references}".cyan  if $VERBOSE
-      warn "attrs['role'] = #{attrs['role']} and role = #{role}".red if $VERBOSE
-      warn "id".red + " = #{attrs['id']}".yellow  if $VERBOSE
-
-      if attrs['options']['numbered']
+      if attrs['options'] =~ /numbered/
+        # THE NUMBERED OPTION
+        # Use same prefix for cross referencing for the
+        # equation_align environment as for the equation
+        # environment so as not to have separate numbering
+        # sequences
         if env_name == 'equationalign'
           env_ref_prefix = 'equation'
         else
           env_ref_prefix = env_name
         end
+        # Define caption_num so that we can make references
+        # that display as "(17)", for example
+        # This is where we can set the caption number by hand
+        # once I figure out how to do so.
         caption_num = parent.document.counter_increment("#{env_ref_prefix}-number", block)
         attrs['caption-num'] = caption_num
         caption = "#{caption_num}"
+        # Set the title, e.g., "Theorem 3: Pythagoras" or just "Theorem 3"
+        # depending on whether the user sets a title, .e.g, ".Pythgoras"
+        # in the line preceding "[env.theorem]"
         if original_title
           attrs['title'] = "#{env_title} #{caption_num}: #{original_title}"
         else
           attrs['title'] = "#{env_title} #{caption_num}."
         end
-        warn "eb: ".blue + "caption: #{caption}, title = #{attrs['title']}".magenta  if $VERBOSE
       else
-        attrs['title'] = "#{env_title}"
-        warn "eb: ".blue + "caption: #{caption}, title = #{attrs['title']}".magenta  if $VERBOSE
+        # THE NON-NUMBERED OPTION
+        # Set the title, e.g., "Pythagoras" or just "Theorem"
+        # depending on whether the user sets a title, .e.g, ".Pythgoras"
+        # in the line preceding "[env.theorem]"
+        # FIXME: this code is a tad spaghetti-like
+        if original_title
+          if  %w(box).include? role
+            attrs['title'] = "#{original_title}"
+          else
+            attrs['title'] = "#{env_title}: #{original_title}"
+          end
+        else
+          attrs['title'] = "#{env_title}"
+        end
       end
 
       if attrs['role'] == 'code'
         caption = nil
       end
 
-      warn "attributes are now #{attrs}" if $VERBOSE
-
       block.assign_caption caption
       if %w(equation equationalign chem).include? role
         block.title = "#{caption_num}"
+      elsif %w(box).include? role
+          block.title =  attrs['title']
       else
         block.title = attrs['title']
       end

data/lib/asciidoctor/latex/prepend_processor.rb

@@ -14,7 +14,7 @@ module Asciidoctor::LaTeX
 
     def process document, reader
 
-      warn "Entering ClickStyleInsert".magenta
+      warn "Entering ClickStyleInsert".magenta if $VERBOSE
 
       @@line_array = []
 

data/lib/asciidoctor/latex/preprocess.rb

@@ -22,16 +22,8 @@ output_file = base_name + "out"
 
 input = File.open(input_file, 'r') { |f| f.read }
 
-puts "input:"
-puts "-----------------"
-puts input
-puts "-----------------\n\n"
 
 output = Asciidoctor::LaTeX::TeXBlock.process_environments input
 
-puts "output:"
-puts "-----------------"
-puts output
-puts "-----------------\n\n"
 
 # File.open(output_file, 'w') {|f| f.write(output) }

data/lib/asciidoctor/latex/tex_preprocessor.rb

@@ -49,10 +49,10 @@ module Asciidoctor::LaTeX
         if line.include? '$'
           line = line.gsub TEX_DOLLAR_RX, TEX_DOLLAR_SUB2
         end
-        if line.include? '\\['
+        if line.include? '^\\['
           line = line.gsub '\\[', '+\\['
         end
-        if line.include? '\\]'
+        if line.include? '^\\]'
           line = line.gsub '\\]', '\\]+'
         end
         line

data/lib/asciidoctor/latex/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module LaTeX
-    VERSION = '1.5.0.dev'
+    VERSION = '1.5.0.1.dev'
   end
 end

data/manual.adoc

@@ -17,7 +17,7 @@ As a demonstration of the current state of this
 project, the file you are looking at, `manual.adoc`,
 can be rendered into HTML by
 ----
-  $ asciidoctor manual.adoc
+  $ asciidoctor-latex -b html manual.adoc
 ----
 or can be rendered as a LaTeX file via
 ----
@@ -25,7 +25,7 @@ or can be rendered as a LaTeX file via
   # => manual.tex
 ----
 The `.tex` file can in turn be rendred into pdf via
-`pdflatex`.
+`pdflatex` or `xelatex`.  We recommend the latter.
 
 
 Mathematical text in Asciidoc can be written as

data/test/examples/adoc/env.adoc

@@ -1,4 +1,4 @@
-== Env test
+//.env
 
 [env.theorem]
 --
@@ -6,11 +6,3 @@ The equation $a^2 + b^2  = c^2$
 has infinitely many non-proportional
 integer solutions.
 --
-
-[env.theorem]
---
-The equation $a^n + b^n  = c^n$,
-for $n > 2$, has only trivial
-integer solutions, where one of
-the variables is zero.
---

data/test/examples/adoc/eq.adoc

@@ -1,4 +1,4 @@
-== Equation test
+//.eq
 
 The Pythagorean theorem, $a^2 + b^2 = c^2$,
 relates the hypotenuse to the altitude