limarka 19.7.pre.311 → 19.7.pre.313

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eab36b5ae04112b146904bee8a9840b9928d46a08603bf1ba2bbf42a226e07d
-  data.tar.gz: c9d3af250a7699a4b19519750d2f6f5f90882efdf9fd655b3f25e6e7f0b6331e
+  metadata.gz: 9b026088063079c1550c4460a08b50f53e09a19180ec00fd13ec409c9b129baf
+  data.tar.gz: 9aec9c715d5ce5c5f767b4615f7d28a805d767eb1b4b76c0449ebb5e15e85ccd
 SHA512:
-  metadata.gz: e3a7790c8a6fd877b2e2739d2266e624c70ebf87874f2e22953c163c8e25602f7bf4fa349e6c62dde47a36ecb9bef3f3e28295b23d18098c9787a88ae1f61d59
-  data.tar.gz: 1f0062f6aa84be254ee1f04ddcd6c206721f5fa74177cf792d2ed628873e7a2fa116841be5ff3f22f74da963e25d8a427f40150bdded9909ae91dad1551f3c40
+  metadata.gz: 9d2d8de75d02613045f32ae9bc7333248e799da455e0cc12f1dada0ad17e38eb9dc13ff3dd0e2cfb60a4411df5a30497957a4b0dfb8b2862d6f9801f96ee0f01
+  data.tar.gz: fd1611a535bf23bf74ec039ed3eba2ed524f4ce9d9e097e91261793ee6fd6b971dbbde13c75a4bf809134ff21ce444c440af9955961f91286545fada85cf90c8

data/Rakefile

@@ -56,7 +56,7 @@ task :dissertacao => 'dissertacao-limarka/output' do
   system 'bundle', 'exec', 'limarka', 'exec', '-i', 'dissertacao-limarka', '-o', 'dissertacao-limarka/output'
 end
 
-desc "Apllica tag v#{Limarka::VERSION}"
+desc "Aplica tag v#{Limarka::VERSION}"
 task 'tag' do
   system 'git', 'commit', '-m', %Q(Gerando versão v#{Limarka::VERSION})
   system 'git', 'tag',  %Q(v#{Limarka::VERSION})

data/changelogs/unreleased/20190702202850753_filtros.yml

@@ -0,0 +1,2 @@
+"Melhorias implementadas":
+  - Possível utilizar filtros pandoc através das opções --filtros ou --filtros-lua.

data/exe/limarka

@@ -7,4 +7,4 @@ Encoding.default_internal = Encoding::UTF_8
 require "limarka"
 require "limarka/cli"
 
-Limarka::Cli.inicio(ARGV)
+Limarka::Cli.start(ARGV)

data/lib/limarka/cli.rb

@@ -24,13 +24,14 @@ module Limarka
 
     default_command :exec
 
+    @@cv = nil
+
     desc "check", "Verifica se o sistema está utilizando as dependências compatíveis"
     def check
       c = Limarka::Check.new()
       c.check()
     end
 
-
     method_option :configuracao_yaml, :aliases => '-y', :type => :boolean, :desc => 'Ler configuração exportada (configuracao.yaml) em vez de configuracao.pdf', :default => false
     method_option :input_dir, :aliases => '-i', :desc => 'Diretório onde será executado a ferramenta', :default => '.'
     method_option :output_dir, :aliases => '-o', :desc => 'Diretório onde serão gerados os arquivos', :default => '.'
@@ -39,6 +40,8 @@ module Limarka
     method_option :rascunho, :aliases => '-r', :desc => 'Ler de um arquivo de rascunho em vez de "trabalho-academico.md"', :banner => "RASCUNHO_FILE"
     method_option :verbose, :aliases => '-v', :desc => 'Imprime mais detalhes da execução', :default => false, :type => :boolean
     method_option :version, :desc => 'Imprime a versão do limarka', :default => false, :type => :boolean
+    method_option :filtros_lua, :type => :array, :required => false
+    method_option :filtros, :type => :array, :required => false
 
     desc "exec", "Executa o sistema para geração do documento latex e compilação"
     def exec
@@ -58,10 +61,10 @@ module Limarka
       Dir.chdir(options[:input_dir]) do
         t = Limarka::Trabalho.new
         t.atualiza_de_arquivos(options)
-        cv = Limarka::Conversor.new(t,options)
-        cv.convert
-        cv.usa_pdftotext = false
-        cv.compila if options[:compila_tex]
+        @@cv = Limarka::Conversor.new(t,options)
+        @@cv.convert
+        @@cv.usa_pdftotext = false
+        @@cv.compila if options[:compila_tex]
       end
     end
 
@@ -311,23 +314,12 @@ TEX
 
     end
 
-    def self.command_line_options_file
-      ".limarka"
-    end
-
-    def self.inicia(given_args = ARGV, config = {})
-      array = []
-      if File.file?(self.command_line_options_file) then
-        string = IO.read(self.command_line_options_file)
-        array = string.split(/\n+|\r+/).reject(&:empty?)
-      end
-
-      self.start(given_args + array, config)
-    end
-
 
     no_commands do
 
+      def self.cv
+        @@cv
+      end
 
       def valida_figura_rotulo (rotulo)
         if (not rotulo =~ (/^[a-zA-Z][\w\-:]*$/)) then

data/lib/limarka/conversor.rb

@@ -175,9 +175,26 @@ module Limarka
     def secao_indice
     end
 
+    def filtros_lua
+      result = ""
+      if options[:filtros_lua]
+        result = options[:filtros_lua].reduce("") { |cmd, filtro| "#{cmd} --lua-filter #{filtro}" }
+      end
+      result
+    end
+
+    def filtros
+      result = ""
+      if options[:filtros]
+        result = options[:filtros].reduce("") { |cmd, filtro| "#{cmd} --filter #{filtro}" }
+      end
+      result
+    end
+
+
     def textual(pretextual_tempfile, postextual_tempfile)
       valida_yaml
-      Open3.popen3("pandoc -f markdown+raw_tex -t latex -s \"--data-dir=#{options[:templates_dir]}\" --template=trabalho-academico --top-level-division=chapter --include-before-body=#{pretextual_tempfile.path}  --include-after-body=#{postextual_tempfile.path} --filter #{pandoc_abnt_path}") {|stdin, stdout, stderr, wait_thr|
+      Open3.popen3("pandoc -f markdown+raw_tex -t latex -s \"--data-dir=#{options[:templates_dir]}\" --template=trabalho-academico --top-level-division=chapter --include-before-body=#{pretextual_tempfile.path}  --include-after-body=#{postextual_tempfile.path} #{filtros_lua} #{filtros} --filter #{pandoc_abnt_path}") {|stdin, stdout, stderr, wait_thr|
         stdin.write(File.read(options[:templates_dir] + '/templates/configuracao-tecnica.yaml'))
         stdin.write("\n")
         stdin.write(hash_to_yaml(t.configuracao))

data/limarka.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "codelog"
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "paru"
 
   spec.add_dependency "clipboard"
   spec.add_dependency "ffi"
@@ -42,10 +43,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pdf-forms", "~> 1.2"
   spec.add_dependency "pandoc-ruby"
   spec.add_dependency "thor"
-  spec.add_dependency 'bibtex-ruby'
-  spec.add_dependency 'terminal-table'
-  spec.add_dependency 'pandoc_abnt', "~> 2.0.0"
-  spec.add_dependency 'guard'
-  spec.add_dependency 'guard-shell'
+  spec.add_dependency "bibtex-ruby"
+  spec.add_dependency "terminal-table"
+  spec.add_dependency "pandoc_abnt", "~> 2.0.0"
+  spec.add_dependency "guard"
+  spec.add_dependency "guard-shell"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: limarka
 version: !ruby/object:Gem::Version
-  version: 19.7.pre.311
+  version: 19.7.pre.313
 platform: ruby
 authors:
 - Eduardo de Santana Medeiros Alexandre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: paru
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +296,7 @@ files:
 - changelogs/releases/19.06.md
 - changelogs/template.yml
 - changelogs/unreleased/.gitkeep
-- changelogs/unreleased/20190628200420483_.limarka.yml
+- changelogs/unreleased/20190702202850753_filtros.yml
 - containers/limarka.dockerfile
 - containers/ruby-latex-pandoc.dockerfile
 - docs/paper/codemeta.json

data/changelogs/unreleased/20190628200420483_.limarka.yml

@@ -1,2 +0,0 @@
-"Melhorias implementadas":
-  - Se arquivo .limarka existir seu conteúdo é adicionado à execução do limarka - [\#192](https://github.com/abntex/limarka/issues/192)