asciidoctor-latex 1.5.0.14.dev → 1.5.0.15.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc734ad876211ade9c666f3435c2336fb7f4e137
-  data.tar.gz: d214449fbd2f4801d6a71b356cb8b11591e36da4
+  metadata.gz: 2eb1be67600beb3fba62db4022504dc0d44c92ac
+  data.tar.gz: aa1699d76a04a60fbb483bb2bccc98b49ae84e5b
 SHA512:
-  metadata.gz: 12206f4ecca6eeaa1d403c434801a9e9fedecab9e5ff419df938a13a33cd1a7cf4b1470663bc8a36083730f39a047fb750364968f17e978177cd4105ffccfee4
-  data.tar.gz: 3204d66f18648782cc38d8fdf6dc75c1eb7c1a8837bd3d38c39b99a23e8d7942cc891bce5bc54ceed00b715a5c3fba65650df3db29c08d4ee4246b47b9858125
+  metadata.gz: 664b4a2771ff48b5c910edd1c8c0bc71285fb5f7c468e1892712f1c8971f4269ceb841919600e20e00321975b279efc04ececbbc10fb8270df59710df05fc5a8
+  data.tar.gz: 5ce18becc5a53d1f186754b5d4b2a0410f7f5336e984fcdec0f3d028bbe63cbb29dd8c28908afd6de66bcf2352fe251ee5bf8c76f2be82c9d78fa5fdca1ac378

data/CHANGELOG.adoc

@@ -22,19 +22,23 @@ for cross-referencing, e.g.,
 `[env.equation#hohoho]`, then it is numbered.
 ////
 
-1.5.0.12.dev:: (1) Make 'latex' the default dialect: no ``-a dialect=blahblah` switch is needed.
+1.5.0.15.dev:: (1) Eliminate automatic inclusion of `macros.tex` if it is present.
+(2) Introduce the block macro `include_latex_macros::LATEX_FILE`, where LATEX_FILE is
+typically a LaTeX style or macro file, or a path thereto.  For the HTML backend, the file is included
+in the source text as `\( FILE CONTENTS \)`.  For the tex backend it is included as-is.
+
+1.5.0.14.dev:: Add the inadvertently omitted file `print.css` to the repository.
+
+1.5.0.13.dev:: (1) Make 'latex' the default dialect: no ``-a dialect=blahblah` switch is needed.
 (2) Add file data/print.css for better print output.
 (3) Add documentnation on how to use data/print.css.
 (4)NOTE: solution in previous line is awkward.  One should be able to access
 the css file without copying it form data/ (or useing a long file path)
 
-
-
 1.5.0.12.dev:: Fix issue #44 in which the file
 macros.tex is ignored in the latex dialect
 when using the html backend.
 
-
 1.5.0.11.dev:: Enable the syntax
 `Asciidoctor.convert str, { 'dialect' => 'latex' }`
 for specifying the dialect in the Ruby API.

data/README.adoc

@@ -103,11 +103,13 @@ to produce `foo.tex`.
 
 === Macro files
 
-The contents of a file named `macros.tex` will be
-read and used by `asciidoctor-latex`
-if it is in the same directory as the file
-being rendered.  This is the case regardless
-of the output format -- HTML or tex.
+To include a LaTeX macro file MACRO_FILE, insert the code
+`include_latex_macros::MACRO_FILE[]`.  This works
+for both the html and tex backends.
+
+
+NOTE: Automatic inclusion of the file `macros.tex`
+has been discontinued.
 
 
 === Switches
@@ -118,11 +120,11 @@ To generate a tex file with a minimal header, do:
  $ asciidoctor-latex -a header=no foo.adoc
 
 .Print style
- An alternate css file, `data/print.css` is provided
- for printing.  It features wider margins and a smaller
- type size.  Copy it to the root of your document
- folder and use the commeand `asciidoctor-latex -a stylesheet=print.css`
- or more generally `asciidoctor-latex -a stylesheet=path_to/print.css`.
+An alternate css file, `data/print.css` is provided
+for printing.  It features wider margins and a smaller
+type size.  Copy it to the root of your document
+folder and use the command `asciidoctor-latex -a stylesheet=print.css`
+or more generally `asciidoctor-latex -a stylesheet=path_to/print.css`.
 
 
 {adlp}'s default form at is `:latexmath`.

data/lib/asciidoctor/latex/click_block.rb

@@ -19,11 +19,43 @@ require 'asciidoctor/extensions'
 require 'asciidoctor/latex/core_ext/colored_string'
 
 
+
 module Asciidoctor::LaTeX
+
+  # Usage: `include_latex::LATEX_FILE`, where LATEX_FILE is
+  # typically a LaTeX style or macro file, or a path thereto.
+  # For the HTML backend, the file is included
+  # in the source text as `\( FILE CONTENTS \)`.
+  # For the tex backend it is included as-is.
+  class IncludeLatexBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
+
+    use_dsl
+
+    named :include_latex_macros
+
+    def process parent, target, attrs
+      # puts "attrs: #{attrs.values.to_s.red}"
+      # puts "target: #{target.to_s.red}"
+
+      file_contents = IO.read(target)
+      if file_contents == nil
+        file_contents = IO.read('public/macros.tex')
+      end
+
+      if parent.document.basebackend? 'html'
+        content = "\n\\(\n#{file_contents}\n\\)\n" || ''
+      else
+        content = "\n#{file_contents}\n" || ''
+      end
+
+      create_pass_block parent, content, attrs,  subs: nil
+    end
+
+  end
+
   class ClickBlock < Asciidoctor::Extensions::BlockProcessor
 
     use_dsl
-    # ^^^ don't know what this is.  Could you explain?
 
     named :click
     on_context :open

data/lib/asciidoctor/latex/converter.rb

@@ -83,7 +83,7 @@
 # You can put files 'macros.tex' and 'preamble.tex' to
 # replace the default preamble and set of macros.
 # Define your own 'newEnvironments.tex' to use your definitions
-# as opposed to the default definitons of environments
+# as opposed to the default definitions of environments
 # in tex mapping to [tex.ENVIRONOMENT] in asciidoctor-latex.
 #
 # TECHNICAL NOTES (This section needs a thorough rewrite)
@@ -265,12 +265,12 @@ module Asciidoctor::LaTeX
     # Example:
     # [env.include_latex]
     # --
-    # \nput abc.text
+    # \input abc.text
     # \usepackage{def}
     # --
     # Nothing appears in the HTML,
     # bu lines
-    # \nput abc.text
+    # \input abc.text
     # \usepackage{def}
     # appear in the generated tex file.
     def handle_include_latex node
@@ -483,6 +483,8 @@ module Asciidoctor::LaTeX
 
       dialect = document.options['dialect'] || document.attributes['dialect'] || 'latex'
 
+      # puts "DIALECT = #{dialect}".red
+
       if ['asciidoc', 'manuscript'].include? dialect
 
         preprocessor DollarPreprocessor if document.basebackend? 'tex'
@@ -512,6 +514,8 @@ module Asciidoctor::LaTeX
 
         inline_macro ChemInlineMacro
 
+        block_macro IncludeLatexBlockMacro
+
         postprocessor InjectHTML unless document.attributes['inject_javascript'] == 'no'
         postprocessor Chem if document.basebackend? 'html'
         postprocessor HTMLPostprocessor if document.basebackend? 'html'

data/lib/asciidoctor/latex/inline_macros.rb

@@ -8,6 +8,7 @@ require 'asciidoctor/latex/core_ext/colored_string'
 #
 module Asciidoctor::LaTeX
 
+
   class ChemInlineMacro <  Asciidoctor::Extensions::InlineMacroProcessor
     use_dsl
     named :chem

data/lib/asciidoctor/latex/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module LaTeX
-    VERSION = '1.5.0.14.dev'
+    VERSION = '1.5.0.15.dev'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-latex
 version: !ruby/object:Gem::Version
-  version: 1.5.0.14.dev
+  version: 1.5.0.15.dev
 platform: ruby
 authors:
 - James Carlson
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to LaTeX, provides LaTeX extensions to Asciidoc