diff --git a/bakery-js/src/index.ts b/bakery-js/src/index.ts index f60a5077..521cb9b8 100644 --- a/bakery-js/src/index.ts +++ b/bakery-js/src/index.ts @@ -196,10 +196,7 @@ epubCommand // NOTE: Each css file has the same name in a different book directory writeFileSync( `${destinationDir}/${opfFile.parsed.slug}/the-style-epub.css`, - cssContents.replace( - /@import ([^\n]+)\n/g, - '/* commented_for_epub @import $1 */\n' - ) + cssContents ) writeFileSync( diff --git a/ce-styles b/ce-styles index c87aa99c..e39a62ff 160000 --- a/ce-styles +++ b/ce-styles @@ -1 +1 @@ -Subproject commit c87aa99c9bf96b49de70a122c9a9f8269182cf5c +Subproject commit e39a62ff43412bcbcf7553a61b1b115c96f8a12b diff --git a/dockerfiles/steps/step-bake.bash b/dockerfiles/steps/step-bake.bash index e6378cc3..0534049b 100644 --- a/dockerfiles/steps/step-bake.bash +++ b/dockerfiles/steps/step-bake.bash @@ -1 +1,2 @@ source $DOCKERFILES_ROOT/steps/bake-util.bash default + cp -R "$BOOK_STYLES_ROOT/downloaded-fonts" "$IO_BAKED" diff --git a/dockerfiles/steps/step-pdf.bash b/dockerfiles/steps/step-pdf.bash index 7f68bd96..4efb826d 100644 --- a/dockerfiles/steps/step-pdf.bash +++ b/dockerfiles/steps/step-pdf.bash @@ -3,6 +3,7 @@ parse_book_dir # Style needed because mathjax will size converted math according to surrounding text cp "$IO_BAKED/"*-pdf.css "$IO_LINKED" +cp -R "$IO_BAKED/downloaded-fonts" "$IO_LINKED" shopt -s globstar nullglob for collection in "$IO_LINKED/"*.linked.xhtml; do slug_name=$(basename "$collection" | awk -F'[.]' '{ print $1; }') diff --git a/dockerfiles/steps/step-prebake.bash b/dockerfiles/steps/step-prebake.bash index 42cce3b2..d62fc518 100644 --- a/dockerfiles/steps/step-prebake.bash +++ b/dockerfiles/steps/step-prebake.bash @@ -27,6 +27,7 @@ fi style_resource_root="$IO_INITIAL_RESOURCES/styles" generic_style="webview-generic.css" [[ ! -e "$style_resource_root" ]] && mkdir -p "$style_resource_root" +cp -R "$BOOK_STYLES_ROOT/downloaded-fonts" "$style_resource_root" while read -r slug_name; do style_name=$(read_style "$slug_name") web_style="$style_name-web.css"