diff --git a/.gitignore b/.gitignore index b6a846a8cf09d4aead2822614a62dd0d4e737513..190cc6087a9f13eb30e52b925ca7c81343fea08a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*/input/* + */tmp/* */output/* !*/input/.gitkeep diff --git a/hdoc_to_canoprof/input/Sample_V3.hdoc b/hdoc_to_canoprof/input/Sample_V3.hdoc new file mode 100644 index 0000000000000000000000000000000000000000..3b340e3a03b14440c4c6fdd1736d6de853b41640 Binary files /dev/null and b/hdoc_to_canoprof/input/Sample_V3.hdoc differ diff --git a/hdoc_to_epub/README.md b/hdoc_to_epub/README.md index 133f14a0e504934a4b602083d0820b9966fef4b1..b96c61ffa92bd94fcaafd7bc64916c54faa18bbf 100644 --- a/hdoc_to_epub/README.md +++ b/hdoc_to_epub/README.md @@ -35,7 +35,7 @@ La personne possède un (ou des) hdoc et voudrait le convertir en epub. Il se di Supported --------- -Image : JPEG; JPG, PNG, SVG (non testé pour SVG) +Image : JPEG, JPG, PNG Gestion du multifichiers en input @@ -44,15 +44,24 @@ Hypertexte Unsupported ----------- +### EPUB2 + ODG : non supporté en EPUB => "Élément non supporté en EPUB : " -Problème sur la liseuse vis à vis du CSS (à détailler) +CSS3 + +HTML5 + +SVG + +(voir https://mpsltd.wordpress.com/2011/05/25/epub-3-vs-epub-2-0-2/) + +### Conversion Exercices Méthode et Rappels (data-hdoc-type) - Known bugs ---------- @@ -65,7 +74,7 @@ Problème avec les keywords : le hdoc contient des keywords mais nous ne savons Todo list --------- -Trouver une solution pour le dimentionnement des images +tester avec SVG Repérer le problème avec le css @@ -75,3 +84,5 @@ Faire l'affichage des nouveaux types : Méthode et Rappels Technical Notes --------------- + +Il est déconseillé de justifier le texte pour des raisons de lisibilité sur les liseuses. diff --git a/hdoc_to_epub/changement/opale_to_hdoc_regle2.xsl b/hdoc_to_epub/changement/opale_to_hdoc_regle2.xsl deleted file mode 100644 index 65fc9b84191ad647e4fc7177c876d56171ffca05..0000000000000000000000000000000000000000 --- a/hdoc_to_epub/changement/opale_to_hdoc_regle2.xsl +++ /dev/null @@ -1,552 +0,0 @@ - - - - - - - - - - - - - - - RNGSchema="http://hdoc.crzt.fr/schemas/xhtml/hdoc1-xhtml.rng" type="xml" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

-
- - - <xsl:value-of select="."/> - - - -
- -
-
- - - -

- -

-
- - - - - - -
- -
-
- - - - - - -
- -
-
- - - - - - - - - - - -
- -
-
- - - -
-
- - - -
- - - - - - - - - - - -
- -
-
-
- - - -
-
- - - -
- - - - - - - - - -
-
-

Questions de synthèse

-
- -
- -
-
-
- -
- -
-
-
- - - -
-
- - - -
- - - - - - - -
- -
-
-
- - - -
-
-

Objectifs

-
-
- -
-
-
- - - -
-
-

Introduction

-
- -
- -
-
-
- - - -
-
-

Conclusion

-
- -
- -
-
-
- - - - - - - - - - - - - - -
-
- - -
- - - - - - - -
-
- - - -
-
- -
- - -
-
- - -
- -
-
- - -
-
- -
- -
- -
-
-
-
- - - - - - - - - - {$name} - - - - - - - - - - - - - - - - - - - - - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - - -
- - -
-
- - -
- - -
-
- - -
- - -
-
- - - - - - - - - - - - -

- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
-
- - - -
    - -
-
- - - - - -
  • - -
  • -
    - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - diff --git a/hdoc_to_epub/input/.gitkeep b/hdoc_to_epub/input/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/hdoc_to_epub/xsl/chapitre.xsl b/hdoc_to_epub/xsl/chapitre.xsl index b99ef8c1ef7dafa8ea666b149dbf7e98dac7068d..f4c9561351677baadd3bed3ee6bccf5ac3b4f697 100644 --- a/hdoc_to_epub/xsl/chapitre.xsl +++ b/hdoc_to_epub/xsl/chapitre.xsl @@ -183,24 +183,12 @@ - - - - -
    -
    - - ../images/ - - - -
    -
    + + + ../images/ + + 300px + diff --git a/opale_to_basex/basex/xquery/main.xq b/opale_to_basex/basex/xquery/main.xq index e9a09d80a0e047780f97785babc9eea5aa5ceff1..b4cc57f481545c58c5d5f112714c928588bc0367 100644 --- a/opale_to_basex/basex/xquery/main.xq +++ b/opale_to_basex/basex/xquery/main.xq @@ -5,6 +5,5 @@ import module namespace myNs = "https://gitlab.utc.fr/crozatst/hdoc/tree/master/ (: myNs:searchDocByTitle('^NF29_HdocEtherpad$', //document ) :) (: myNs:searchSectionByTitle('contenu', //document) :) -(: myNs:searchDocByAuthor('montangé', //document) :) -myNs:searchSectionByTitle('xml', myNs:searchDocByAuthor('montangé', //document)) \ No newline at end of file +myNs:searchDocByAuthor('Antoine', //document)/title \ No newline at end of file diff --git a/opale_to_basex/sample/alg1_2016-12-12.scar b/opale_to_basex/sample/alg1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..2365b69a6d1363c98b53c5489f06f17c3338d43c Binary files /dev/null and b/opale_to_basex/sample/alg1_2016-12-12.scar differ diff --git a/opale_to_basex/sample/lapp1_2016-12-12.scar b/opale_to_basex/sample/lapp1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..7112ecdf61a48c5664045b78e65c3262a9e1c80a Binary files /dev/null and b/opale_to_basex/sample/lapp1_2016-12-12.scar differ diff --git a/opale_to_basex/sample/mod1_2016-12-12.scar b/opale_to_basex/sample/mod1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..06add896a81acee8e29e12c9fb222ee4892a23ce Binary files /dev/null and b/opale_to_basex/sample/mod1_2016-12-12.scar differ diff --git a/opale_to_basex/sample/mod2_2016-12-12.scar b/opale_to_basex/sample/mod2_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..772d4f50ab93718fc4be68b02a96bb430b438deb Binary files /dev/null and b/opale_to_basex/sample/mod2_2016-12-12.scar differ diff --git a/opale_to_basex/sample/mod3_2016-12-12.scar b/opale_to_basex/sample/mod3_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..36784656bf717cbc53622b59a8e4c2b0098c51c0 Binary files /dev/null and b/opale_to_basex/sample/mod3_2016-12-12.scar differ diff --git a/opale_to_basex/sample/mod4_2016-12-12.scar b/opale_to_basex/sample/mod4_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..dec42a98f03b8d6347d1567815862b35ecb053bc Binary files /dev/null and b/opale_to_basex/sample/mod4_2016-12-12.scar differ diff --git a/opale_to_basex/sample/nor1_2016-12-12.scar b/opale_to_basex/sample/nor1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..973befbeaa8c100e7f22195e3a986268bdf2b927 Binary files /dev/null and b/opale_to_basex/sample/nor1_2016-12-12.scar differ diff --git a/opale_to_basex/sample/nor2_2016-12-12.scar b/opale_to_basex/sample/nor2_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..950e63e14b89a76f966cd207b6cb0a8539bfe9fb Binary files /dev/null and b/opale_to_basex/sample/nor2_2016-12-12.scar differ diff --git a/opale_to_basex/sample/nor3_2016-12-12.scar b/opale_to_basex/sample/nor3_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..ebd33ee622fc7be553fb1d0bf3322028bece6cdc Binary files /dev/null and b/opale_to_basex/sample/nor3_2016-12-12.scar differ diff --git a/opale_to_basex/sample/rel1_2016-12-12.scar b/opale_to_basex/sample/rel1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..7d40662ed8ac2475966a5d187681988a1bde014a Binary files /dev/null and b/opale_to_basex/sample/rel1_2016-12-12.scar differ diff --git a/opale_to_basex/sample/result_bush.hdoc b/opale_to_basex/sample/result_bush.hdoc deleted file mode 100644 index 7b829a8c6596000d37f59022f0af07592475b224..0000000000000000000000000000000000000000 Binary files a/opale_to_basex/sample/result_bush.hdoc and /dev/null differ diff --git a/opale_to_basex/sample/result_oracle.hdoc b/opale_to_basex/sample/result_oracle.hdoc deleted file mode 100644 index 1f664fd2fed76635826166090c6890eddfa6a6cc..0000000000000000000000000000000000000000 Binary files a/opale_to_basex/sample/result_oracle.hdoc and /dev/null differ diff --git a/opale_to_basex/sample/sample.hdoc b/opale_to_basex/sample/sample.hdoc deleted file mode 100644 index 29de6baa29e3acb2a30b7dc73b610f3bea7024f9..0000000000000000000000000000000000000000 Binary files a/opale_to_basex/sample/sample.hdoc and /dev/null differ diff --git a/opale_to_hdoc/.gitignore b/opale_to_hdoc/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..001a6ac778a60af4d3fd872b16e3207266354462 --- /dev/null +++ b/opale_to_hdoc/.gitignore @@ -0,0 +1,2 @@ +!input/.gitkeep +!output/.gitkeep \ No newline at end of file diff --git a/opale_to_hdoc/input/.gitkeep b/opale_to_hdoc/input/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/opale_to_hdoc/input/xslt2_2017-1-5.scar b/opale_to_hdoc/input/xslt2_2017-1-5.scar new file mode 100644 index 0000000000000000000000000000000000000000..323e82ac4ba84f34aad33975c83c360d0ff0ad2a Binary files /dev/null and b/opale_to_hdoc/input/xslt2_2017-1-5.scar differ