asciidoctor-latex 1.5.0.5.dev → 1.5.0.7.dev

data/lib/asciidoctor/latex/inject_html.rb

@@ -10,7 +10,7 @@ module Asciidoctor::LaTeX
   class InjectHTML < Asciidoctor::Extensions::Postprocessor
 
     def process document, output
-      output = output.gsub('</head>', $click_insertion)
+      output.gsub('</head>', $click_insertion)
     end
 
   end
@@ -23,24 +23,36 @@ module Asciidoctor::LaTeX
 </style>
 
 
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 
 <script>
 
-  $(document).ready(function(){
-    $('.openblock.click').click( function()  { $(this).find('.content').slideToggle('200');
-      $.reloadMathJax() }  )
-    $('.openblock.click').find('.content').hide()
-  });
 
-  $(document).ready(function(){
-    $('.listingblock.click').click( function()  { $(this).find('.content').slideToggle('200') }  )
-    $('.listingblock.click').find('.content').hide()
-  });
+
+var ready2;
+
+ready2 = function() {
+
+    $(document).ready(function(){
+
+        $('.openblock.click').click( function()  { $(this).find('.content').slideToggle('200'); } )
+        $('.openblock.click').find('.content').hide()
+
+
+        $('.listingblock.click').click( function()  { $(this).find('.content').slideToggle('200') }  )
+        $('.listingblock.click').find('.content').hide()
+
+    });
+
+}
+
+
+
+
+$(document).ready(ready2);
+$(document).on('page:load', ready2);
 
 
-  $(document).ready(ready);
-  $(document).on('page:load', ready);
 </script>
 
 </head>

data/lib/asciidoctor/latex/inline_macros.rb

@@ -12,8 +12,50 @@ module Asciidoctor::LaTeX
     use_dsl
     named :chem
     def process parent, target, attributes
-      text = attributes.values * ', ' # iky!
-      %(\\(\\ce{ #{text} }\\))
+      # text = attributes.values * ', ' # iky!
+      array = attributes.values
+      %(\\(\\ce{ #{array[0]} }\\))
+    end
+  end
+
+  # MODEL: <a href=#gloss_entry_cammin class=glossterm id=glossterm_cammin >cammin</a>
+  class GlossInlineMacro <  Asciidoctor::Extensions::InlineMacroProcessor
+    use_dsl
+    named :glossterm
+
+    def glossterm(term)
+      identifier = term.gsub(' ', '_').gsub(/\W/, '')
+      id = 'glossterm_' + identifier
+      css_class = 'glossterm'
+      href = '#glossentry_' + identifier
+      "<a href=#{href} class=#{css_class} id=#{id} >#{term}</a>"
+    end
+
+    def process parent, target, attributes
+      term = attributes.values[0]
+      glossterm(term)
+    end
+  end
+
+  class IndexTermInlineMacro <  Asciidoctor::Extensions::InlineMacroProcessor
+    use_dsl
+    named :index_term
+    def process parent, target, attributes
+      array = attributes.values
+      css = array.pop
+      index = array.pop
+      reference_array = array.pop.split(',')
+      if reference_array.count == 1
+        reference = reference_array.pop
+      else
+        reference = ''
+      end
+      reference ||= ''
+      if css == 'invisible'
+        "<span class='invisible' id='index_term_#{index}'>#{reference}</span>"
+      else
+        "<span class='index_term' id='index_term_#{index}'>#{reference}</span>"
+      end
     end
   end
 

data/lib/asciidoctor/latex/macro_preprocessor.rb

@@ -0,0 +1,28 @@
+require 'asciidoctor'
+require 'asciidoctor/extensions'
+
+
+module Asciidoctor::LaTeX
+  class MacroPreprocessor < Asciidoctor::Extensions::Preprocessor
+
+
+    def process document, reader
+      regex = /{{(.*?)}}/
+      return reader if reader.eof?
+      replacement_lines = reader.read_lines.map do |line|
+        if line.include? '{{'
+          scan = line.scan regex
+          scan.each do |match|
+            target = match[0]
+            puts "target: #{target}".red
+            line = line.gsub("{{#{target}}}", "glossterm::[#{target}]")
+          end
+        end
+        line
+      end
+      reader.unshift_lines replacement_lines
+      reader
+    end
+
+  end
+end

data/lib/asciidoctor/latex/node_processors.rb

@@ -161,7 +161,7 @@ module Asciidoctor
       doc << processed_content
 
       unless embedded?
-        # Now write the defnitions of the new environments
+        # Now write the definitions of the new environments
         # discovered to file
         definitions = ""
 
@@ -476,12 +476,32 @@ module Asciidoctor
           handle_box
         when 'texmacro'
           handle_texmacro
+        when 'include_latex'
+          handle_include_latex
         else
           handle_plain(env)
       end
     end
 
     def handle_texmacro
+      "%% User tex macros:\n#{self.content}\n%% end of user macros\n"
+    end
+
+   # Example:
+   # [env.include_latex]
+   # --
+   # \nput abc.text
+   # \usepackage{def}
+   # --
+   # Nothing appears in the HTML,
+   # bu lines
+   # \nput abc.text
+   # \usepackage{def}
+   # appear in the generated tex file.
+    def handle_include_latex
+      puts "Hi Boss, it's me again!"
+      puts self.content
+      puts "---------------"
       self.content
     end
 
@@ -680,7 +700,8 @@ module Asciidoctor
     end
 
     def preamble_process
-      "\\begin\{preamble\}\n#{self.content}\n\\end\{preamble\}\n"
+      # "\\begin\{preamble\}\n%% HO HO HO!\n#{self.content}\n\\end\{preamble\}\n"
+      self.content
     end
 
 

data/lib/asciidoctor/latex/sectnumoffset-treeprocessor.rb

@@ -0,0 +1,43 @@
+require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
+
+include ::Asciidoctor
+
+Extensions.register do
+  # A treeprocessor that increments each level-1 section number by the value of
+  # the `sectnumoffset` attribute.
+  #
+  # In addition, if `subsectnumoffset` is defined and greater than zero,
+  # the numbers of subsections in the first section encountered will
+  # be incremented by the offset.
+  #
+  # The numbers of all subsections will be
+  # incremented automatically since those values are calculated dynamically.
+  #
+  # Run using:
+  #
+  # asciidoctor -r ./lib/sectnumoffset-treeprocessor.rb -a sectnums -a sectnumoffset=1 lib/sectnumoffset-treeprocessor/sample.adoc
+  #
+  #
+  treeprocessor do
+    process do |document|
+      if (document.attr? 'sectnums') && (sectnumoffset = (document.attr 'sectnumoffset', 0).to_i) > 0
+        subsectnumoffset = (document.attr 'subsectnumoffset', 0).to_i
+        warn "subsectnumoffset: #{subsectnumoffset}".red if $VERBOSE
+        section_count = 0
+        if subsectnumoffset > 0
+          warn "Insert parent section at 'head' of document with offset #{sectnumoffset}".cyan if $VERBOSE
+        end
+        ((document.find_by context: :section) || []).each do |sect|
+          next unless sect.level <= 2
+          if sect.level == 1
+            section_count += 1
+            sect.number += sectnumoffset
+          elsif sect.level == 2 && section_count == 1
+            sect.number += subsectnumoffset
+          end
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/asciidoctor/latex/tex_postprocessor.rb

@@ -42,7 +42,7 @@ module Asciidoctor::LaTeX
       # if match_data
       #  output = output.gsub(match_data[0], match_data[1])
       # end
-      output = output.gsub('!!!BACKSLASH', '\\')
+      output.gsub('!!!BACKSLASH', '\\')
       # output.gsub('%', '\%')  This messes up the html bigtimw
     end
 

data/lib/asciidoctor/latex/tex_preprocessor.rb

@@ -73,14 +73,14 @@ module Asciidoctor::LaTeX
         # end
         # if line =~ /\&/
         #  line = line.gsub('&', '\\\&')
-        # end
+        # en
         # 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
+        # the code below introduces a more serious bug: expressions
         # lik4 $\int_0^1 x^n dx$ are mapped to  $\int\_0^1 x^n dx$.
         # I'm not sure this problem can be solved using regex's:
         # we need to apply a substitution to a line when there is a match

data/lib/asciidoctor/latex/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module LaTeX
-    VERSION = '1.5.0.5.dev'
+    VERSION = '1.5.0.7.dev'
   end
 end

data/spec/make_index_spec.rb

@@ -0,0 +1,104 @@
+require_relative '../add_ons/make_index'
+
+describe TextIndex do
+
+
+
+  before :each do
+
+    @text = <<EOF
+This is a test of ((Foo)).
+That is to say, we went to the ((bar)).
+However, ((Foo)) was nowhere to be found!
+EOF
+
+
+
+  end
+
+  it 'can be initialized from a string', :string_setup do
+    ti = TextIndex.new(string: @text)
+    expect(ti.lines.count).to eq(3)
+  end
+
+  it 'can be initialized from a file', :file_setup do
+    ti = TextIndex.new(string: @text)
+    expect(ti.lines.count).to eq(3)
+  end
+
+  it 'scans the array lines, producing an array of index terms', :scan  do
+
+    ti = TextIndex.new(string: @text)
+    ti.scan
+    expect(ti.term_array).to eq(["Foo", "bar", "Foo"])
+
+
+  end
+
+  it 'scans a string, producing and array of its terms', :scan_string do
+    terms = TextIndex.scan_string('This is a test of ((Foo)). Afterwards we will go to the ((bar)).')
+    expect(terms).to eq(["Foo", "bar"])
+  end
+
+  it 'produces a list of index terms from a piece of text' , :index_map do
+    ti = TextIndex.new(string: @text)
+    ti.scan
+    ti.make_index_map
+    expect(ti.index_map).to be_instance_of(Hash)
+    expect(ti.index_map["Foo"]).to eq([0,2])
+    expect(ti.index_map["bar"]).to eq([1])
+  end
+
+  it 'transforms a string, replacing terms with the corresponding asciidoc element', :transform_line do
+    input = 'This is a test of ((Foo)). Afterwards we will go to the ((bar)).'
+    ti = TextIndex.new(string: input)
+    ti.scan
+    ti.make_index_map
+    output = ti.transform_line(input)
+    expected_output = 'This is a test of index_term::[Foo, 0].'
+    expected_output << ' Afterwards we will go to the index_term::[bar, 1].'
+    expect(output).to eq(expected_output)
+  end
+
+
+  it 'transforms an array of lines, writing the output to a file', :transform_lines do
+    ti = TextIndex.new(string: @text)
+    ti.scan
+    ti.make_index_map
+    ti.transform_lines('out.adoc')
+    output = File.read('out.adoc')
+    expected_output = <<EOF
+This is a test of index_term::[Foo, 0].
+That is to say, we went to the index_term::[bar, 1].
+However, index_term::[Foo, 2] was nowhere to be found!
+EOF
+    expect(output).to eq(expected_output)
+  end
+
+  it 'creates the data structure for the index', :index_array  do
+    ti = TextIndex.new(string: @text)
+    ti.scan
+    ti.make_index_map
+    expected_index_array  = [['bar', [1]], ['Foo', [0,2]]]
+    expect(ti.index_array).to eq(expected_index_array)
+
+  end
+
+  it 'creates an Asciidoc version of the index', :ad_version do
+    ti = TextIndex.new(string: @text)
+    ti.scan
+    ti.make_index_map
+    ti.make_index
+    expected_index_text = "<<index_term_1, bar>> +\n<<index_term_0, Foo>>, <<index_term_2, 2>> +\n"
+    expect(ti.index).to eq(expected_index_text)
+  end
+
+  it 'transforms the marked index terms and appends an index to the generated asciidoc file', :preprocess do
+    ti = TextIndex.new(string: @text)
+    ti.preprocess('out.adoc')
+    output = File.read('out.adoc')
+    expected_output = "This is a test of index_term::[Foo, 0].\nThat is to say, we went to the index_term::[bar, 1].\nHowever, index_term::[Foo, 2] was nowhere to be found!\n\n\n== Index\n\n<<index_term_1, bar>> +\n<<index_term_0, Foo>>, <<index_term_2, 2>> +\n"
+    expect(output).to eq(expected_output)
+  end
+
+end

data/test/examples/tex/block_preamble.tex

@@ -1,15 +1,11 @@
 %== .basic ==%
-\begin{preamble}
 This journey begins on a bleary Monday morning.
 Our intrepid team is in desperate need of double shot mochas, but the milk expired eight days ago.
-\end{preamble}
 \hypertarget{x-cavern-glow}{\section*{Cavern Glow}}
 The river rages through the cavern, rattling its content.
 
 %== .toc_placement_preamble ==%
-\begin{preamble}
 This journey begins on a bleary Monday morning.
 Our intrepid team is in desperate need of double shot mochas, but the milk expired eight days ago.
-\end{preamble}
 \hypertarget{x-cavern-glow}{\section*{Cavern Glow}}
 The river rages through the cavern, rattling its content.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-latex
 version: !ruby/object:Gem::Version
-  version: 1.5.0.5.dev
+  version: 1.5.0.7.dev
 platform: ruby
 authors:
 - James Carlson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -171,20 +171,23 @@ files:
 - lib/asciidoctor/latex/converter.rb
 - lib/asciidoctor/latex/core_ext/colored_string.rb
 - lib/asciidoctor/latex/core_ext/utility.rb
-- lib/asciidoctor/latex/css.rb
+- lib/asciidoctor/latex/css_doc_info.rb
 - lib/asciidoctor/latex/dollar.rb
 - lib/asciidoctor/latex/ent_to_uni.rb
 - lib/asciidoctor/latex/environment_block.rb
 - lib/asciidoctor/latex/inject_html.rb
 - lib/asciidoctor/latex/inline_macros.rb
 - lib/asciidoctor/latex/macro_insert.rb
+- lib/asciidoctor/latex/macro_preprocessor.rb
 - lib/asciidoctor/latex/node_processors.rb
 - lib/asciidoctor/latex/prepend_processor.rb
 - lib/asciidoctor/latex/preprocess.rb
+- lib/asciidoctor/latex/sectnumoffset-treeprocessor.rb
 - lib/asciidoctor/latex/tex_block.rb
 - lib/asciidoctor/latex/tex_postprocessor.rb
 - lib/asciidoctor/latex/tex_preprocessor.rb
 - lib/asciidoctor/latex/version.rb
+- spec/make_index_spec.rb
 - test/examples/adoc/ampersand.adoc
 - test/examples/adoc/block_olist.adoc
 - test/examples/adoc/block_ulist.adoc
@@ -315,11 +318,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to LaTeX, provides LaTeX extensions to Asciidoc
 test_files:
+- spec/make_index_spec.rb
 - test/examples/adoc/ampersand.adoc
 - test/examples/adoc/block_olist.adoc
 - test/examples/adoc/block_ulist.adoc