asciidoctor-latex 1.5.0.3.dev → 1.5.0.4.dev

data/lib/asciidoctor/latex/prepend_processor.rb

@@ -4,6 +4,7 @@ require 'asciidoctor/extensions'
 module Asciidoctor::LaTeX
 
   # THIS CLASS IS NO LONGER USED
+  # See 'inject_html.rb'
   # Prepend lines to a document
 
   class ClickStyleInsert < Asciidoctor::Extensions::Preprocessor

data/lib/asciidoctor/latex/tex_postprocessor.rb

@@ -21,7 +21,9 @@ module Asciidoctor::LaTeX
   class TexPostprocessor < Asciidoctor::Extensions::Postprocessor
 
     def process document, output
-      output = output.gsub('DOLLOD', '\$')
+      output = output.gsub('ESCAMPERSAND', '\\&')
+      output = output.gsub('ESCUNDERSCORE', '\\_')
+      output = output.gsub('ESCDOLLAR', '\\$')
       output = output.gsub('CHEMRIGHTARROW','->').gsub('CHEMLEFTARROW','<-').gsub('CHEMLEFTRIGHTARROW','<-->')
       output = output.gsub('\\(','$').gsub('\\)','$')
       output.gsub('!!!BACKSLASH', '\\')
@@ -32,13 +34,16 @@ module Asciidoctor::LaTeX
   class HTMLPostprocessor < Asciidoctor::Extensions::Postprocessor
 
     def process document, output
+      output = output.gsub('ESCAMPERSAND', '&')
+      output = output.gsub('ESCUNDERSCORE', '_')
+      output = output.gsub('ESCDOLLAR', '$')
       output = output.gsub('\DOLLOD', '\$')
       # match_data = output.match /%%(.*)%%/
       # if match_data
       #  output = output.gsub(match_data[0], match_data[1])
       # end
-      output = output.gsub('DOLLOD', '$')
-      output.gsub('!!!BACKSLASH', '\\')
+      output = output.gsub('!!!BACKSLASH', '\\')
+      # output.gsub('%', '\%')  This messes up the html bigtimw
     end
 
   end

data/lib/asciidoctor/latex/tex_preprocessor.rb

@@ -23,8 +23,7 @@ module Asciidoctor::LaTeX
     # TEX_DOLLAR_SUB = '\1\\\(\2\\\)\3'
 
     TEX_DOLLAR_RX = /\$(.*?)\$/
-    TEX_DOLLAR_SUB = '\\\(\1\\\)'
-    TEX_DOLLAR_SUB2 = '+\\\(\1\\\)+'
+    TEX_DOLLAR_SUB = 'pass:[\\\(\1\\\)]'
 
 
     def process document, reader
@@ -40,22 +39,45 @@ module Asciidoctor::LaTeX
         if line.include? '<-' and document.basebackend? 'tex'
           line = line.gsub('<-', 'CHEMLEFTARROW')
         end
-        if line.include? '\$' and document.basebackend? 'html'
-          line = line.gsub '\$', 'DOLLOD'
+
+        # SPECIAL CHARACTER SUBSTITUTIONS
+        if line.include? '\\&' and document.basebackend? 'html'
+          line = line.gsub '\\&', 'ESCAMPERSAND'
+        end
+        if line.include? '\\_' and document.basebackend? 'html'
+          line = line.gsub '\\_', 'ESCUNDERSCORE'
         end
-        if line.include? '%' and document.basebackend? 'tex'
-          line = line.gsub '%', '\%'
+        if line.include? '\\' and document.basebackend? 'html'
+          line = line.gsub '\\$', 'ESCDOLLAR'
         end
+        # It is important the previous transformation
+        # come before the next one
         if line.include? '$'
-          line = line.gsub TEX_DOLLAR_RX, TEX_DOLLAR_SUB2
+          line = line.gsub TEX_DOLLAR_RX, TEX_DOLLAR_SUB
         end
+
         # protect math, e.g., (a^2)^3 from Asciidoc subsitutions:
         if line =~ /^\\\[/
-          line = line.gsub /^\\\[/, '+\\['
+          line = line.gsub '\\[', "+++\n\\["
+          # line = line.gsub /^\\\[/, '+\\]'
+          # line = line.gsub '\\[', '\\['
         end
         if line =~ /^\\\]/
-          line = line.gsub /^\\\]/, '\\]+'
+          line = line.gsub '\\]', "\\]\n+++\n"
+          # line = line.gsub /'^\\\]/, '\\]+'
+          # line = line.gsub '\\]', '\\]+'
         end
+        # if line =~ /\[env\..*?\]/
+        #  m = line.match /(\[env\..*?)\]/
+        #  line = line.gsub m[1], m[1]+',subs=none'
+        # end
+        # if line =~ /\&/
+        #  line = line.gsub('&', '\\\&')
+        # end
+        # We do need to make this substitution, but ONLY ouutside
+        # of mathematical text.
+        # Please $FIXME!
+        #
         # We would like to ensure that underscores in names,
         # e.g., MACRO_NAME, do not cause LaTeX bugs. However,
         # the code below introduces a more serious bug: expressons

data/lib/asciidoctor/latex/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module LaTeX
-    VERSION = '1.5.0.3.dev'
+    VERSION = '1.5.0.4.dev'
   end
 end

data/test/examples/adoc/ampersand.adoc

@@ -0,0 +1,2 @@
+//.ampersand
+Rhythm & Blues

data/test/examples/adoc/block_olist.adoc

@@ -0,0 +1,58 @@
+
+// This file has been modified to remove
+// nesting to level five, which LaTeX
+// cannot handle
+
+// .basic
+. Step 1
+. Step 2
+. Step 3
+
+// .with_start
+[start=6]
+. Step 1
+. Step 2
+. Step 3
+
+// .with_numeration_styles
+[decimal]
+. level 1
+[upperalpha]
+.. level 2
+[loweralpha]
+... level 3
+[lowerroman]
+.... level 4
+
+
+// .with_title
+.Steps
+. Step 1
+. Step 2
+. Step 3
+
+// .with_id_and_role
+[#steps.green]
+. Step 1
+. Step 2
+. Step 3
+
+// .max_nesting
+. level 1
+.. level 2
+... level 3
+.... level 4
+.. level 2
+
+// .complex_content
+. Every list item has at least one paragraph of content,
+  which may be wrapped, even using a hanging indent.
++
+Additional paragraphs or blocks are adjoined by putting
+a list continuation on a line adjacent to both blocks.
++
+list continuation:: a plus sign (`{plus}`) on a line by itself
+
+. A literal paragraph does not require a list continuation.
+
+ $ gem install asciidoctor

data/test/examples/adoc/block_ulist.adoc

@@ -0,0 +1,42 @@
+// .basic
+* Edgar Allen Poe
+* Sheri S. Tepper
+* Bill Bryson
+
+// .with_title
+.Writers
+* Edgar Allen Poe
+* Sheri S. Tepper
+* Bill Bryson
+
+// .with_id_and_role
+[#authors.green]
+* Edgar Allen Poe
+* Sheri S. Tepper
+* Bill Bryson
+
+// .max_nesting
+* level 1
+** level 2
+*** level 3
+**** level 4
+** level 2
+
+// .complex_content
+* Every list item has at least one paragraph of content,
+  which may be wrapped, even using a hanging indent.
++
+Additional paragraphs or blocks are adjoined by putting
+a list continuation on a line adjacent to both blocks.
++
+list continuation:: a plus sign (`{plus}`) on a line by itself
+
+* A literal paragraph does not require a list continuation.
+
+ $ gem install asciidoctor
+
+// .checklist
+- [*] checked
+- [x] also checked
+- [ ] not checked
+-     normal list item

data/test/examples/adoc/box.adoc

@@ -1,8 +1,42 @@
-//.box
 
+This is a common problem and it is the first thing I check when
+I’m having a javascript problem (I actually do step 1 and 2 with
+my style.css as well). After checking that the file path is correct,
+I double check by viewing the page source using Firefox, I then click
+on the .js link. If it opens up the jQuery file (Double check it
+is opening the correct file) then the destination is correct.
+If it does not, or it opens a page-not-found, then I know I
+have a problem with my file path.
+
+[env.box]
+--
+Buurem lok medes, nor. Paat for deng zu locnoop.
+Vor daal grustem balimor tuul, man vep, dar slek.
+Morem labdis zoruk opmaak del!
+--
+
+This is a common problem and it is the first thing I check when
+I’m having a javascript problem (I actually do step 1 and 2 with
+my style.css as well). After checking that the file path is correct,
+I double check by viewing the page source using Firefox, I then click
+on the .js link. If it opens up the jQuery file (Double check it
+is opening the correct file) then the destination is correct.
+If it does not, or it opens a page-not-found, then I know I
+have a problem with my file path.
+
+.Zaar yek la!
 [env.box]
 --
 Buurem lok medes, nor. Paat for deng zu locnoop.
 Vor daal grustem balimor tuul, man vep, dar slek.
 Morem labdis zoruk opmaak del!
 --
+
+This is a common problem and it is the first thing I check when
+I’m having a javascript problem (I actually do step 1 and 2 with
+my style.css as well). After checking that the file path is correct,
+I double check by viewing the page source using Firefox, I then click
+on the .js link. If it opens up the jQuery file (Double check it
+is opening the correct file) then the destination is correct.
+If it does not, or it opens a page-not-found, then I know I
+have a problem with my file path.

data/test/examples/adoc/chem.adoc

@@ -0,0 +1,8 @@
+//.chem-env
+[env.chem]
+--
+2Fe2O3 + 3C -> 4Fe + 3CO2
+--
+
+//.chem-inline
+chem::[Fe3+], chem::[H20]

data/test/examples/adoc/click_plain.adoc

@@ -0,0 +1,24 @@
+
+
+//.click-normal
+[click.remark]
+--
+This is a normal remark.
+--
+
+//.click-plain
+[click.remark%plain]
+--
+This is a plain remark.
+--
+
+//.numbered
+[click.remark%numbered]
+--
+This is a numbered remark.
+--
+
+[click.remark%numbered]
+--
+So is this.
+--

data/test/examples/adoc/dlist.adoc

@@ -0,0 +1,15 @@
+//.dlist
+Foo:: A lambda expession of the first kind
+Bar:: A lambda expressi of the second kind.  A lambda expressi of the second kind. 
+A lambda expressi of the second kind. 
+A lambda expressi of the second kind. 
+A lambda expressi of the second kind. 
+A lambda expressi of the second kind. 
+A lambda expressi of the second kind. 
+A lambda expressi of the second kind.  
+Baababababbababa:: A very long word. A very long word. 
+A very long word. A very long word. 
+A very long word. A very long word. 
+A very long word. A very long word. 
+A very long word. A very long word. 
+X:: A short word.

data/test/examples/adoc/env2.adoc

@@ -0,0 +1,57 @@
+//. env block
+
+
+[env.definition]
+--
+A line is the path of shortest length between two points.
+--
+
+//. env block, cross ref
+
+[env.definition#def-point]
+--
+A point is that which has no breadth.
+--
+
+
+//.env
+[env.joke]
+--
+An engineer, a mathematician, and a philosopher met
+at a bar for a drink.  After a few beers, talk
+turned to the question of how best to understand
+the world ... (to be continued)
+--
+
+//.auto-numbered
+[env.objection]
+--
+Your honor, my client could not have committed the
+crime of which he is accused because he was
+confined to the state penitentary at the time
+that it occurred.  If it please the court, ...
+--
+
+//. env with title
+.Inadmissible testimony
+[env.objection]
+--
+Your honor, that testimony cannot be
+heard in this courtroom because it
+was obtained under duress and without
+informing my client of his rights.
+--
+
+//. with no option
+.Improper procedure
+[env.objection%no-number]
+--
+Your honor, the physical evidence
+was not secured and was handled sloppily.
+We cannot be sure tha the items which
+the prosecution wishes to present here
+have any association with my client
+whatsoever.
+--
+
+.Cross referneces

data/test/examples/adoc/env_joke.adoc

@@ -0,0 +1,12 @@
+//.joke
+[env.joke]
+--
+Three men, a mathematician, a lawyer,
+and a doctor ...
+--
+
+[env.joke%plain]
+--
+Three men, a mathematician, a lawyer,
+and a doctor ...
+--

data/test/examples/adoc/env_plain.adoc

@@ -0,0 +1,10 @@
+//.env_plain
+[env.remark]
+--
+This is a normal remark.
+--
+
+[env.remark%plain]
+--
+This is a plain remark.
+--

data/test/examples/adoc/eq-latex.adoc

@@ -0,0 +1,39 @@
+
+
+== Some Equations
+
+
+=== Number Theory
+
+The equation
+$a^2 + b^2 = c^2$ has infinitely many
+non-proportional integer solutions.
+The integer solutions of the equation
+\[
+  a^3 + b^3 = c^3
+\]
+are trivial: at least one entry is
+zero and the others are "obvious"
+
+=== Calculus
+
+A definite integral:
+\[
+  \int_0^1 x^n dx = \frac{1}{n}
+\]
+
+The fundamental theorem of calculus:
+\[
+   \frac{d}{dx} \int_a^x f(t) dt = f(x)
+\]
+
+=== Linear algebra
+
+A matrix:
+\[
+M = \left[
+  \begin{array}{ c c }
+	 1 & 2 \\
+	 3 & 4
+  \end{array} \right]
+\]

data/test/examples/adoc/eq.adoc

@@ -4,9 +4,27 @@ The Pythagorean theorem, $a^2 + b^2 = c^2$,
 relates the hypotenuse to the altitude
 and base of a right triangle.
 
+
+
 Euler's formula states that
 \[
   e^{2\pi \sqrt{-1}} = 1
 \]
 
 Ain't that great!
+
+[env.equation]
+--
+\sum_{k=1}^\infty \frac{1}{n}
+--
+
+[env.equation#hoho]
+--
+\sum_{k=1}^\infty \frac{1}{n^2}
+--
+
+
+[env.equation%numbered]
+--
+\sum_{k=1}^\infty \frac{1}{n^3}
+--