polytexnic 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ae9208f70f3f0a06275683bf047bc73870168cb5501b2726dbbadd8b9c55ceb
-  data.tar.gz: c712dda3116e33168f71e70fcc19411b66f8c07ce9ae5bbd026dfd1b5b26a8e3
+  metadata.gz: bf582b21d2b0ca0b0a5d2fa2da4c5633f0cf1f53b240b9dd591f97b02ac4fc32
+  data.tar.gz: 1e04b862d24f44942d23bdd7ca0d68158a1067bed3966f80125eabe72a1045d0
 SHA512:
-  metadata.gz: bdad58dffb6636ae21dc2a929a456ed005de8000d08f74b69c12bc5b269805b1c7f20ec026507bc70ed8b5a1ade086db559c42c67a8077c0fd50b770b329d8b0
-  data.tar.gz: 9f900c12dc794ffa606f9beb8802102369c76f4a8ef1ba82d2902f03f0ed624d2b3ac4d3bb836aae2a5ca0f2223a77a543cd5efe93e57137d8385c3ffb59117c
+  metadata.gz: a0e19cfd1a8e44c4a9b2e59e8c15499d25a6137a49eb542acee566928052ec80b445a9f295d44f7c95a8a7d8a5975570c969e12139de5c35b52fed3c517fdfb0
+  data.tar.gz: 68a9ff47f302a1dee06aa08bcc911b9cd69b578a3be043e7542104bb392f989195d9a7d48f79198020d15b067f15f46c6c4686e7328dfa908814c5c7bf2c37b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polytexnic (1.7.3)
+    polytexnic (1.7.5)
       json (~> 2.3.0)
       kramdown (>= 2.0, < 3.0)
       msgpack (~> 1.2.0)
@@ -38,7 +38,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     json (2.3.1)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -51,7 +51,7 @@ GEM
     msgpack (1.2.10)
     multi_json (1.15.0)
     nenv (0.3.0)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.10-arm64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -59,10 +59,10 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pygments.rb (2.3.0)
-    racc (1.6.0)
+    pygments.rb (2.3.1)
+    racc (1.6.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rest-client (1.6.7)
@@ -88,8 +88,7 @@ GEM
     tins (0.13.2)
 
 PLATFORMS
-  x86_64-darwin-19
-  x86_64-darwin-21
+  arm64-darwin-21
 
 DEPENDENCIES
   coveralls
@@ -101,4 +100,4 @@ DEPENDENCIES
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   2.3.10
+   2.3.14

data/lib/polytexnic/utils.rb

@@ -10,7 +10,9 @@ module Polytexnic
     def tralics
       executable = `which tralics`.chomp
       return executable unless executable.empty?
-      filename = if os_x_newer?
+      filename = if apple_silicon?
+                   'tralics-apple-silicon'
+                 elsif os_x_newer?
                    'tralics-os-x-newer'
                  elsif os_x_older?
                    'tralics-os-x-older'
@@ -33,7 +35,10 @@ module Polytexnic
 
 
     # Expands '\input' command by processing & inserting the target source.
+    # We skip tikzstyles since those don't get inserted into the text.
     def expand_input!(text, code_function, ext = 'md')
+      uuid = "52576c7eb84a49b5afc0d9913891f346"
+      text.gsub!(/\\input\{(.*\.tikzstyles)\}/) { "#{uuid}-#{$1}-#{uuid}" }
       text.gsub!(/^[ \t]*\\input\{(.*?)\}[ \t]*$/) do
         # Prepend a newline for safety.
         included_text = "\n" + File.read("#{$1}.#{ext}")
@@ -42,6 +47,12 @@ module Polytexnic
           expand_input!(clean_text, code_function, ext)
         end
       end
+      text.gsub!(/#{uuid}-(.*)-#{uuid}/) { "\\input{#{$1}}" }
+    end
+
+    # Returns true for Apple Silicon.
+    def apple_silicon?
+      RUBY_PLATFORM.match(/arm64/)
     end
 
     # Returns true for OS X Mountain Lion (10.8) and later.

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.7.3"
+  VERSION = "1.7.5"
 end

data/spec/support/resemble_matcher.rb

@@ -97,4 +97,4 @@ class String
     stripped_result = result.split("\n").map(&:strip).join("\n")
     stripped_result.gsub("\n", ' ').gsub(/[ \t]{2,}/, ' ')
   end
-end
+end

data/spec/to_latex_spec.rb

@@ -230,6 +230,7 @@ end
    describe '\input command' do
       let(:external_file) { 'foo.tex' }
       let(:nested_external_file) { 'bar.tex' }
+      let(:tikzstyles_file) { 'test.tikzstyles' }
       let(:input) do <<-'EOS'
   Lorem ipsum
   %= lang:ruby
@@ -252,13 +253,15 @@ end
       before do
         File.write(external_file, input)
         File.write(nested_external_file, nested_input)
+        File.write(tikzstyles_file, "lorem ipsum")
       end
       after do
         File.unlink(external_file)
         File.unlink(nested_external_file)
+        File.unlink(tikzstyles_file)
       end
 
-      let(:polytex) { "\\chapter{Foo}\n\n  \\input{foo}  " }
+      let(:polytex) { "\\chapter{Foo}\n\n  \\input{foo}\n\n  \\input{test.tikzstyles}" }
       let(:foo_latex) do
         '\PY{k}{def} \PY{n+nf}{foo}\PY{p}{;}'
       end
@@ -268,6 +271,7 @@ end
 
       it { should include foo_latex }
       it { should include bar_latex }
+      it { should include '\input{test.tikzstyles}' }
       it { should_not include 'xmlelement' }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.5
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -226,6 +226,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- arm64-darwin21
 - bin/polytexnic
 - lib/polytexnic.rb
 - lib/polytexnic/code_inclusion.rb
@@ -243,6 +244,7 @@ files:
 - notes/pandoc.md
 - polytexnic.gemspec
 - polytexnic_commands.sty
+- precompiled_binaries/tralics-apple-silicon
 - precompiled_binaries/tralics-armv7l-linux-eabihf
 - precompiled_binaries/tralics-i686-linux
 - precompiled_binaries/tralics-os-x-newer