limarka 19.7.3.pre.323 → 19.7.3.pre.324

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fdaaf1afabe4717f2fbb721a77a2bf569c982709a124998014503b782b2f9a2
-  data.tar.gz: bff828f6bd0d84e0b03452fb0f7d41196a0ef4be29c04b030cd1ca9784e2e968
+  metadata.gz: 00dcf80361f831984e3cd9bf91b627a4bb5834fc95cedc49326df86a7cf998d9
+  data.tar.gz: ad01e5997880d67515664193cd00121defdbb1f2fe80a1762ae84edacbcb61b3
 SHA512:
-  metadata.gz: f0d7371bb2fd3e76f2ca3b5afdf8ff0155b2ed9c6cd09b2c094ee3f2ef3c4ce93a293689776bd7970518eecd0bfefc763ea7e81f2d12b468c1a029dbfc09a258
-  data.tar.gz: ba84dc379e1de0e14a642c9bfefd5ea98470cec659f888468d07579c0367353cd6d375d0f7cb77eaf8c01fe5b59e2e9cbeac151c86b8c78c6bf8677f212c7b96
+  metadata.gz: b7f15adcf4e7158d7b37d358bcedf7a59b96fd762288e64460f016f8ead56355cd40e8ba3ae9d7619bb3c1d3af5cac46adfe81b5e3041714aa359f57ee9194ed
+  data.tar.gz: '0985e4d7d0d3a6e9daf37ec87ab0a6477f11a72bcf7a1c1b5bf9e9d0438d77747f70b33821b0aa203a2828cc4f590d82465d874a9d44f164c4ad8eabcccb7726'

data/lib/limarka/conversor.rb

@@ -90,7 +90,7 @@ module Limarka
       "epigrafe", "resumo", "abstract", "lista_ilustracoes", "lista_tabelas",
       "lista_siglas", "lista_simbolos", "sumario"].each_with_index do |secao,indice|
         template = "pretextual#{indice+1}-#{secao}"
-        Open3.popen3("pandoc -f #{formato} \"--data-dir=#{options[:templates_dir]}\" --template=#{template} -t latex --filter #{pandoc_abnt_path}") {|stdin, stdout, stderr, wait_thr|
+        Open3.popen3("pandoc -f #{@t.formato} \"--data-dir=#{options[:templates_dir]}\" --template=#{template} -t latex --filter #{pandoc_abnt_path}") {|stdin, stdout, stderr, wait_thr|
           stdin.write(hash_to_yaml(t.configuracao))
           stdin.write("\n")
           if t.errata? and necessita_de_arquivo_de_texto.include?(secao) then
@@ -191,13 +191,9 @@ module Limarka
       result
     end
 
-    def formato
-      "markdown+raw_tex"
-    end
-
     def textual(pretextual_tempfile, postextual_tempfile)
       valida_yaml
-      Open3.popen3("pandoc -f #{formato} -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|
+      Open3.popen3("pandoc -f #{@t.formato} -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))
@@ -263,7 +259,7 @@ module Limarka
     def secao(template, condicao_para_conteudo, conteudo_externo)
       s = StringIO.new
 
-      Open3.popen3("pandoc -f #{formato} \"--data-dir=#{options[:templates_dir]}\" --template=#{template} --top-level-division=chapter -t latex --filter #{pandoc_abnt_path}") {|stdin, stdout, stderr, wait_thr|
+      Open3.popen3("pandoc -f #{@t.formato} \"--data-dir=#{options[:templates_dir]}\" --template=#{template} --top-level-division=chapter -t latex --filter #{pandoc_abnt_path}") {|stdin, stdout, stderr, wait_thr|
         stdin.write(hash_to_yaml(t.configuracao))
         stdin.write("\n")
         if (condicao_para_conteudo) then

data/lib/limarka/trabalho.rb

@@ -204,5 +204,18 @@ module Limarka
       end
 
     end
+
+    def self.formato_padrao
+      "markdown+raw_tex"
+    end
+
+    def formato
+      result = Trabalho.formato_padrao
+      unless @configuracao["formato"].nil? then
+        result << @configuracao["formato"]
+      end
+      result
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: limarka
 version: !ruby/object:Gem::Version
-  version: 19.7.3.pre.323
+  version: 19.7.3.pre.324
 platform: ruby
 authors:
 - Eduardo de Santana Medeiros Alexandre