[Libreoffice-commits] help.git: help3xsl/convert2html.sh help3xsl/get_bookmark.sh help3xsl/get_hid2file.sh help3xsl/get_html.sh help3xsl/get_media.sh help3xsl/get_tree.sh help3xsl/makehelp.sh help3xsl
help3xsl/convert2html.sh | 293 --- help3xsl/get_bookmark.sh | 79 help3xsl/get_hid2file.sh | 39 -- help3xsl/get_html.sh | 49 --- help3xsl/get_media.sh| 43 -- help3xsl/get_tree.sh | 93 -- help3xsl/makehelp.sh | 47 --- help3xsl/xhp2html.sh | 282 - 8 files changed, 925 deletions(-) New commits: commit af3f6f6d7974bf2ddbf49d2e95e90a3e916af8df Author: Olivier Hallot AuthorDate: Thu Aug 9 12:22:27 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Aug 9 19:36:02 2018 +0200 New Help housekeeping remove deprecated files (gbuild has replaced them) Change-Id: I00a0a1558dfa80486dd64df37273c90bc6262fb0 Reviewed-on: https://gerrit.libreoffice.org/58784 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh deleted file mode 100755 index f48f1d8a8..0 --- a/help3xsl/convert2html.sh +++ /dev/null @@ -1,293 +0,0 @@ -#/bin/bash -# 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/. -# -# Convert localized XHP files and TREE files to HTML. -# -# Syntax: convert2html tarball productversion source -# -# Example -# ./convert2html.sh buildtargets_5403.tar.gz 5.4 libreoffice-help-5.4.0.3.tar.xz -# -# This script convert localized XHP and TREE files available as tarballs into -# a set of html pages. -# -# Conversion is done by listing the available languages in the tarball and -# executing the XSLT transformations on each XHP and tree files. -# -# Note: tarball, source and productversion must match. -# -# Special case for converting en-US XHP files to HTML. The en-US source is -# taken from the published helpcontent2 source tarball. -# -# companion files are moved to the right position in the html folder -# Media files are added too. -# - -function getBookmark() { -### -# Extract from each XHP file and build a list -# in a javascript file -# -# Function called by main routine -# -# $1 is Language -# $2 is productversion -# $3 is the tarname folder -### - -local outdir=$(pwd)'/html/'$2'/'$1 - -local sourcedir=$3/HelpTranslatePartTarget/$1/helpcontent2/source -local ffile=$outdir/bookmarks.js -rm -f $ffile -local ffile2=$(mktemp) -local stub2=\' -local xslfile=get_bookmark.xsl - -local param1=' --stringparam Language '$1' --stringparam productversion '$2 - -### -# bookmarks for modules -### -for i in CALC CHART WRITER DRAW IMPRESS MATH BASIC -do -local stub1='document.getElementById("bookmark'$i'").innerHTML='\'\\ -sfind=$sourcedir'/'$(echo 'text/s'$i | tr '[:upper:]' '[:lower:]') -param=$param1' --stringparam app '$i -rm -f $ffile2 -find $sfind -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 -echo $stub1 >> $ffile -sort -k3b -t\> -s -o $ffile2 $ffile2 -awk 'NF' $ffile2 >> $ffile -echo $stub2 >> $ffile -done - -### -# Case of SHARED -### -stub1='document.getElementById("bookmarkSHARED").innerHTML='\'\\ -rm -f $ffile2 -param=$param1' --stringparam app SHARED' -find $sourcedir'/text/shared' -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 -echo $stub1 >> $ffile -sort -k3b -t\> -s -o $ffile2 $ffile2 -awk 'NF' $ffile2 >> $ffile -echo $stub2 >> $ffile - -### -# Case of Explorer (BASE) -### -stub1='document.getElementById("bookmarkBASE").innerHTML='\'\\ -rm -f $ffile2 -param=$param1' --stringparam app BASE' -find $sourcedir'/text/shared/explorer/database' -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 -echo $stub1 >> $ffile -sort -k3b -t\> -s -o $ffile2 $ffile2 -awk 'NF' $ffile2 >> $ffile -echo $stub2 >> $ffile -rm -f $ffile2 -} - -### -# Main routine -### - -tarname=$1 -productversion=$2 -source=$3 - -sourceDir=$(pwd) - -### -# Un-tar localized XHP and TREE files -### -#tarname=${tarball:0:17} -rm -rf $tarname -#tar -zxf $tarball -cp -r /var/tmp/$tarname . -### -# Un-tar source en-US XHP and TREE files -### - -sourceName=$(tar -tf $source | head -1 | cut -f1 -d"/") -rm -rf $sourceName -tar -xf $source - -### -# Location of the merged l10n help files from sourceDir -###
[Libreoffice-commits] help.git: help3xsl/convert2html.sh source/text wiki-to-help/HHC wiki-to-help/metabook.py
help3xsl/convert2html.sh |2 +- source/text/sbasic/shared/0315.xhp |2 +- source/text/sbasic/shared/03150001.xhp |2 +- source/text/scalc/01/data_form.xhp |2 +- source/text/shared/01/06140300.xhp |4 ++-- wiki-to-help/HHC/install_hhc.sh|2 +- wiki-to-help/metabook.py |2 +- 7 files changed, 8 insertions(+), 8 deletions(-) New commits: commit e3dc182b9dda0ba1a0e42dcea00e4d3b01e4b34f Author: Andrea GelminiDate: Tue Jan 2 21:50:28 2018 +0100 Fix typos Change-Id: I4ab0df8ed7f3d8ac95f28220c9b4f59e2a6a1eb2 Reviewed-on: https://gerrit.libreoffice.org/47281 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh index f8a84c434..ec49e2562 100755 --- a/help3xsl/convert2html.sh +++ b/help3xsl/convert2html.sh @@ -16,7 +16,7 @@ # a set of html pages. # # Conversion is done by listing the available languages in the tarball and -# execting the XSLT transformations on each XHP and tree files. +# executing the XSLT transformations on each XHP and tree files. # # Note: tarball, source and productversion must match. # diff --git a/source/text/sbasic/shared/0315.xhp b/source/text/sbasic/shared/0315.xhp index 3b6fa078a..8db94307e 100644 --- a/source/text/sbasic/shared/0315.xhp +++ b/source/text/sbasic/shared/0315.xhp @@ -44,7 +44,7 @@ String DateExpression: The date expression to be formatted. -NamedFormat: An optional vbDateTimeFormat enumeration specifying the format that is to be applied to the date and time exression. If omitted, the value vbGeneralDate is used. +NamedFormat: An optional vbDateTimeFormat enumeration specifying the format that is to be applied to the date and time expression. If omitted, the value vbGeneralDate is used. Date and Time formats (vbDateTimeFormat enumeration) diff --git a/source/text/sbasic/shared/03150001.xhp b/source/text/sbasic/shared/03150001.xhp index f4e06dbe8..1006fe389 100644 --- a/source/text/sbasic/shared/03150001.xhp +++ b/source/text/sbasic/shared/03150001.xhp @@ -44,7 +44,7 @@ String -Weekday: Value from 1 to 7, MonÂday to SunÂday, whose Week Day Name need to be calÂcuÂlated. +Weekday: Value from 1 to 7, MonÂday to SunÂday, whose Week Day Name need to be calculated. Abbreviate: Optional. A Boolean value that indicates if the weekday name is to be abbreviated. FirstDayofWeek: Optional. Specifies the first day of the week. First day of Week: diff --git a/source/text/scalc/01/data_form.xhp b/source/text/scalc/01/data_form.xhp index a4581b3fc..4016daceb 100644 --- a/source/text/scalc/01/data_form.xhp +++ b/source/text/scalc/01/data_form.xhp @@ -27,7 +27,7 @@ spreadsheet;form for inserting data -Data Entry Forms for Spreasheets +Data Entry Forms for Spreadsheets Data Entry Form is a tool to make table data entry easy in spreadsheets. With the Data Entry Form, you can enter, edit and delete records (or rows) of data and avoid horizontal scrolling when the table has many columns or when some columns are very wide. diff --git a/source/text/shared/01/06140300.xhp b/source/text/shared/01/06140300.xhp index 1c65c5bdd..d51313d7b 100644 --- a/source/text/shared/01/06140300.xhp +++ b/source/text/shared/01/06140300.xhp @@ -40,9 +40,9 @@ Location Select the location where the context menu is to be attached. If attached to a %PRODUCTNAME module, the context menu is available for all files opened in that module. If attached to the file, the context menu will be available only when that file is opened and active. Menu -Select the Context Menu where the customization is to be applied. The current ser of functions is dislayed in the box below. +Select the Context Menu where the customization is to be applied. The current ser of functions is displayed in the box below. Add -Click on the Add button to add a new conetxt menu. +Click on the Add button to add a new context menu. Remove Click on the remove button to delete the context menu. You can only delete custom context menus and custom context menu entries. diff --git a/wiki-to-help/HHC/install_hhc.sh b/wiki-to-help/HHC/install_hhc.sh index 619e65aa6..eefbc2a92 100755 --- a/wiki-to-help/HHC/install_hhc.sh +++ b/wiki-to-help/HHC/install_hhc.sh @@ -9,7 +9,7 @@ # Usage of HHC: wine c:\\htmlhelp\\hhc.exe c:\\test\\htmlhelp.hhp # # Changes: Set installation directory to c:\htmlhelp -# Copy also itcc.dll, this is neccessary +# Copy also itcc.dll, this is necessary # No execution of htmlhelp.exe installer needed # Abortion of install if anything fails, e.g. the download of HHC. # diff --git
[Libreoffice-commits] help.git: help3xsl/convert2html.sh help3xsl/get_media.sh help3xsl/help-to-html.sh help3xsl/xhp2html.sh
help3xsl/convert2html.sh |2 +- help3xsl/get_media.sh|4 ++-- help3xsl/help-to-html.sh |6 +++--- help3xsl/xhp2html.sh |6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 50ac5af18de36477bc0db81391adfd8a3a76853c Author: ShinnokDate: Tue Nov 28 18:34:21 2017 +0200 Replace cp -rap with cp -a, satisfying all *nixes. On macOS, probably BSD too -rap will fail with both -r and -R implied. Change-Id: I6844d6f2ac52ca1c10564857f4e9190e1627ce52 Reviewed-on: https://gerrit.libreoffice.org/45430 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh index 9eafdf183..f8a84c434 100755 --- a/help3xsl/convert2html.sh +++ b/help3xsl/convert2html.sh @@ -287,7 +287,7 @@ echo ''>>$sitemap cp normalize.css default.css help.js jquery-3.1.1.min.js $outDir cp -r $enSource/source/media $outDir mkdir -p $outDir/media/icon-themes -#cp -rap ../../icon-themes/galaxy/* $outDir/media/icon-themes/ +#cp -a ../../icon-themes/galaxy/* $outDir/media/icon-themes/ #ln -s $productversion html/latest exit diff --git a/help3xsl/get_media.sh b/help3xsl/get_media.sh index d0b7060d3..12f636b2b 100755 --- a/help3xsl/get_media.sh +++ b/help3xsl/get_media.sh @@ -36,7 +36,7 @@ cp jquery-3.1.1.min.js $outDir'/'$productVersion'/' cp normalize.css $outDir'/'$productVersion'/' cp default.css $outDir'/'$productVersion'/' -cp -rap ../source/media $outDir'/'$productVersion'/' +cp -a ../source/media $outDir'/'$productVersion'/' galaxy=$(realpath $workDir'/../icon-themes/galaxy') -cp -rap $galaxy $outDir'/'$productVersion'/media/icon-themes' +cp -a $galaxy $outDir'/'$productVersion'/media/icon-themes' diff --git a/help3xsl/help-to-html.sh b/help3xsl/help-to-html.sh index 1298106ec..1b7e6a74d 100755 --- a/help3xsl/help-to-html.sh +++ b/help3xsl/help-to-html.sh @@ -41,9 +41,9 @@ mkdir -p html/$productversion #copy some service files cp index.html html/ cp default.css help.js jquery-3.1.1.min.js tabs.css tree.css $outDir -cp -rap ../source/media $outDir +cp -a ../source/media $outDir mkdir -p $outDir'media/icon-themes' -cp -rap ../../icon-themes/galaxy/* $outDir/media/icon-themes/ +cp -a ../../icon-themes/galaxy/* $outDir/media/icon-themes/ ln -s $productversion html/latest # Create the bookmark2file map @@ -95,5 +95,5 @@ done # Should copy core/icon-themes/galaxy/ to the media folder as icon-theme/ #mkdir $outDir'media/icon-theme' -# cp -rap ../../../../../icon-themes/galaxy/* $outDir/media/icon-theme/ +# cp -a ../../../../../icon-themes/galaxy/* $outDir/media/icon-theme/ exit diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh index de146e387..4b3734254 100755 --- a/help3xsl/xhp2html.sh +++ b/help3xsl/xhp2html.sh @@ -181,9 +181,9 @@ cp jquery-3.1.1.min.js $here'/html/'$productversion'/' cp normalize.css $here'/html/'$productversion'/' cp default.css $here'/html/'$productversion'/' -cp -rap ../source/media $here'/html/'$productversion'/' +cp -a ../source/media $here'/html/'$productversion'/' mkdir -p $here'/html/'$productversion'/media/icon-themes' -cp -rap ../../icon-themes/galaxy/* $here'/html/'$productversion'/media/icon-themes/' +cp -a ../../icon-themes/galaxy/* $here'/html/'$productversion'/media/icon-themes/' ln -s $productversion html/latest # Set helpex utilty and environment @@ -243,7 +243,7 @@ mkdir -p $outDirHTML if [ "$lang" == en-US ]; then -cp -rap $helpfiles $outDirLang +cp -a $helpfiles $outDirLang else # Create first all translations of xhp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/convert2html.sh
help3xsl/convert2html.sh | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit e32165db6ecfe233f561da74843ffef9af3e2135 Author: Olivier HallotDate: Tue Oct 24 09:23:15 2017 -0200 Tweak some references in bash coding. Change-Id: I57aeab1b6a5abf733fa68835197f129aaf23fef0 Reviewed-on: https://gerrit.libreoffice.org/43761 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh index b273bb533..9eafdf183 100755 --- a/help3xsl/convert2html.sh +++ b/help3xsl/convert2html.sh @@ -29,7 +29,7 @@ function getBookmark() { ### -# Extract from each XHP files and build a list +# Extract from each XHP file and build a list # in a javascript file # # Function called by main routine @@ -39,12 +39,12 @@ function getBookmark() { # $3 is the tarname folder ### -local outdir=`pwd`'/html/'$2'/'$1 +local outdir=$(pwd)'/html/'$2'/'$1 local sourcedir=$3/HelpTranslatePartTarget/$1/helpcontent2/source local ffile=$outdir/bookmarks.js rm -f $ffile -local ffile2=`mktemp` +local ffile2=$(mktemp) local stub2=\' local xslfile=get_bookmark.xsl @@ -56,7 +56,7 @@ local param1=' --stringparam Language '$1' --stringparam productversion '$2 for i in CALC CHART WRITER DRAW IMPRESS MATH BASIC do local stub1='document.getElementById("bookmark'$i'").innerHTML='\'\\ -sfind=$sourcedir'/'`echo 'text/s'$i | tr '[:upper:]' '[:lower:]'` +sfind=$sourcedir'/'$(echo 'text/s'$i | tr '[:upper:]' '[:lower:]') param=$param1' --stringparam app '$i rm -f $ffile2 find $sfind -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 @@ -100,7 +100,7 @@ tarname=$1 productversion=$2 source=$3 -sourceDir=`pwd` +sourceDir=$(pwd) ### # Un-tar localized XHP and TREE files @@ -113,7 +113,7 @@ cp -r /var/tmp/$tarname . # Un-tar source en-US XHP and TREE files ### -sourceName=`tar -tf $source | head -1 | cut -f1 -d"/"` +sourceName=$(tar -tf $source | head -1 | cut -f1 -d"/") rm -rf $sourceName tar -xf $source @@ -173,7 +173,7 @@ stub1='var map={' stub2='};' sfind=$langDirSource'en-US/helpcontent2/source/text/' ffile=$outDir/bookmark2file.js -ffile2=`mktemp` +ffile2=$(mktemp) rm -f $ffile2 $ffile find $sfind -type f -name "*.xhp" -exec xsltproc get_url.xsl {} + > $ffile2 echo $stub1 >> $ffile @@ -181,7 +181,7 @@ awk 'NF' $ffile2 >> $ffile echo $stub2 >> $ffile rm -f $ffile2 -for lang in `ls $langDirSource` +for lang in $(ls $langDirSource) #for lang in pt-BR fr do echo 'Processing language '$lang @@ -193,7 +193,7 @@ do # iterate all xhp files -for filep in `find $pPath -name *.xhp` +for filep in $(find $pPath -name *.xhp) do # echo $filep DIR=${filep##*/source} @@ -217,7 +217,7 @@ xsltparm='--stringparam lang '$lang' --stringparam productversion '$productversi for tree in $ALL_TREE do treeSourceFile=$tarname/HelpTreeTarget/$tree/$lang.tree -treeTemp2=`mktemp` +treeTemp2=$(mktemp) xsltproc $xsltparm -o $treeTemp2 get_tree.xsl $treeSourceFile @@ -234,8 +234,8 @@ done ### url='https://help.libreoffice.org' -ALL_LANGS=`ls $outDir | sed 's/media//'` -ALL_LANGS=`echo $ALL_LANGS | sed 's/bookmark2file.js//'` +ALL_LANGS=$(ls $outDir | sed 's/media//') +ALL_LANGS=$(echo $ALL_LANGS | sed 's/bookmark2file.js//') echo $ALL_LANGS sitemap=$outDir/sitemap.xml @@ -249,7 +249,7 @@ for lang1 in $ALL_LANGS do echo '' >>$sitemap echo ''$url'/'$productversion'/sitemap-'$lang1'.xml' >>$sitemap -echo ''`date -I`''>>$sitemap +echo ''$(date -I)''>>$sitemap echo ''>>$sitemap ### @@ -268,7 +268,7 @@ echo 'http://www.sitemaps.org/schemas/sitemap/0.9;>' >> $f dd=./html/$productversion/$lang1 -for ff in `find $dd -name "*.html"` +for ff in $(find $dd -name "*.html") do echo ''$url'/'${ff:7}'' >>$f done ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/convert2html.sh
help3xsl/convert2html.sh | 293 +++ 1 file changed, 293 insertions(+) New commits: commit 62a89b1d32a3b230f3094075002cf2162934e4f4 Author: Olivier HallotDate: Tue Oct 3 14:54:42 2017 -0300 Script to build HTML help files of released version This script is used to convert released help files into HTML pages Change-Id: Iae1d6c1a10360229221f8a47b5e7187bbb958d86 Reviewed-on: https://gerrit.libreoffice.org/43094 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh new file mode 100755 index 0..b273bb533 --- /dev/null +++ b/help3xsl/convert2html.sh @@ -0,0 +1,293 @@ +#/bin/bash +# 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/. +# +# Convert localized XHP files and TREE files to HTML. +# +# Syntax: convert2html tarball productversion source +# +# Example +# ./convert2html.sh buildtargets_5403.tar.gz 5.4 libreoffice-help-5.4.0.3.tar.xz +# +# This script convert localized XHP and TREE files available as tarballs into +# a set of html pages. +# +# Conversion is done by listing the available languages in the tarball and +# execting the XSLT transformations on each XHP and tree files. +# +# Note: tarball, source and productversion must match. +# +# Special case for converting en-US XHP files to HTML. The en-US source is +# taken from the published helpcontent2 source tarball. +# +# companion files are moved to the right position in the html folder +# Media files are added too. +# + +function getBookmark() { +### +# Extract from each XHP files and build a list +# in a javascript file +# +# Function called by main routine +# +# $1 is Language +# $2 is productversion +# $3 is the tarname folder +### + +local outdir=`pwd`'/html/'$2'/'$1 + +local sourcedir=$3/HelpTranslatePartTarget/$1/helpcontent2/source +local ffile=$outdir/bookmarks.js +rm -f $ffile +local ffile2=`mktemp` +local stub2=\' +local xslfile=get_bookmark.xsl + +local param1=' --stringparam Language '$1' --stringparam productversion '$2 + +### +# bookmarks for modules +### +for i in CALC CHART WRITER DRAW IMPRESS MATH BASIC +do +local stub1='document.getElementById("bookmark'$i'").innerHTML='\'\\ +sfind=$sourcedir'/'`echo 'text/s'$i | tr '[:upper:]' '[:lower:]'` +param=$param1' --stringparam app '$i +rm -f $ffile2 +find $sfind -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 +echo $stub1 >> $ffile +sort -k3b -t\> -s -o $ffile2 $ffile2 +awk 'NF' $ffile2 >> $ffile +echo $stub2 >> $ffile +done + +### +# Case of SHARED +### +stub1='document.getElementById("bookmarkSHARED").innerHTML='\'\\ +rm -f $ffile2 +param=$param1' --stringparam app SHARED' +find $sourcedir'/text/shared' -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 +echo $stub1 >> $ffile +sort -k3b -t\> -s -o $ffile2 $ffile2 +awk 'NF' $ffile2 >> $ffile +echo $stub2 >> $ffile + +### +# Case of Explorer (BASE) +### +stub1='document.getElementById("bookmarkBASE").innerHTML='\'\\ +rm -f $ffile2 +param=$param1' --stringparam app BASE' +find $sourcedir'/text/shared/explorer/database' -type f -name "*.xhp" -exec xsltproc $param $xslfile {} + >> $ffile2 +echo $stub1 >> $ffile +sort -k3b -t\> -s -o $ffile2 $ffile2 +awk 'NF' $ffile2 >> $ffile +echo $stub2 >> $ffile +rm -f $ffile2 +} + +### +# Main routine +### + +tarname=$1 +productversion=$2 +source=$3 + +sourceDir=`pwd` + +### +# Un-tar localized XHP and TREE files +### +#tarname=${tarball:0:17} +rm -rf $tarname +#tar -zxf $tarball +cp -r /var/tmp/$tarname . +### +# Un-tar source en-US XHP and TREE files +### + +sourceName=`tar -tf $source | head -1 | cut -f1 -d"/"` +rm -rf $sourceName +tar -xf $source + +### +# Location of the merged l10n help files from sourceDir +### +langDirSource=$tarname/HelpTranslatePartTarget/ +enSource=$sourceName/helpcontent2 + +### +# +# Hack: copy en-US from source help tarball to HelpTranslatePartTarget and HelpTreeTarget +#