diff --git a/anexos/analitica/analytics.html b/anexos/analitica/analytics.html index ee9973a..250af9a 100644 --- a/anexos/analitica/analytics.html +++ b/anexos/analitica/analytics.html @@ -9190,8 +9190,13 @@

Elemento

Ocurrencias

1

10

10

1

+<<<<<<< HEAD

11

1

12

3

+======= +

11

3

+

12

1

+>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf

13

2

14

2

1421

1

diff --git a/index.html b/index.html index ed4e6ba..1f25f60 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf @@ -22,6 +26,7 @@

Maestría en Filosofía

+<<<<<<< HEAD

Tesis en liberación continua:
MD / HTML / PDF / EPUB / MOBI / DOCX

Repositorios:
0xacab / GitLab

Bibliografía:
BIB / HTML / recursos descargables

@@ -31,6 +36,17 @@
+ diff --git a/tesis/ebooks/out/logs/epubcheck/epubcheck-3.xml b/tesis/ebooks/out/logs/epubcheck/epubcheck-3.xml index 6f9cd68..eb8c518 100644 --- a/tesis/ebooks/out/logs/epubcheck/epubcheck-3.xml +++ b/tesis/ebooks/out/logs/epubcheck/epubcheck-3.xml @@ -1,9 +1,16 @@ +<<<<<<< HEAD 2021-10-12T16:40:53-05:00 2021-10-12T16:40:40Z 2021-10-12T16:40:41Z +======= + 2021-10-11T17:27:19-05:00 + + 2021-10-11T17:27:03Z + 2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf application/epub+zip 3.0 Not well-formed @@ -25,9 +32,15 @@ CharacterCount104122 Languagees Info +<<<<<<< HEAD Identifier1_0_0-cdb3030297ad4331b96b271e8514e105 CreationDate2021-10-12T16:40:40Z ModDate2021-10-12T16:40:41Z +======= + Identifier1_0_0-87153b436c084c51b19b17e0c9b8a6c5 + CreationDate2021-10-11T17:27:03Z + ModDate2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf TitleEl creador y lo creado CreatorSanta Ana Anguiano, Ramiro PublisherUNAM-FFyL diff --git a/tesis/ebooks/out/logs/epubcheck/epubcheck-4.xml b/tesis/ebooks/out/logs/epubcheck/epubcheck-4.xml index e8d3cab..d161853 100644 --- a/tesis/ebooks/out/logs/epubcheck/epubcheck-4.xml +++ b/tesis/ebooks/out/logs/epubcheck/epubcheck-4.xml @@ -3,10 +3,17 @@ date="2016-11-29" name="epubcheck" release="4.0.2"> +<<<<<<< HEAD 2021-10-12T16:40:51-05:00 2021-10-12T16:40:40Z 2021-10-12T16:40:41Z +======= + 2021-10-11T17:27:17-05:00 + + 2021-10-11T17:27:03Z + 2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf application/epub+zip 3.0.1 Not well-formed @@ -43,19 +50,31 @@ Identifier +<<<<<<< HEAD 1_0_0-cdb3030297ad4331b96b271e8514e105 +======= + 1_0_0-87153b436c084c51b19b17e0c9b8a6c5 +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf CreationDate +<<<<<<< HEAD 2021-10-12T16:40:40Z +======= + 2021-10-11T17:27:03Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf ModDate +<<<<<<< HEAD 2021-10-12T16:40:41Z +======= + 2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf diff --git a/tesis/ebooks/out/logs/log-all.txt b/tesis/ebooks/out/logs/log-all.txt index 93c30ba..e5db195 100644 --- a/tesis/ebooks/out/logs/log-all.txt +++ b/tesis/ebooks/out/logs/log-all.txt @@ -20,6 +20,7 @@ $ ruby /home/perro/.pecas/epub/automata/../divider/divider.rb -f /home/perro/Rep $ ruby /home/perro/.pecas/epub/automata/../recreator/recreator.rb -d epub -y /home/perro/Repositorios/maestria-investigacion/tesis/ebooks/out/meta-data.yaml # pc-changer +<<<<<<< HEAD $ ruby /home/perro/.pecas/epub/automata/../changer/changer.rb -e /home/perro/Repositorios/maestria-investigacion/tesis/ebooks/out/epub-cdb30302.epub --version 3.0.0 # pc-analytics @@ -27,16 +28,32 @@ $ ruby /home/perro/.pecas/epub/automata/../../base-files/analytics/analytics.rb # epubcheck 4.0.2 $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/4-0-2/epubcheck.jar epub-cdb30302.epub -out log.xml -q +======= +$ ruby /home/perro/.pecas/epub/automata/../changer/changer.rb -e /home/perro/Repositorios/maestria-investigacion/tesis/ebooks/out/epub-87153b43.epub --version 3.0.0 + +# pc-analytics +$ ruby /home/perro/.pecas/epub/automata/../../base-files/analytics/analytics.rb -f /home/perro/Repositorios/maestria-investigacion/tesis/ebooks/out/epub-87153b43.epub --json + +# epubcheck 4.0.2 +$ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/4-0-2/epubcheck.jar epub-87153b43.epub -out log.xml -q +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf +<<<<<<< HEAD 2021-10-12T16:40:51-05:00 2021-10-12T16:40:40Z 2021-10-12T16:40:41Z +======= + 2021-10-11T17:27:17-05:00 + + 2021-10-11T17:27:03Z + 2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf application/epub+zip 3.0.1 Not well-formed @@ -73,19 +90,31 @@ $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/4-0-2/epu Identifier +<<<<<<< HEAD 1_0_0-cdb3030297ad4331b96b271e8514e105 +======= + 1_0_0-87153b436c084c51b19b17e0c9b8a6c5 +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf CreationDate +<<<<<<< HEAD 2021-10-12T16:40:40Z +======= + 2021-10-11T17:27:03Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf ModDate +<<<<<<< HEAD 2021-10-12T16:40:41Z +======= + 2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf @@ -588,6 +617,7 @@ $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/4-0-2/epu # epubcheck 3.0.1 +<<<<<<< HEAD $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/3-0-1/epubcheck.jar epub-cdb30302_3-0-0.epub -out log.xml -q @@ -596,6 +626,16 @@ $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/3-0-1/epu 2021-10-12T16:40:40Z 2021-10-12T16:40:41Z +======= +$ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/3-0-1/epubcheck.jar epub-87153b43_3-0-0.epub -out log.xml -q + + + + 2021-10-11T17:27:19-05:00 + + 2021-10-11T17:27:03Z + 2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf application/epub+zip 3.0 Not well-formed @@ -617,9 +657,15 @@ $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/3-0-1/epu CharacterCount104122 Languagees Info +<<<<<<< HEAD Identifier1_0_0-cdb3030297ad4331b96b271e8514e105 CreationDate2021-10-12T16:40:40Z ModDate2021-10-12T16:40:41Z +======= + Identifier1_0_0-87153b436c084c51b19b17e0c9b8a6c5 + CreationDate2021-10-11T17:27:03Z + ModDate2021-10-11T17:27:05Z +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf TitleEl creador y lo creado CreatorSanta Ana Anguiano, Ramiro PublisherUNAM-FFyL @@ -719,11 +765,19 @@ $ java -jar /home/perro/.pecas/epub/automata/../../src/alien/epubcheck/3-0-1/epu # ace +<<<<<<< HEAD $ ace -o logs/ace epub-cdb30302.epub => Ace no pudo ser localizado, el EPUB no puede ser verificado… # kindlegen $ kindlegen epub-cdb30302.epub +======= +$ ace -o logs/ace epub-87153b43.epub +=> Ace no pudo ser localizado, el EPUB no puede ser verificado… + +# kindlegen +$ kindlegen epub-87153b43.epub +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf ************************************************************* Amazon kindlegen(Linux) V2.9 build 1028-0897292 @@ -740,6 +794,7 @@ $ kindlegen epub-cdb30302.epub Info(prcgen):I1047: Added metadata dc:Subject "Propiedad intelectual" Info(prcgen):I1047: Added metadata dc:Subject "Bienes comunes" Info(prcgen):I1047: Added metadata dc:Description "Tesis para la obtención del grado de Maestro en Filosofía." +<<<<<<< HEAD Info(prcgen):I1052: Kindle support cover images but does not support cover HTML. Hence using the cover image specified and suppressing cover HTML in content. URL: /tmp/mobi-l2J31w/OPS/xhtml/000-portada.xhtml Info(prcgen):I1002: Parsing files 0000013 Warning(htmlprocessor):W28001: CSS style specified in content is not supported by Kindle readers. Removing the CSS property: 'column-count' in file: /tmp/mobi-l2J31w/OPS/css/styles.css @@ -756,6 +811,25 @@ $ kindlegen epub-cdb30302.epub Info(prcgen):I1015: Building PRC file Info(prcgen):I1006: Resolving hyperlinks Warning(prcgen):W14001: Hyperlink not resolved: /tmp/mobi-l2J31w/OPS/xhtml/TODO +======= + Info(prcgen):I1052: Kindle support cover images but does not support cover HTML. Hence using the cover image specified and suppressing cover HTML in content. URL: /tmp/mobi-5TE2Mi/OPS/xhtml/000-portada.xhtml + Info(prcgen):I1002: Parsing files 0000013 + Warning(htmlprocessor):W28001: CSS style specified in content is not supported by Kindle readers. Removing the CSS property: 'column-count' in file: /tmp/mobi-5TE2Mi/OPS/css/styles.css + Warning(htmlprocessor):W28001: CSS style specified in content is not supported by Kindle readers. Removing the CSS property: 'column-gap' in file: /tmp/mobi-5TE2Mi/OPS/css/styles.css + Warning(htmlprocessor):W28001: CSS style specified in content is not supported by Kindle readers. Removing the CSS property: 'column-rule' in file: /tmp/mobi-5TE2Mi/OPS/css/styles.css + Warning(inputpreprocessor):W29004: Forcefully closed opened Tag: + in file: /tmp/mobi-5TE2Mi/OPS/xhtml/006-teorias_de_la_propiedad_intelectual.xhtml line: 0000028 + Warning(inputpreprocessor):W29004: Forcefully closed opened Tag: + in file: /tmp/mobi-5TE2Mi/OPS/xhtml/006-teorias_de_la_propiedad_intelectual.xhtml line: 0000039 + Warning(inputpreprocessor):W29004: Forcefully closed opened Tag: + in file: /tmp/mobi-5TE2Mi/OPS/xhtml/007-criticas_de_los_bienes_comunes.xhtml line: 0000018 + Warning(inputpreprocessor):W29004: Forcefully closed opened Tag: + in file: /tmp/mobi-5TE2Mi/OPS/xhtml/007-criticas_de_los_bienes_comunes.xhtml line: 0000024 + Info(prcgen):I1016: Building enhanced PRC file + Info(prcgen):I1015: Building PRC file + Info(prcgen):I1006: Resolving hyperlinks + Warning(prcgen):W14001: Hyperlink not resolved: /tmp/mobi-5TE2Mi/OPS/xhtml/TODO +>>>>>>> b4432c7995715473d09e0b74d40c397456a603bf Warning(prcgen):W14002: Some hyperlinks could not be resolved. Info(pagemap):I8000: No Page map found in the book Info(prcgen):I1045: Computing UNICODE ranges used in the book @@ -768,7 +842,6 @@ $ kindlegen epub-cdb30302.epub Info(prcgen):I1041: The file format version is V6 Info(prcgen):I1031: Saving PRC file Info(prcgen):I1032: PRC built successfully - Info(prcgen):I1016: Building enhanced PRC file Info(prcgen):I1007: Resolving mediaidlinks Info(prcgen):I1011: Writing mediaidlinks Info(prcgen):I1009: Resolving guide items diff --git a/tesis/ebooks/out/logs/pc-analytics/analytics.json b/tesis/ebooks/out/logs/pc-analytics/analytics.json index 6693194..af9516d 100644 --- a/tesis/ebooks/out/logs/pc-analytics/analytics.json +++ b/tesis/ebooks/out/logs/pc-analytics/analytics.json @@ -18,7 +18,7 @@ ], [ "11", - 1 + 3 ], [ "11–27", @@ -45960,7 +45960,7 @@ ], [ "11", - 1 + 3 ], [ "12",