Skip to content

Commit

Permalink
Merge pull request #44 from ASML-Labs/remove-content-types-update
Browse files Browse the repository at this point in the history
Remove content type update
  • Loading branch information
matthijscox-asml authored Aug 17, 2023
2 parents 1a63efb + 6df9a1f commit 679af03
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PPTX"
uuid = "14a86994-10a4-4a7d-b9ad-ef6f3b1fac6a"
authors = ["Xander de Vries", "Matthijs Cox"]
version = "0.6.5"
version = "0.6.6"

[deps]
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Expand Down
26 changes: 0 additions & 26 deletions src/write.jl
Original file line number Diff line number Diff line change
Expand Up @@ -68,31 +68,6 @@ function update_table_style!(unzipped_ppt_dir::String=".")
end
end

function add_contenttypes!(tmpdir, unzipped_dir)
path = joinpath(tmpdir, unzipped_dir, "[Content_Types].xml")
doc = readxml(path)
r = root(doc)
extension_contenttypes = (
("emf", "image/x-emf"),
("gif", "image/gif"),
("jpeg", "image/jpeg"),
("jpg", "application/octet-stream"),
("png", "image/png"),
("svg", "image/svg+xml"),
("tif", "application/octet-stream"),
("wmf", "image/x-wmf")
)
for extension_contenttype in extension_contenttypes
ext, ct = extension_contenttype
# do not add the extension if it is already defined in the template
isnothing(findfirst(x -> (x.name == "Default" && x["Extension"] == ext), elements(r))) || continue
addelement!(r, "Default Extension=\"$ext\" ContentType=\"$ct\"")
end
open(path, "w") do io
prettyprint(io, doc)
end
end

"""
```julia
Base.write(
Expand Down Expand Up @@ -183,7 +158,6 @@ function Base.write(
write_slides!(p)
write_shapes!(p)
update_table_style!()
add_contenttypes!(tmpdir, unzipped_dir)
end
zip(unzipped_dir, filename)
cp(filename, filepath)
Expand Down

2 comments on commit 679af03

@matthijscox-asml
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

Release notes:

Undo previous content type bugfix, to fix registered PPTX (v0.6.4 and v0.6.5 are broken).

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/89833

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.6 -m "<description of version>" 679af030bc60854b5fbaa451e1a92c8bfe5f37a0
git push origin v0.6.6

Please sign in to comment.