From 3ee73a4d1ee2b11564df2c001514bcfd8b5c632c Mon Sep 17 00:00:00 2001 From: Laurent Balland Date: Sat, 12 Oct 2024 15:32:37 +0200 Subject: [PATCH] tdf#163102 Replace DocBookTemplate.stw by build-in... DocBookTemplate.ott Simply copy makefile of extra/templates fix bug tdf#161930: mimetype is zipped only once Modifications to DocBookTemplate.stw: - change fonts to bundled fonts: Liberation Serif, Noto Sans CJK, Noto Sans Devanagari (not so useful as used fonts are defined in docbooktosoffheadings.xsl and sofftodocbookheadings.xsl) - remove language and country tags - remove page size - remove writing mode tags - remove content.xml - remove meta.xml - simplify settings.xml - remove unused namespaces Change-Id: Ic2a2284c3d890b8a6b7b4e29bdab18c33d40dcee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174847 Tested-by: Jenkins Reviewed-by: Laurent Balland Reviewed-by: Mike Kaganski --- filter/CustomTarget_docbook.mk | 55 +++ filter/Module_filter.mk | 1 + filter/Package_docbook.mk | 4 +- .../config/fragments/filters/DocBook_File.xcu | 2 +- filter/source/docbook/DocBookTemplate.stw | Bin 6688 -> 0 bytes .../DocBookTemplate/META-INF/manifest.xml | 7 + .../docbook/DocBookTemplate/manifest.rdf | 12 + .../source/docbook/DocBookTemplate/mimetype | 1 + .../docbook/DocBookTemplate/settings.xml | 24 ++ .../source/docbook/DocBookTemplate/styles.xml | 355 ++++++++++++++++++ 10 files changed, 458 insertions(+), 3 deletions(-) create mode 100644 filter/CustomTarget_docbook.mk delete mode 100644 filter/source/docbook/DocBookTemplate.stw create mode 100644 filter/source/docbook/DocBookTemplate/META-INF/manifest.xml create mode 100644 filter/source/docbook/DocBookTemplate/manifest.rdf create mode 100644 filter/source/docbook/DocBookTemplate/mimetype create mode 100644 filter/source/docbook/DocBookTemplate/settings.xml create mode 100644 filter/source/docbook/DocBookTemplate/styles.xml diff --git a/filter/CustomTarget_docbook.mk b/filter/CustomTarget_docbook.mk new file mode 100644 index 000000000000..4221a5fefcc1 --- /dev/null +++ b/filter/CustomTarget_docbook.mk @@ -0,0 +1,55 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,filter/source/docbook)) + +filter_docbook_files := \ + DocBookTemplate/settings.xml \ + DocBookTemplate/manifest.rdf \ + + +filter_docbook_files_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(filter_docbook_files))) + +define run_zip_docbook_recipe = +$(call gb_Output_announce,$(subst $(gb_CustomTarget_workdir)/filter/source/docbook/,,$@),$(true),ZIP,2) +$(call gb_Trace_StartRange,$(subst $(gb_CustomTarget_workdir)/filter/source/docbook/,,$@),ZIP) +cd $(dir $<) && \ +$(call gb_Helper_wsl_path,\ +$(WSL) zip -q0X --filesync --must-match $@ mimetype && \ +$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^)) -x mimetype +$(call gb_Trace_EndRange,$(subst $(gb_CustomTarget_workdir)/filter/source/docbook/,,$@),ZIP) +endef + +.SECONDEXPANSION: +# secondexpansion since the patterns not just cover a filename portion, but also include a +# directory portion with different number of elements +# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …) +$(gb_CustomTarget_workdir)/filter/source/docbook/% : $(SRCDIR)/filter/source/docbook/% \ + | $$(dir $(gb_CustomTarget_workdir)/filter/source/docbook/$$*).dir + $(call gb_Output_announce,docbook/$*,$(true),CPY,1) + $(call gb_Trace_StartRange,docbook/$*,CPY) + cp $< $@ + $(call gb_Trace_EndRange,docbook/$*,CPY) + +# test and copy xml files +$(gb_CustomTarget_workdir)/filter/source/docbook/%.xml : $(SRCDIR)/filter/source/docbook/%.xml \ + | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \ + $$(dir $(gb_CustomTarget_workdir)/filter/source/docbook/$$*.xml).dir + $(call gb_Output_announce,docbook/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,docbook/$*.xml,XSL) + $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,docbook/$*.xml,XSL) + +$(gb_CustomTarget_workdir)/filter/source/docbook/%.ott : \ + $$(addprefix $(gb_CustomTarget_workdir)/filter/source/docbook/$$*/,\ + mimetype META-INF/manifest.xml styles.xml \ + $$(call filter_docbook_files_RELATIVE,$$*)) + $(run_zip_docbook_recipe) + +# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index c28c72705cec..a2cf70628bec 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Module_Module,filter)) $(eval $(call gb_Module_add_targets,filter,\ Configuration_filter \ CustomTarget_svg \ + CustomTarget_docbook \ Library_filterconfig \ Library_icg \ Library_msfilter \ diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk index 6548fd6a1fd9..6c1a454a87ad 100644 --- a/filter/Package_docbook.mk +++ b/filter/Package_docbook.mk @@ -16,10 +16,10 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook)) +$(eval $(call gb_Package_Package,filter_docbook,$(gb_CustomTarget_workdir)/filter/source/docbook)) $(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\ - DocBookTemplate.stw \ + DocBookTemplate.ott \ docbooktosoffheadings.xsl \ sofftodocbookheadings.xsl \ )) diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu index da278f4c688f..6f7a4a66fa3f 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu @@ -22,7 +22,7 @@ com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../$(share_subdir_name)/xslt/docbook/docbooktosoffheadings.xsl,../$(share_subdir_name)/xslt/docbook/sofftodocbookheadings.xsl com.sun.star.comp.Writer.XmlFilterAdaptor - ../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw + ../$(share_subdir_name)/xslt/docbook/DocBookTemplate.ott DocBook diff --git a/filter/source/docbook/DocBookTemplate.stw b/filter/source/docbook/DocBookTemplate.stw deleted file mode 100644 index ebc95f9f68cb928632f91d6a12baddb13136a82b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6688 zcma)B2{_bS*thQzjmW-cof$i0%}ykRtYOT;U2B$_hNI2&UkNRaQGdwnvc%D zl&9{4`s5eWr}E`tjjm%~uoe#U%*Xlrb4wZz`S3O{qdSGO1ars*P={DZE86h2o z4f+%q>&q1wWo*}}An!=r$1Yx8wwc9C>17@q@lV@}>4%3Z*w-29KWsX_3$rB|w*QL1 zJ;u+bAdT-QG_x1!RR>%?JCw7EM=MJ~AQ0Z>wX)7UIr8f+zDXM2-$#6zpm_XvCM*pj zIM{#f`pV6k2xWkKQ&RfEApTt+zZ^5ffl?IP#wH<kz?Eh(ce1ck_)aH+_h$Bc4b9xCcVsi69|!g8M8Cp zA{P8Dp*dFhUAw`=i)IhBB$=DcY&d&tbU88oa`rvO_d^x=F;&=>87($nw)*i|p^h^1l>N%Vcam+C`*ELdy&jp z+FWf?T`3Nsp3yApeHp>f^d+{kknGy-3`??}<$L_sq(~BKbU~1|! zafc)}Uda{iuBq_KXA*kgQF7*T$!f_szt$ZlA%Pbp`rTcqECe??3(ijTf_qaJAYyqj z3aiJ5f7t)slho;8b2*u%&n#1to^!^o_+enF=!ksS{NA?9&eCS3SJC0tT0wF1&4y;* zgD>k@0Ee;Yut}@7NR<^`E7lSl4$)>c|L66MS4`0g4Gd2M`f4fez7B1TiQ#76{06(K zABYTTy=-Tu%{)VK4PNx-VwAgaKf@%=Om*G8+^JP}z3g*wvarQERY3F5Ba*W5jy{Nh z-(9<09ZdUusfX_=-luC;SOb9UwdY7LfcDXGSa5Rp3v3TWcVG#>R~A}7?Wm!Wu)H;+ zc=*ifmQmu9TPwX1=wUML!rKOW%4JL-qMJr$axC}cW?w<1wAzO$wAz#46fhQ93foi7 zM6pLZ^Pr%Z8&NOMX*y@=XJlLAUgUO7f$_=SY9dk?G>N1Obbvm`xOPSu863X1%FjUZ zkr8+=ROhk7nHNz0J`eM_>{Id=eb%iz{^%mz(wtwa5nn75=9!)hx5+g$!(vH=q=?5H zwK%z+rm-8zJQ-*x*dWibnWx!5CnBV7Tn*Wk^z3m-ymRVMN3b-+3>1G0&}w94PCF*- z6~C$1Wi*&-0ubkrh6moiMkRcgF^Yq=!J>~M?DSW*&stA{iKTK1TSF`QvymF8n($tl~hSiDL3vcvv5 zMVHN7A512cZ)KY#zU`J4aeYB(+y(mJQ(N8B88Fz4V49QGX@pYT!WlI)1yn_Nf-IT| z?7nG$5Z=}?3F$(bIGeR5YRNrx5{{}3ODkMbU0Dfaq7mcw$j1C6o8 zlRMr$ch*}Kuv*=%BGGG~_7~b3tF3cMa zY5E)y@$&SY)cLSho!FR`+@5>Yqrzus-WpmI4+~AYUJ@c(_q|6_#b!@Isv0CBmKH0_ z$CX8?Lvf!*0p0#lKJrQWz}J+S%9c*)gxkyZD^oqJ^6U+&UFiswa%DwRrb^qJNs-2r z5~u7tBF?7vv7EhG_$lOx)bgFxRBJDCG*?0Y+@+9lCZ%n1Rz?0&vly}IGgM8 zq|frbx>`PYlf75CdLMBiOsYKJljjAl2VD-<2ARv`T#U`|Hvy{Tz3X0|Z&YGEs#hp| zEeVQ$m(n%(di5dNGXVaHah_r>&}$l0a@!$%xyQadd4+6)Sv}=EZTd^0>$O+1y(^1e zB^c9RWUp8J5}P@mZJjRNsFgXVh`aA{r#7YQMnD^MZbWPmcF6GvOkEvrJDPliF>cu^ z=Ufm>yLm0WxRSbd-ljyJF2<8Ir)mDebGf%>=3woX!*7->;1bC5sYeTscBF#?064eS zp^#zfu$xSt6}5Kox{+ufHb}-<&G>L)?Xrlj;c0V5TP*&ztTfU<9Ei3vg%^vJv~03H zYz0>BRA@3N*x0^X@@lS8ZL91EtMjZVMe&N)k;>72?xXWgB=s`bs(X#Lu3Mz7;m|?` z*yC`gMs9iBnlzd+dNoYx#ON#Aq=9QMu@|l#o09q{NqM}b$*s6hJ~r| zW$a8(4qs?gPNvq>#s=_p?TRLjQTcrz)%O`OLIjdp8E=i{SaT-c(_VY-5om3JSx$SG zJ0#Sfi*K}GGtv;6@pi%co=(&@x}vphxw{}7f6BM*vk#|~^ZMykSBd?8|E607jc%Hy{>>Jevx7@Q-y( z6XmV33~Svnw>SLbk82-xZlyCII}YRu$ZU8sHY(9$Q=RDEJtf=m>}=Y@;GkG^4DG#- z>Lfd(y-f@x8#0d-i$=T$vN%}+f{z-#>KP>U{PaM%UNqIN91IV{5!n6w*38A%rYW9R z?a4m@%0xqN1nV(4us&L!r8@Lq9kyIQFOkEUeLY3bu71c4_K|jXc5R!7F2_@8cC460 zeNvNsEYqm3&%2;ER3W^EYe&k-)j#=-gpDG;JzY_0XOJ@$`m7Sf!opJjHkdoHRIFkt zUqP)>qp6n1G~yaD2&9?$(amn|G3{Zq==e_MBdIH@=rwfTR(Q65gjnj4&C-<&p3bpF*Kne&*lexrkzU?h!H;j^fc1MI z0l+gW?4Y8gz5i|T%{6`Q$n(^E(i*@fS=l$9t)CO_KabAau&Gzooy`>R5Lg@Qo~g#N zsKMlGO@Ps2mc-)w*cNBGfF)eX`R-CLrpO7V_C~?>YyAcyiAU}hY-6V;( zpR{f0i-UGVA?nH2Y{Ap3nLE_3VZBl5eCa9$+7;#XToVV5FW)q*IDQQ&M=MEurhgpC z$}BH4tZNbz72$gIO;Yq96Zbo<0b3BQ_)%*%Y#3{h-FWuqEjq1a1^bByE3bHFdD_$0J5z#uKRT#UMDfx>BGr?>Njc?mpP$SBCb_s`&n5bLtG>#q z0Mv!6>Xyqq7~XF;T>0+SB|jWPr4UruJ=u7@_~=_-fD-a-o_99`V{UHV%L!Q*p|+_= z79d~{Nfvy=n$2zH)t=G0t}DdS7-B<&<8st+OvvE->HA-aXPvPURaSKUy1|3{KibPP z_DSv7Z}#q-`tIng)&lb!qxau1m0!MVjf&){ z<$W$lI81n(b@i*s#Q+Ycj32)jml)#Sj&&xpXn0w+do4)Lv$%=%F$+Ym&?fbDL|K9! z0FVw9*4YP@uKS8j4b<6^zFV3too3{(L;Z_0q>QSiAXiq}HHYo5a5)wpRS}h=qqj%R z&pmF@y9?K;jIg5a-Mkd8a;OZudLSW^oO~oK;`fFa%V}bukGfYbkDnp8gZ4A~JPe6& zYq-Yb7^0ezAJ|U4WZk$l)$l??WF&Bke~{R~c*atLKRmqv$+p+$e;zzGFCsc}kJ^1OZ?AufaIs)jn$&jeP`(2$5 zBHYo;{X(SDzKT}iT_57#&M>c4vn1D^tro}7W4P@ zgvYxpg28TtLH^<%414;5|5Tra(Ji_KEjI@-mXyLt3Tt?x zT;YlevJeFkAn=!Z7#8s(;|Ic_c!Vm!RMJ2RS)in>sidr;q=KT1)L&ZvjyoO=4paO$ z4n$E#S{ZyI{0ry`#W;FG9TBPs4A9KvhxljL&y^zJC_KThfG}SeA=gqRX!)_8e{}yZ zINXz99)f$S8kE_^! zfZ_ky>;4;3@-MnO6bp64LfxHCz$XH4H!S?5?_?~P69Ek)90~mr92-sfuRW%CJR!n< zJ!$@2$B+L1PO}L)I1vtkKX!pX6K%^$?_9;xw$-{=8>kba5^k*CdG<`j zKTJZq=KfP&!1r~x)2lV2^`eMA{}E+Yz4MbS=cVKI8x9m{Z!VEr%w53>n#Y)0k~o;W z;$KTt=157D-go&vFmLzuI?R1iQsC?7x%ckV#!9DdZ(Jlxr+u%tOjpfb%-hMVT}vDI z0XP>ejAPd3Uc9bMg+ElOVyZKkWk8@`d)Qy_GK2vP2&Uot8nkF( zW+v#DoJ@*r(#^D+j~9SkG&)-`w7rc(^w%?0i}-GR$g($2G}N*cna&tp&U!SoVjh3? z(p!WaGR$^Ufow@vzZ-dnbQ1#R5-7_`+R>E4RRpM$e3ztW>_+D5Yns<>@nUK;_@0ILv5N=}6@a zQX0-FI!Xd&QN&)iqY5$^*dFQ&MDoY1P=C9kE*F3G&~HS%g6FoJ=Txh(DDf#VE)RQ( z*ZG&kGeo_!sbpO+q)NH%dzGfJox#KyoKO@0jm(cjkL|WHV7e>mJ|0*rF@@ER zw7sVRJtLfc>w3?W@L;gbqs_(7q*O9p5c(~WtGvBx#%y$C6LsoFB4Up-0HbYk1+Gdy zWCa-&x zEBVDu7PQ=@O9I}-;KC9^lk;aVbn1%{AElC;f;8<#EV+FexQx{jM8;_qpH~4;FUs9h z;;61l&k8TdSZ6ae=c;QL=H7Y`PEzC9=s}j{lBz3_*6rENc~D~NSi_kz-IgWDP!juY zxL)77`P!=6*{{us>NwN1$X-aM3upaM+T@q&z&!Tqu@`SRQ&*qm!tT=D?RQBF>j}*% z%o4hOcXViCTv*bW6t&x2@=1g%Yt*aKyzwYxuqJxJs5{lIf}LVH8a=os7t(c3qcqUi z{Ahye^%KgwGIw8-73JkM%U{L?wUnR363hQv4YbB8qZ8I7K?kb3nnk8&3;f?j8B z6&y5S%_MsGHH7Wp+4~R71MgA==csY(wBUO@AoYn$f$Is4pLRECBP+)0mELZkOs{n% zGRgWYzBpW7mhO$}?h+_jbiP@=XT08xrW4EYW4_+rPTdkMn%6z1Q(nmrGM9vryJdWkLMtQ4@PcnB)GoN%UwgKgM-jtatJaG6xx&7ofz4o$d-dD;3e_*Eu!PgGde2fsRwT zEV~BW<@ZQ=?{PCWZ=|<>dTb4eoYh{ssuf`c*;zV&xq<)d|IgiVix@5U4GQj-0~6eacrf^tAFt^A$n5bIEk(P?WmlY@E>Z=?f8Lop~M0{7$4yyR`UbF0K@imArSITM(Sfg&=cz%~)U=xC5M9 z3r}m3tEg>(!^+XvHahn=wG}urwG?9gxBJ6Ont&Snda}FbNmkc qRU(-F{zm*K^LLXSd)BYw#_}J2W^6!CaSWp%e5{Cxh@P?@xBdqdU~FFi diff --git a/filter/source/docbook/DocBookTemplate/META-INF/manifest.xml b/filter/source/docbook/DocBookTemplate/META-INF/manifest.xml new file mode 100644 index 000000000000..170a211048b8 --- /dev/null +++ b/filter/source/docbook/DocBookTemplate/META-INF/manifest.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/filter/source/docbook/DocBookTemplate/manifest.rdf b/filter/source/docbook/DocBookTemplate/manifest.rdf new file mode 100644 index 000000000000..c0d8477ec660 --- /dev/null +++ b/filter/source/docbook/DocBookTemplate/manifest.rdf @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/filter/source/docbook/DocBookTemplate/mimetype b/filter/source/docbook/DocBookTemplate/mimetype new file mode 100644 index 000000000000..6a297d887997 --- /dev/null +++ b/filter/source/docbook/DocBookTemplate/mimetype @@ -0,0 +1 @@ +application/vnd.oasis.opendocument.text-template \ No newline at end of file diff --git a/filter/source/docbook/DocBookTemplate/settings.xml b/filter/source/docbook/DocBookTemplate/settings.xml new file mode 100644 index 000000000000..885ffd5aafc6 --- /dev/null +++ b/filter/source/docbook/DocBookTemplate/settings.xml @@ -0,0 +1,24 @@ + + + + + true + true + true + true + false + true + false + true + false + false + false + false + true + high-resolution + false + true + false + + + diff --git a/filter/source/docbook/DocBookTemplate/styles.xml b/filter/source/docbook/DocBookTemplate/styles.xml new file mode 100644 index 000000000000..63baba2a55bc --- /dev/null +++ b/filter/source/docbook/DocBookTemplate/styles.xml @@ -0,0 +1,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +